@onerjs/core 8.26.1 → 8.26.3

package/Materials/Node/nodeMaterial.d.ts

@@ -11,7 +11,6 @@ import { Observable } from "../../Misc/observable.js";
 import type { SubMesh } from "../../Meshes/subMesh.js";
 import { MaterialDefines } from "../../Materials/materialDefines.js";
 import type { NodeMaterialOptimizer } from "./Optimizers/nodeMaterialOptimizer.js";
-import type { ImageProcessingConfiguration } from "../imageProcessingConfiguration.js";
 import type { Nullable } from "../../types.js";
 import { InputBlock } from "./Blocks/Input/inputBlock.js";
 import type { TextureBlock } from "./Blocks/Dual/textureBlock.js";
@@ -31,7 +30,6 @@ import type { TriPlanarBlock } from "./Blocks/triPlanarBlock.js";
 import type { BiPlanarBlock } from "./Blocks/biPlanarBlock.js";
 import type { PrePassRenderer } from "../../Rendering/prePassRenderer.js";
 import type { PrePassTextureBlock } from "./Blocks/Input/prePassTextureBlock.js";
-import type { IImageProcessingConfigurationDefines } from "../imageProcessingConfiguration.defines.js";
 import { ShaderLanguage } from "../shaderLanguage.js";
 import { AbstractEngine } from "../../Engines/abstractEngine.js";
 /**
@@ -45,26 +43,51 @@ export interface INodeMaterialEditorOptions {
         backgroundColor?: Color4;
     };
 }
+declare const NodeMaterialDefinesBase_base: {
+    new (...args: any[]): {
+        MAINUV1: boolean;
+        MAINUV2: boolean;
+        MAINUV3: boolean;
+        MAINUV4: boolean;
+        MAINUV5: boolean;
+        MAINUV6: boolean;
+        UV1: boolean;
+        UV2: boolean;
+        UV3: boolean;
+        UV4: boolean;
+        UV5: boolean;
+        UV6: boolean;
+    };
+} & typeof MaterialDefines;
+declare class NodeMaterialDefinesBase extends NodeMaterialDefinesBase_base {
+}
+declare const NodeMaterialDefines_base: {
+    new (...args: any[]): {
+        IMAGEPROCESSING: boolean;
+        VIGNETTE: boolean;
+        VIGNETTEBLENDMODEMULTIPLY: boolean;
+        VIGNETTEBLENDMODEOPAQUE: boolean;
+        TONEMAPPING: number;
+        CONTRAST: boolean;
+        COLORCURVES: boolean;
+        COLORGRADING: boolean;
+        COLORGRADING3D: boolean;
+        SAMPLER3DGREENDEPTH: boolean;
+        SAMPLER3DBGRMAP: boolean;
+        DITHER: boolean;
+        IMAGEPROCESSINGPOSTPROCESS: boolean;
+        SKIPFINALCOLORCLAMP: boolean;
+        EXPOSURE: boolean;
+    };
+} & typeof NodeMaterialDefinesBase;
 /** @internal */
-export declare class NodeMaterialDefines extends MaterialDefines implements IImageProcessingConfigurationDefines {
+export declare class NodeMaterialDefines extends NodeMaterialDefines_base {
     /** Normal */
     NORMAL: boolean;
     /** Tangent */
     TANGENT: boolean;
     /** Vertex color */
     VERTEXCOLOR_NME: boolean;
-    /**  Uv1 **/
-    UV1: boolean;
-    /** Uv2 **/
-    UV2: boolean;
-    /** Uv3 **/
-    UV3: boolean;
-    /** Uv4 **/
-    UV4: boolean;
-    /** Uv5 **/
-    UV5: boolean;
-    /** Uv6 **/
-    UV6: boolean;
     /** Prepass **/
     PREPASS: boolean;
     /** Prepass normal */
@@ -127,36 +150,6 @@ export declare class NodeMaterialDefines extends MaterialDefines implements IIma
     NUM_MORPH_INFLUENCERS: number;
     /** Using a texture to store morph target data */
     MORPHTARGETS_TEXTURE: boolean;
-    /** IMAGE PROCESSING */
-    IMAGEPROCESSING: boolean;
-    /** Vignette */
-    VIGNETTE: boolean;
-    /** Multiply blend mode for vignette */
-    VIGNETTEBLENDMODEMULTIPLY: boolean;
-    /** Opaque blend mode for vignette */
-    VIGNETTEBLENDMODEOPAQUE: boolean;
-    /** Tone mapping */
-    TONEMAPPING: number;
-    /** Contrast */
-    CONTRAST: boolean;
-    /** Exposure */
-    EXPOSURE: boolean;
-    /** Color curves */
-    COLORCURVES: boolean;
-    /** Color grading */
-    COLORGRADING: boolean;
-    /** 3D color grading */
-    COLORGRADING3D: boolean;
-    /** Sampler green depth */
-    SAMPLER3DGREENDEPTH: boolean;
-    /** Sampler for BGR map */
-    SAMPLER3DBGRMAP: boolean;
-    /** Dithering */
-    DITHER: boolean;
-    /** Using post process for image processing */
-    IMAGEPROCESSINGPOSTPROCESS: boolean;
-    /** Skip color clamp */
-    SKIPFINALCOLORCLAMP: boolean;
     /** MISC. */
     BUMPDIRECTUV: number;
     /** Camera is orthographic */
@@ -192,10 +185,27 @@ export interface INodeMaterialOptions {
  * Blocks that manage a texture
  */
 export type NodeMaterialTextureBlocks = TextureBlock | ReflectionTextureBaseBlock | RefractionBlock | CurrentScreenBlock | ParticleTextureBlock | ImageSourceBlock | TriPlanarBlock | BiPlanarBlock | PrePassTextureBlock;
+declare const NodeMaterialBase_base: {
+    new (...args: any[]): {
+        _imageProcessingConfiguration: import("../index.js").ImageProcessingConfiguration;
+        imageProcessingConfiguration: import("../index.js").ImageProcessingConfiguration;
+        _imageProcessingObserver: Nullable<import("../../Misc/observable.js").Observer<import("../index.js").ImageProcessingConfiguration>>;
+        _attachImageProcessingConfiguration(configuration: Nullable<import("../index.js").ImageProcessingConfiguration>): void;
+        cameraColorCurvesEnabled: boolean;
+        cameraColorGradingEnabled: boolean;
+        cameraToneMappingEnabled: boolean;
+        cameraExposure: number;
+        cameraContrast: number;
+        cameraColorGradingTexture: Nullable<BaseTexture>;
+        cameraColorCurves: Nullable<import("../index.js").ColorCurves>;
+    };
+} & typeof PushMaterial;
+declare class NodeMaterialBase extends NodeMaterialBase_base {
+}
 /**
  * Class used to create a node based material built by assembling shader blocks
  */
-export declare class NodeMaterial extends PushMaterial {
+export declare class NodeMaterial extends NodeMaterialBase {
     private static _BuildIdGenerator;
     private _options;
     private _vertexCompilationState;
@@ -275,20 +285,6 @@ export declare class NodeMaterial extends PushMaterial {
     /** Gets or sets options to control the node material overall behavior */
     get options(): INodeMaterialOptions;
     set options(options: INodeMaterialOptions);
-    /**
-     * Default configuration related to image processing available in the standard Material.
-     */
-    protected _imageProcessingConfiguration: ImageProcessingConfiguration;
-    /**
-     * Gets the image processing configuration used either in this material.
-     */
-    get imageProcessingConfiguration(): 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: ImageProcessingConfiguration);
     /**
      * Gets an array of blocks that needs to be serialized even if they are not yet connected
      */
@@ -322,15 +318,6 @@ export declare class NodeMaterial extends PushMaterial {
      * @returns the class name
      */
     getClassName(): string;
-    /**
-     * Keep track of the image processing observer to allow dispose and replace.
-     */
-    private _imageProcessingObserver;
-    /**
-     * Attaches a new image processing configuration to the Standard Material.
-     * @param configuration
-     */
-    protected _attachImageProcessingConfiguration(configuration: Nullable<ImageProcessingConfiguration>): void;
     /**
      * Get a block by its name
      * @param name defines the name of the block to retrieve
@@ -663,3 +650,4 @@ export declare class NodeMaterial extends PushMaterial {
      */
     static CreateDefault(name: string, scene?: Scene): NodeMaterial;
 }
+export {};

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