@babylonjs/core 8.28.1 → 8.28.2

package/Materials/Node/nodeMaterial.js

@@ -42,11 +42,16 @@ import { EngineStore } from "../../Engines/engineStore.js";
 import { Material } from "../material.js";
 import { Logger } from "../../Misc/logger.js";
 import { PrepareDefinesForCamera, PrepareDefinesForPrePass } from "../materialHelper.functions.js";
+import { ImageProcessingDefinesMixin } from "../imageProcessingConfiguration.defines.js";
 import { AbstractEngine } from "../../Engines/abstractEngine.js";
 import { MaterialHelperGeometryRendering } from "../materialHelper.geometryrendering.js";
+import { UVDefinesMixin } from "../uv.defines.js";
+import { ImageProcessingMixin } from "../imageProcessing.js";
 const onCreatedEffectParameters = { effect: null, subMesh: null };
+class NodeMaterialDefinesBase extends UVDefinesMixin(MaterialDefines) {
+}
 /** @internal */
-export class NodeMaterialDefines extends MaterialDefines {
+export class NodeMaterialDefines extends ImageProcessingDefinesMixin(NodeMaterialDefinesBase) {
     /**
      * Creates a new NodeMaterialDefines
      */
@@ -58,18 +63,6 @@ export class NodeMaterialDefines extends MaterialDefines {
         this.TANGENT = false;
         /** Vertex color */
         this.VERTEXCOLOR_NME = false;
-        /**  Uv1 **/
-        this.UV1 = false;
-        /** Uv2 **/
-        this.UV2 = false;
-        /** Uv3 **/
-        this.UV3 = false;
-        /** Uv4 **/
-        this.UV4 = false;
-        /** Uv5 **/
-        this.UV5 = false;
-        /** Uv6 **/
-        this.UV6 = false;
         /** Prepass **/
         this.PREPASS = false;
         /** Prepass normal */
@@ -132,36 +125,6 @@ export class NodeMaterialDefines extends MaterialDefines {
         this.NUM_MORPH_INFLUENCERS = 0;
         /** Using a texture to store morph target data */
         this.MORPHTARGETS_TEXTURE = false;
-        /** IMAGE PROCESSING */
-        this.IMAGEPROCESSING = false;
-        /** Vignette */
-        this.VIGNETTE = false;
-        /** Multiply blend mode for vignette */
-        this.VIGNETTEBLENDMODEMULTIPLY = false;
-        /** Opaque blend mode for vignette */
-        this.VIGNETTEBLENDMODEOPAQUE = false;
-        /** Tone mapping */
-        this.TONEMAPPING = 0;
-        /** Contrast */
-        this.CONTRAST = false;
-        /** Exposure */
-        this.EXPOSURE = false;
-        /** Color curves */
-        this.COLORCURVES = false;
-        /** Color grading */
-        this.COLORGRADING = false;
-        /** 3D color grading */
-        this.COLORGRADING3D = false;
-        /** Sampler green depth */
-        this.SAMPLER3DGREENDEPTH = false;
-        /** Sampler for BGR map */
-        this.SAMPLER3DBGRMAP = false;
-        /** Dithering */
-        this.DITHER = false;
-        /** Using post process for image processing */
-        this.IMAGEPROCESSINGPOSTPROCESS = false;
-        /** Skip color clamp */
-        this.SKIPFINALCOLORCLAMP = false;
         /** MISC. */
         this.BUMPDIRECTUV = 0;
         /** Camera is orthographic */
@@ -188,10 +151,12 @@ export class NodeMaterialDefines extends MaterialDefines {
         this[name] = value;
     }
 }
+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 {
     /**
      * Checks if a block is a texture block
      * @param block The block to check
@@ -246,22 +211,6 @@ export class NodeMaterial extends PushMaterial {
     set options(options) {
         this._options = options;
     }
-    /**
-     * Gets the image processing configuration used either in this material.
-     */
-    get 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.
-     */
-    set imageProcessingConfiguration(value) {
-        this._attachImageProcessingConfiguration(value);
-        // Ensure the effect will be rebuilt.
-        this._markAllSubMeshesAsTexturesDirty();
-    }
     /**
      * Gets or sets the mode property
      */
@@ -359,32 +308,6 @@ export class NodeMaterial extends PushMaterial {
     getClassName() {
         return "NodeMaterial";
     }
-    /**
-     * Attaches a new image processing configuration to the Standard Material.
-     * @param configuration
-     */
-    _attachImageProcessingConfiguration(configuration) {
-        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