Fix error with es6 build and imageProcessing mixin

Author: Mike Bond

packages/dev/core/src/Materials/Node/nodeMaterial.ts

@@ -10,14 +10,12 @@ import { NodeMaterialBuildState } from "./nodeMaterialBuildState";
 import type { IEffectCreationOptions } from "../effect";
 import { Effect } from "../effect";
 import type { BaseTexture } from "../../Materials/Textures/baseTexture";
-import type { Observer } from "../../Misc/observable";
 import { Observable } from "../../Misc/observable";
 import { NodeMaterialBlockTargets } from "./Enums/nodeMaterialBlockTargets";
 import { NodeMaterialBuildStateSharedData } from "./nodeMaterialBuildStateSharedData";
 import type { SubMesh } from "../../Meshes/subMesh";
 import { MaterialDefines } from "../../Materials/materialDefines";
 import type { NodeMaterialOptimizer } from "./Optimizers/nodeMaterialOptimizer";
-import type { ImageProcessingConfiguration } from "../imageProcessingConfiguration";
 import type { Nullable } from "../../types";
 import { VertexBuffer } from "../../Buffers/buffer";
 import { Tools } from "../../Misc/tools";
@@ -73,6 +71,7 @@ import { AbstractEngine } from "../../Engines/abstractEngine";
 import type { LoopBlock } from "./Blocks/loopBlock";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering";
 import { UVDefinesMixin } from "../uv.defines";
+import { ImageProcessingMixin } from "../imageProcessing";
 
 const onCreatedEffectParameters = { effect: null as unknown as Effect, subMesh: null as unknown as Nullable<SubMesh> };
 
@@ -232,10 +231,11 @@ export type NodeMaterialTextureBlocks =
     | BiPlanarBlock
     | PrePassTextureBlock;
 
+class NodeMaterialBase extends ImageProcessingMixin(PushMaterial) {}
 /**
  * Class used to create a node based material built by assembling shader blocks
  */
-export class NodeMaterial extends PushMaterial {
+export class NodeMaterial extends NodeMaterialBase {
     private static _BuildIdGenerator: number = 0;
     private _options: INodeMaterialOptions;
     private _vertexCompilationState: NodeMaterialBuildState;
@@ -373,30 +373,6 @@ export class NodeMaterial extends PushMaterial {
         this._options = options;
     }
 
-    /**
-     * Default configuration related to image processing available in the standard Material.
-     */
-    protected _imageProcessingConfiguration: ImageProcessingConfiguration;
-
-    /**
-     * Gets the image processing configuration used either in this material.
-     */
-    public get imageProcessingConfiguration(): ImageProcessingConfiguration {
-        return this._imageProcessingConfiguration;
-    }
-
-    /**
-     * Sets the Default image processing configuration used either in the this material.
-     *
-     * If sets to null, the scene one is in use.
-     */
-    public set imageProcessingConfiguration(value: ImageProcessingConfiguration) {
-        this._attachImageProcessingConfiguration(value);
-
-        // Ensure the effect will be rebuilt.
-        this._markAllSubMeshesAsTexturesDirty();
-    }
-
     /**
      * Gets an array of blocks that needs to be serialized even if they are not yet connected
      */
@@ -470,40 +446,6 @@ export class NodeMaterial extends PushMaterial {
         return "NodeMaterial";
     }
 
-    /**
-     * Keep track of the image processing observer to allow dispose and replace.
-     */
-    private _imageProcessingObserver: Nullable<Observer<ImageProcessingConfiguration>>;
-
-    /**
-     * Attaches a new image processing configuration to the Standard Material.
-     * @param configuration
-     */
-    protected _attachImageProcessingConfiguration(configuration: Nullable<ImageProcessingConfiguration>): void {
-        if (configuration === this._imageProcessingConfiguration) {
-            return;
-        }
-
-        // Detaches observer.
-        if (this._imageProcessingConfiguration && this._imageProcessingObserver) {
-            this._imageProcessingConfiguration.onUpdateParameters.remove(this._imageProcessingObserver);
-        }
-
-        // Pick the scene configuration if needed.
-        if (!configuration) {
-            this._imageProcessingConfiguration = this.getScene().imageProcessingConfiguration;
-        } else {
-            this._imageProcessingConfiguration = configuration;
-        }
-
-        // Attaches observer.
-        if (this._imageProcessingConfiguration) {
-            this._imageProcessingObserver = this._imageProcessingConfiguration.onUpdateParameters.add(() => {
-                this._markAllSubMeshesAsImageProcessingDirty();
-            });
-        }
-    }
-
     /**
      * Get a block by its name
      * @param name defines the name of the block to retrieve

packages/dev/core/src/Materials/PBR/pbr2Material.ts

@@ -5,7 +5,7 @@ import type { Nullable } from "../../types";
 import type { Scene } from "../../scene";
 import { Color3, Color4 } from "../../Maths/math.color";
 import { ImageProcessingConfiguration } from "../imageProcessingConfiguration";
-import type { BaseTexture } from "../../Materials/Textures/baseTexture";
+import type { BaseTexture } from "../Textures/baseTexture";
 import { PBRBaseMaterial } from "./pbrBaseMaterial";
 import { RegisterClass } from "../../Misc/typeStore";
 import { Material } from "../material";

packages/dev/core/src/Materials/PBR/pbrBaseMaterial.ts

@@ -15,25 +15,25 @@ import { PBRBRDFConfiguration } from "./pbrBRDFConfiguration";
 import { PrePassConfiguration } from "../prePassConfiguration";
 import { Color3, TmpColors } from "../../Maths/math.color";
 
-import { ImageProcessingDefinesMixin } from "../../Materials/imageProcessingConfiguration.defines";
-import { ImageProcessingConfiguration } from "../../Materials/imageProcessingConfiguration";
-import type { Effect, IEffectCreationOptions } from "../../Materials/effect";
-import type { IMaterialCompilationOptions, ICustomShaderNameResolveOptions } from "../../Materials/material";
-import { Material } from "../../Materials/material";
+import { ImageProcessingDefinesMixin } from "../imageProcessingConfiguration.defines";
+import { ImageProcessingConfiguration } from "../imageProcessingConfiguration";
+import type { Effect, IEffectCreationOptions } from "../effect";
+import type { IMaterialCompilationOptions, ICustomShaderNameResolveOptions } from "../material";
+import { Material } from "../material";
 import { MaterialPluginEvent } from "../materialPluginEvent";
-import { MaterialDefines } from "../../Materials/materialDefines";
-import { PushMaterial } from "../../Materials/pushMaterial";
+import { MaterialDefines } from "../materialDefines";
+import { PushMaterial } from "../pushMaterial";
 
-import type { BaseTexture } from "../../Materials/Textures/baseTexture";
-import { Texture } from "../../Materials/Textures/texture";
-import type { RenderTargetTexture } from "../../Materials/Textures/renderTargetTexture";
-import type { CubeTexture } from "../../Materials/Textures/cubeTexture";
+import type { BaseTexture } from "../Textures/baseTexture";
+import { Texture } from "../Textures/texture";
+import type { RenderTargetTexture } from "../Textures/renderTargetTexture";
+import type { CubeTexture } from "../Textures/cubeTexture";
 
 import { MaterialFlags } from "../materialFlags";
 import { Constants } from "../../Engines/constants";
 import type { IAnimatable } from "../../Animations/animatable.interface";
 
-import "../../Materials/Textures/baseTexture.polynomial";
+import "../Textures/baseTexture.polynomial";
 
 import { EffectFallbacks } from "../effectFallbacks";
 import { PBRClearCoatConfiguration } from "./pbrClearCoatConfiguration";

packages/dev/core/src/Materials/imageProcessing.ts

@@ -3,8 +3,12 @@ import { serializeAsImageProcessingConfiguration } from "../Misc/decorators";
 import type { Nullable } from "../types";
 import type { ImageProcessingConfiguration } from "./imageProcessingConfiguration";
 import type { Observer } from "../Misc/observable";
-import type { BaseTexture } from "../Materials/Textures/baseTexture";
-import type { ColorCurves } from "../Materials/colorCurves";
+import type { BaseTexture } from "./Textures/baseTexture";
+import type { ColorCurves } from "./colorCurves";
+
+// Explicit re-export of types to help TypeScript resolve them in declaration files
+export type { Observer } from "../Misc/observable";
+export type { ColorCurves } from "./colorCurves";
 
 type Constructor<T = {}> = new (...args: any[]) => T;
 

packages/dev/core/src/Materials/index.ts

@@ -5,6 +5,7 @@ export * from "./iEffectFallbacks";
 export * from "./effectFallbacks";
 export * from "./effect";
 export * from "./fresnelParameters";
+export * from "./imageProcessing";
 export * from "./imageProcessingConfiguration";
 export * from "./material";
 export * from "./materialDefines";
@@ -39,6 +40,7 @@ export * from "./meshDebugPluginMaterial";
 export * from "./GaussianSplatting/gaussianSplattingMaterial";
 export * from "./materialHelper.functions";
 export * from "./materialHelper.geometryrendering";
+export * from "./uv.defines";
 import "./material.decalMap";
 
 // async-loaded shaders

packages/dev/core/src/Particles/baseParticleSystem.ts

@@ -2,7 +2,6 @@
 import type { Nullable } from "../types";
 import { Vector2, Vector3 } from "../Maths/math.vector";
 import type { AbstractMesh } from "../Meshes/abstractMesh";
-import type { ImageProcessingConfiguration } from "../Materials/imageProcessingConfiguration";
 import { ImageProcessingConfigurationDefines } from "../Materials/imageProcessingConfiguration.defines";
 import type { ColorGradient, FactorGradient, Color3Gradient, IValueGradient } from "../Misc/gradients";
 import type { BoxParticleEmitter } from "../Particles/EmitterTypes/boxParticleEmitter";
@@ -25,14 +24,16 @@ import type { SphereDirectedParticleEmitter, SphereParticleEmitter } from "./Emi
 import type { CylinderDirectedParticleEmitter, CylinderParticleEmitter } from "./EmitterTypes/cylinderParticleEmitter";
 import type { ConeDirectedParticleEmitter, ConeParticleEmitter } from "./EmitterTypes/coneParticleEmitter";
 import { RegisterClass } from "../Misc/typeStore";
+import { ImageProcessingMixin } from "core/Materials/imageProcessing";
 
+class BaseParticleSystemBase extends ImageProcessingMixin(Object) {}
 /**
  * This represents the base class for particle system in Babylon.
  * Particles are often small sprites used to simulate hard-to-reproduce phenomena like fire, smoke, water, or abstract visual effects like magic glitter and faery dust.
  * Particles can take different shapes while emitted like box, sphere, cone or you can write your custom function.
  * @example https://doc.babylonjs.com/features/featuresDeepDive/particles/particle_system/particle_system_intro
  */
-export class BaseParticleSystem implements IClipPlanesHolder {
+export class BaseParticleSystem extends BaseParticleSystemBase implements IClipPlanesHolder {
     /**
      * Source color is added to the destination color without alpha affecting the result. Great for additive glow effects (fire, magic, lasers)
      */
@@ -740,44 +741,6 @@ export class BaseParticleSystem implements IClipPlanesHolder {
      */
     protected _imageProcessingConfigurationDefines = new ImageProcessingConfigurationDefines();
 
-    /**
-     * Default configuration related to image processing available in the standard Material.
-     */
-    protected _imageProcessingConfiguration: Nullable<ImageProcessingConfiguration>;
-
-    /**
-     * Gets the image processing configuration used either in this material.
-     */
-    public get imageProcessingConfiguration(): Nullable<ImageProcessingConfiguration> {
-        return this._imageProcessingConfiguration;
-    }
-
-    /**
-     * Sets the Default image processing configuration used either in the this material.
-     *
-     * If sets to null, the scene one is in use.
-     */
-    public set imageProcessingConfiguration(value: Nullable<ImageProcessingConfiguration>) {
-        this._attachImageProcessingConfiguration(value);
-    }
-
-    /**
-     * Attaches a new image processing configuration to the Standard Material.
-     * @param configuration
-     */
-    protected _attachImageProcessingConfiguration(configuration: Nullable<ImageProcessingConfiguration>): void {
-        if (configuration === this._imageProcessingConfiguration) {
-            return;
-        }
-
-        // Pick the scene configuration if needed.
-        if (!configuration && this._scene) {
-            this._imageProcessingConfiguration = this._scene.imageProcessingConfiguration;
-        } else {
-            this._imageProcessingConfiguration = configuration;
-        }
-    }
-
     /** @internal */
     protected _reset() {}
 
@@ -811,6 +774,7 @@ export class BaseParticleSystem implements IClipPlanesHolder {
      * @param name The name of the particle system
      */
     public constructor(name: string) {
+        super(name);
         this.id = name;
         this.name = name;
     }