@onerjs/core 8.28.0 → 8.28.2

package/PostProcesses/thinFilterPostProcess.js

@@ -0,0 +1,51 @@
+import { EffectWrapper } from "../Materials/effectRenderer.js";
+import { Engine } from "../Engines/engine.js";
+import { Matrix } from "../Maths/math.vector.js";
+/**
+ * Post process used to apply a kernel filter
+ */
+export class ThinFilterPostProcess extends EffectWrapper {
+    _gatherImports(useWebGPU, list) {
+        if (useWebGPU) {
+            this._webGPUReady = true;
+            list.push(import("../ShadersWGSL/filter.fragment.js"));
+        }
+        else {
+            list.push(import("../Shaders/filter.fragment.js"));
+        }
+    }
+    /**
+     * Constructs a new filter post process
+     * @param name Name of the effect
+     * @param engine Engine to use to render the effect. If not provided, the last created engine will be used
+     * @param options Options to configure the effect
+     */
+    constructor(name, engine = null, options) {
+        super({
+            ...options,
+            name,
+            engine: engine || Engine.LastCreatedEngine,
+            useShaderStore: true,
+            useAsPostProcess: true,
+            fragmentShader: ThinFilterPostProcess.FragmentUrl,
+            uniforms: ThinFilterPostProcess.Uniforms,
+        });
+        /**
+         * The matrix to be applied to the image
+         */
+        this.kernelMatrix = Matrix.Identity();
+    }
+    bind(noDefaultBindings = false) {
+        super.bind(noDefaultBindings);
+        this._drawWrapper.effect.setMatrix("kernelMatrix", this.kernelMatrix);
+    }
+}
+/**
+ * The fragment shader url
+ */
+ThinFilterPostProcess.FragmentUrl = "filter";
+/**
+ * The list of uniforms used by the effect
+ */
+ThinFilterPostProcess.Uniforms = ["kernelMatrix"];
+//# sourceMappingURL=thinFilterPostProcess.js.map

package/PostProcesses/thinFilterPostProcess.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"thinFilterPostProcess.js","sourceRoot":"","sources":["../../../../dev/core/src/PostProcesses/thinFilterPostProcess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,aAAa;IAWjC,cAAc,CAAC,SAAkB,EAAE,IAAoB;QACtE,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,CAAC;QACpD,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,YAAY,IAAY,EAAE,SAAmC,IAAI,EAAE,OAAsC;QACrG,KAAK,CAAC;YACF,GAAG,OAAO;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,IAAI,MAAM,CAAC,iBAAkB;YAC3C,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,qBAAqB,CAAC,WAAW;YACjD,QAAQ,EAAE,qBAAqB,CAAC,QAAQ;SAC3C,CAAC,CAAC;QAGP;;WAEG;QACI,iBAAY,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IALxC,CAAC;IAOe,IAAI,CAAC,iBAAiB,GAAG,KAAK;QAC1C,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,MAAO,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3E,CAAC;;AA7CD;;GAEG;AACoB,iCAAW,GAAG,QAAQ,AAAX,CAAY;AAE9C;;GAEG;AACoB,8BAAQ,GAAG,CAAC,cAAc,CAAC,AAAnB,CAAoB","sourcesContent":["import type { Nullable, AbstractEngine, EffectWrapperCreationOptions } from \"core/index\";\r\nimport { EffectWrapper } from \"../Materials/effectRenderer\";\r\nimport { Engine } from \"../Engines/engine\";\r\nimport { Matrix } from \"../Maths/math.vector\";\r\n\r\n/**\r\n * Post process used to apply a kernel filter\r\n */\r\nexport class ThinFilterPostProcess extends EffectWrapper {\r\n    /**\r\n     * The fragment shader url\r\n     */\r\n    public static readonly FragmentUrl = \"filter\";\r\n\r\n    /**\r\n     * The list of uniforms used by the effect\r\n     */\r\n    public static readonly Uniforms = [\"kernelMatrix\"];\r\n\r\n    protected override _gatherImports(useWebGPU: boolean, list: Promise<any>[]) {\r\n        if (useWebGPU) {\r\n            this._webGPUReady = true;\r\n            list.push(import(\"../ShadersWGSL/filter.fragment\"));\r\n        } else {\r\n            list.push(import(\"../Shaders/filter.fragment\"));\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Constructs a new filter post process\r\n     * @param name Name of the effect\r\n     * @param engine Engine to use to render the effect. If not provided, the last created engine will be used\r\n     * @param options Options to configure the effect\r\n     */\r\n    constructor(name: string, engine: Nullable<AbstractEngine> = null, options?: EffectWrapperCreationOptions) {\r\n        super({\r\n            ...options,\r\n            name,\r\n            engine: engine || Engine.LastCreatedEngine!,\r\n            useShaderStore: true,\r\n            useAsPostProcess: true,\r\n            fragmentShader: ThinFilterPostProcess.FragmentUrl,\r\n            uniforms: ThinFilterPostProcess.Uniforms,\r\n        });\r\n    }\r\n\r\n    /**\r\n     * The matrix to be applied to the image\r\n     */\r\n    public kernelMatrix = Matrix.Identity();\r\n\r\n    public override bind(noDefaultBindings = false) {\r\n        super.bind(noDefaultBindings);\r\n        this._drawWrapper.effect!.setMatrix(\"kernelMatrix\", this.kernelMatrix);\r\n    }\r\n}\r\n"]}

package/PostProcesses/thinTonemapPostProcess.d.ts

@@ -0,0 +1,52 @@
+import type { Nullable, AbstractEngine, EffectWrapperCreationOptions } from "../index.js";
+import { EffectWrapper } from "../Materials/effectRenderer.js";
+/** Defines operator used for tonemapping */
+export declare enum TonemappingOperator {
+    /** Hable */
+    Hable = 0,
+    /** Reinhard */
+    Reinhard = 1,
+    /** HejiDawson */
+    HejiDawson = 2,
+    /** Photographic */
+    Photographic = 3
+}
+/**
+ * Options used to create a ThinTonemapPostProcess.
+ */
+export interface ThinTonemapPostProcessOptions extends EffectWrapperCreationOptions {
+    /** Defines the operator to use (default: Reinhard) */
+    operator?: TonemappingOperator;
+    /** Defines the required exposure adjustment (default: 1.0) */
+    exposureAdjustment?: number;
+}
+/**
+ * Post process used to apply a tone mapping operator
+ */
+export declare class ThinTonemapPostProcess extends EffectWrapper {
+    /**
+     * The fragment shader url
+     */
+    static readonly FragmentUrl = "tonemap";
+    /**
+     * The list of uniforms used by the effect
+     */
+    static readonly Uniforms: string[];
+    protected _gatherImports(useWebGPU: boolean, list: Promise<any>[]): void;
+    /**
+     * Constructs a new tone mapping post process
+     * @param name Name of the effect
+     * @param engine Engine to use to render the effect. If not provided, the last created engine will be used
+     * @param options Options to configure the effect
+     */
+    constructor(name: string, engine?: Nullable<AbstractEngine>, options?: ThinTonemapPostProcessOptions);
+    /**
+     * Gets the operator to use (default: Reinhard)
+     */
+    readonly operator: TonemappingOperator;
+    /**
+     * Defines the required exposure adjustment (default: 1.0)
+     */
+    exposureAdjustment: number;
+    bind(noDefaultBindings?: boolean): void;
+}

package/PostProcesses/thinTonemapPostProcess.js

@@ -0,0 +1,83 @@
+import { EffectWrapper } from "../Materials/effectRenderer.js";
+import { Engine } from "../Engines/engine.js";
+/** Defines operator used for tonemapping */
+export var TonemappingOperator;
+(function (TonemappingOperator) {
+    /** Hable */
+    TonemappingOperator[TonemappingOperator["Hable"] = 0] = "Hable";
+    /** Reinhard */
+    TonemappingOperator[TonemappingOperator["Reinhard"] = 1] = "Reinhard";
+    /** HejiDawson */
+    TonemappingOperator[TonemappingOperator["HejiDawson"] = 2] = "HejiDawson";
+    /** Photographic */
+    TonemappingOperator[TonemappingOperator["Photographic"] = 3] = "Photographic";
+})(TonemappingOperator || (TonemappingOperator = {}));
+/**
+ * Post process used to apply a tone mapping operator
+ */
+export class ThinTonemapPostProcess extends EffectWrapper {
+    _gatherImports(useWebGPU, list) {
+        if (useWebGPU) {
+            this._webGPUReady = true;
+            list.push(import("../ShadersWGSL/tonemap.fragment.js"));
+        }
+        else {
+            list.push(import("../Shaders/tonemap.fragment.js"));
+        }
+    }
+    /**
+     * Constructs a new tone mapping post process
+     * @param name Name of the effect
+     * @param engine Engine to use to render the effect. If not provided, the last created engine will be used
+     * @param options Options to configure the effect
+     */
+    constructor(name, engine = null, options) {
+        const operator = options?.operator ?? 1 /* TonemappingOperator.Reinhard */;
+        let defines = "#define ";
+        if (operator === 0 /* TonemappingOperator.Hable */) {
+            defines += "HABLE_TONEMAPPING";
+        }
+        else if (operator === 1 /* TonemappingOperator.Reinhard */) {
+            defines += "REINHARD_TONEMAPPING";
+        }
+        else if (operator === 2 /* TonemappingOperator.HejiDawson */) {
+            defines += "OPTIMIZED_HEJIDAWSON_TONEMAPPING";
+        }
+        else if (operator === 3 /* TonemappingOperator.Photographic */) {
+            defines += "PHOTOGRAPHIC_TONEMAPPING";
+        }
+        super({
+            ...options,
+            name,
+            engine: engine || Engine.LastCreatedEngine,
+            useShaderStore: true,
+            useAsPostProcess: true,
+            fragmentShader: ThinTonemapPostProcess.FragmentUrl,
+            uniforms: ThinTonemapPostProcess.Uniforms,
+            defines,
+        });
+        /**
+         * Gets the operator to use (default: Reinhard)
+         */
+        this.operator = 1 /* TonemappingOperator.Reinhard */;
+        /**
+         * Defines the required exposure adjustment (default: 1.0)
+         */
+        this.exposureAdjustment = 1;
+        this.operator = operator;
+        this.exposureAdjustment = options?.exposureAdjustment ?? 1;
+    }
+    bind(noDefaultBindings = false) {
+        super.bind(noDefaultBindings);
+        this._drawWrapper.effect.setFloat("_ExposureAdjustment", this.exposureAdjustment);
+    }
+}
+/**
+ * The fragment shader url
+ */
+ThinTonemapPostProcess.FragmentUrl = "tonemap";
+/**
+ * The list of uniforms used by the effect
+ */
+ThinTonemapPostProcess.Uniforms = ["_ExposureAdjustment"];
+//# sourceMappingURL=thinTonemapPostProcess.js.map

package/PostProcesses/thinTonemapPostProcess.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"thinTonemapPostProcess.js","sourceRoot":"","sources":["../../../../dev/core/src/PostProcesses/thinTonemapPostProcess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,4CAA4C;AAC5C,MAAM,CAAN,IAAkB,mBASjB;AATD,WAAkB,mBAAmB;IACjC,YAAY;IACZ,+DAAS,CAAA;IACT,eAAe;IACf,qEAAY,CAAA;IACZ,iBAAiB;IACjB,yEAAc,CAAA;IACd,mBAAmB;IACnB,6EAAgB,CAAA;AACpB,CAAC,EATiB,mBAAmB,KAAnB,mBAAmB,QASpC;AAcD;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,aAAa;IAWlC,cAAc,CAAC,SAAkB,EAAE,IAAoB;QACtE,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACrD,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,YAAY,IAAY,EAAE,SAAmC,IAAI,EAAE,OAAuC;QACtG,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,wCAAgC,CAAC;QAEnE,IAAI,OAAO,GAAG,UAAU,CAAC;QAEzB,IAAI,QAAQ,sCAA8B,EAAE,CAAC;YACzC,OAAO,IAAI,mBAAmB,CAAC;QACnC,CAAC;aAAM,IAAI,QAAQ,yCAAiC,EAAE,CAAC;YACnD,OAAO,IAAI,sBAAsB,CAAC;QACtC,CAAC;aAAM,IAAI,QAAQ,2CAAmC,EAAE,CAAC;YACrD,OAAO,IAAI,kCAAkC,CAAC;QAClD,CAAC;aAAM,IAAI,QAAQ,6CAAqC,EAAE,CAAC;YACvD,OAAO,IAAI,0BAA0B,CAAC;QAC1C,CAAC;QAED,KAAK,CAAC;YACF,GAAG,OAAO;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,IAAI,MAAM,CAAC,iBAAkB;YAC3C,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,sBAAsB,CAAC,WAAW;YAClD,QAAQ,EAAE,sBAAsB,CAAC,QAAQ;YACzC,OAAO;SACV,CAAC,CAAC;QAMP;;WAEG;QACa,aAAQ,wCAAqD;QAE7E;;WAEG;QACI,uBAAkB,GAAG,CAAC,CAAC;QAZ1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,CAAC,CAAC;IAC/D,CAAC;IAYe,IAAI,CAAC,iBAAiB,GAAG,KAAK;QAC1C,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,MAAO,CAAC,QAAQ,CAAC,qBAAqB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;IACvF,CAAC;;AApED;;GAEG;AACoB,kCAAW,GAAG,SAAS,AAAZ,CAAa;AAE/C;;GAEG;AACoB,+BAAQ,GAAG,CAAC,qBAAqB,CAAC,AAA1B,CAA2B","sourcesContent":["import type { Nullable, AbstractEngine, EffectWrapperCreationOptions } from \"core/index\";\r\nimport { EffectWrapper } from \"../Materials/effectRenderer\";\r\nimport { Engine } from \"../Engines/engine\";\r\n\r\n/** Defines operator used for tonemapping */\r\nexport const enum TonemappingOperator {\r\n    /** Hable */\r\n    Hable = 0,\r\n    /** Reinhard */\r\n    Reinhard = 1,\r\n    /** HejiDawson */\r\n    HejiDawson = 2,\r\n    /** Photographic */\r\n    Photographic = 3,\r\n}\r\n\r\n/**\r\n * Options used to create a ThinTonemapPostProcess.\r\n */\r\n// eslint-disable-next-line @typescript-eslint/naming-convention\r\nexport interface ThinTonemapPostProcessOptions extends EffectWrapperCreationOptions {\r\n    /** Defines the operator to use (default: Reinhard) */\r\n    operator?: TonemappingOperator;\r\n\r\n    /** Defines the required exposure adjustment (default: 1.0) */\r\n    exposureAdjustment?: number;\r\n}\r\n\r\n/**\r\n * Post process used to apply a tone mapping operator\r\n */\r\nexport class ThinTonemapPostProcess extends EffectWrapper {\r\n    /**\r\n     * The fragment shader url\r\n     */\r\n    public static readonly FragmentUrl = \"tonemap\";\r\n\r\n    /**\r\n     * The list of uniforms used by the effect\r\n     */\r\n    public static readonly Uniforms = [\"_ExposureAdjustment\"];\r\n\r\n    protected override _gatherImports(useWebGPU: boolean, list: Promise<any>[]) {\r\n        if (useWebGPU) {\r\n            this._webGPUReady = true;\r\n            list.push(import(\"../ShadersWGSL/tonemap.fragment\"));\r\n        } else {\r\n            list.push(import(\"../Shaders/tonemap.fragment\"));\r\n        }\r\n    }\r\n\r\n    /**\r\n     * Constructs a new tone mapping post process\r\n     * @param name Name of the effect\r\n     * @param engine Engine to use to render the effect. If not provided, the last created engine will be used\r\n     * @param options Options to configure the effect\r\n     */\r\n    constructor(name: string, engine: Nullable<AbstractEngine> = null, options?: ThinTonemapPostProcessOptions) {\r\n        const operator = options?.operator ?? TonemappingOperator.Reinhard;\r\n\r\n        let defines = \"#define \";\r\n\r\n        if (operator === TonemappingOperator.Hable) {\r\n            defines += \"HABLE_TONEMAPPING\";\r\n        } else if (operator === TonemappingOperator.Reinhard) {\r\n            defines += \"REINHARD_TONEMAPPING\";\r\n        } else if (operator === TonemappingOperator.HejiDawson) {\r\n            defines += \"OPTIMIZED_HEJIDAWSON_TONEMAPPING\";\r\n        } else if (operator === TonemappingOperator.Photographic) {\r\n            defines += \"PHOTOGRAPHIC_TONEMAPPING\";\r\n        }\r\n\r\n        super({\r\n            ...options,\r\n            name,\r\n            engine: engine || Engine.LastCreatedEngine!,\r\n            useShaderStore: true,\r\n            useAsPostProcess: true,\r\n            fragmentShader: ThinTonemapPostProcess.FragmentUrl,\r\n            uniforms: ThinTonemapPostProcess.Uniforms,\r\n            defines,\r\n        });\r\n\r\n        this.operator = operator;\r\n        this.exposureAdjustment = options?.exposureAdjustment ?? 1;\r\n    }\r\n\r\n    /**\r\n     * Gets the operator to use (default: Reinhard)\r\n     */\r\n    public readonly operator: TonemappingOperator = TonemappingOperator.Reinhard;\r\n\r\n    /**\r\n     * Defines the required exposure adjustment (default: 1.0)\r\n     */\r\n    public exposureAdjustment = 1;\r\n\r\n    public override bind(noDefaultBindings = false) {\r\n        super.bind(noDefaultBindings);\r\n        this._drawWrapper.effect!.setFloat(\"_ExposureAdjustment\", this.exposureAdjustment);\r\n    }\r\n}\r\n"]}

package/PostProcesses/tonemapPostProcess.d.ts

@@ -1,43 +1,45 @@
-import type { Camera } from "../Cameras/camera.js";
+import { Camera } from "../Cameras/camera.js";
+import type { PostProcessOptions } from "./postProcess.js";
 import { PostProcess } from "./postProcess.js";
 import type { Nullable } from "../types.js";
 import type { AbstractEngine } from "../Engines/abstractEngine.js";
-/** Defines operator used for tonemapping */
-export declare enum TonemappingOperator {
-    /** Hable */
-    Hable = 0,
-    /** Reinhard */
-    Reinhard = 1,
-    /** HejiDawson */
-    HejiDawson = 2,
-    /** Photographic */
-    Photographic = 3
-}
+import type { ThinTonemapPostProcessOptions, TonemappingOperator } from "./thinTonemapPostProcess.js";
+import { ThinTonemapPostProcess } from "./thinTonemapPostProcess.js";
+import type { Scene } from "../scene.js";
+export type ToneMapPostProcessOptions = ThinTonemapPostProcessOptions & PostProcessOptions;
 /**
  * Defines a post process to apply tone mapping
  */
 export declare class TonemapPostProcess extends PostProcess {
-    private _operator;
-    /** Defines the required exposure adjustment */
-    exposureAdjustment: number;
+    /**
+     * Defines the required exposure adjustment
+     */
+    get exposureAdjustment(): number;
+    set exposureAdjustment(value: number);
+    /**
+     * Gets the operator used for tonemapping
+     */
+    get operator(): TonemappingOperator;
     /**
      * Gets a string identifying the name of the class
      * @returns "TonemapPostProcess" string
      */
     getClassName(): string;
+    protected _effectWrapper: ThinTonemapPostProcess;
     /**
      * Creates a new TonemapPostProcess
      * @param name defines the name of the postprocess
-     * @param _operator defines the operator to use
+     * @param operator defines the operator to use
      * @param exposureAdjustment defines the required exposure adjustment
      * @param camera defines the camera to use (can be null)
      * @param samplingMode defines the required sampling mode (BABYLON.Texture.BILINEAR_SAMPLINGMODE by default)
      * @param engine defines the hosting engine (can be ignore if camera is set)
-     * @param textureFormat defines the texture format to use (BABYLON.Engine.TEXTURETYPE_UNSIGNED_BYTE by default)
+     * @param textureType defines the texture format to use (BABYLON.Engine.TEXTURETYPE_UNSIGNED_BYTE by default)
      * @param reusable If the post process can be reused on the same frame. (default: false)
      */
-    constructor(name: string, _operator: TonemappingOperator, 
-    /** Defines the required exposure adjustment */
-    exposureAdjustment: number, camera: Nullable<Camera>, samplingMode?: number, engine?: AbstractEngine, textureFormat?: number, reusable?: boolean);
-    protected _gatherImports(useWebGPU: boolean, list: Promise<any>[]): void;
+    constructor(name: string, operator: TonemappingOperator, exposureAdjustment: number, camera: Nullable<Camera> | ToneMapPostProcessOptions, samplingMode?: number, engine?: AbstractEngine, textureType?: number, reusable?: boolean);
+    /**
+     * @internal
+     */
+    static _Parse(parsedPostProcess: any, targetCamera: Camera, scene: Scene, rootUrl: string): Nullable<TonemapPostProcess>;
 }

package/PostProcesses/tonemapPostProcess.js

@@ -1,21 +1,30 @@
+import { __decorate } from "../tslib.es6.js";
+import { Camera } from "../Cameras/camera.js";
 import { PostProcess } from "./postProcess.js";
 
-/** Defines operator used for tonemapping */
-export var TonemappingOperator;
-(function (TonemappingOperator) {
-    /** Hable */
-    TonemappingOperator[TonemappingOperator["Hable"] = 0] = "Hable";
-    /** Reinhard */
-    TonemappingOperator[TonemappingOperator["Reinhard"] = 1] = "Reinhard";
-    /** HejiDawson */
-    TonemappingOperator[TonemappingOperator["HejiDawson"] = 2] = "HejiDawson";
-    /** Photographic */
-    TonemappingOperator[TonemappingOperator["Photographic"] = 3] = "Photographic";
-})(TonemappingOperator || (TonemappingOperator = {}));
+import { RegisterClass } from "../Misc/typeStore.js";
+import { serialize } from "../Misc/decorators.js";
+import { SerializationHelper } from "../Misc/decorators.serialization.js";
+import { ThinTonemapPostProcess } from "./thinTonemapPostProcess.js";
 /**
  * Defines a post process to apply tone mapping
  */
 export class TonemapPostProcess extends PostProcess {
+    /**
+     * Defines the required exposure adjustment
+     */
+    get exposureAdjustment() {
+        return this._effectWrapper.exposureAdjustment;
+    }
+    set exposureAdjustment(value) {
+        this._effectWrapper.exposureAdjustment = value;
+    }
+    /**
+     * Gets the operator used for tonemapping
+     */
+    get operator() {
+        return this._effectWrapper.operator;
+    }
     /**
      * Gets a string identifying the name of the class
      * @returns "TonemapPostProcess" string
@@ -26,48 +35,48 @@ export class TonemapPostProcess extends PostProcess {
     /**
      * Creates a new TonemapPostProcess
      * @param name defines the name of the postprocess
-     * @param _operator defines the operator to use
+     * @param operator defines the operator to use
      * @param exposureAdjustment defines the required exposure adjustment
      * @param camera defines the camera to use (can be null)
      * @param samplingMode defines the required sampling mode (BABYLON.Texture.BILINEAR_SAMPLINGMODE by default)
      * @param engine defines the hosting engine (can be ignore if camera is set)
-     * @param textureFormat defines the texture format to use (BABYLON.Engine.TEXTURETYPE_UNSIGNED_BYTE by default)
+     * @param textureType defines the texture format to use (BABYLON.Engine.TEXTURETYPE_UNSIGNED_BYTE by default)
      * @param reusable If the post process can be reused on the same frame. (default: false)
      */
-    constructor(name, _operator, 
-    /** Defines the required exposure adjustment */
-    exposureAdjustment, camera, samplingMode = 2, engine, textureFormat = 0, reusable) {
-        super(name, "tonemap", ["_ExposureAdjustment"], null, 1.0, camera, samplingMode, engine, reusable, null, textureFormat);
-        this._operator = _operator;
-        this.exposureAdjustment = exposureAdjustment;
-        let defines = "#define ";
-        if (this._operator === 0 /* TonemappingOperator.Hable */) {
-            defines += "HABLE_TONEMAPPING";
-        }
-        else if (this._operator === 1 /* TonemappingOperator.Reinhard */) {
-            defines += "REINHARD_TONEMAPPING";
-        }
-        else if (this._operator === 2 /* TonemappingOperator.HejiDawson */) {
-            defines += "OPTIMIZED_HEJIDAWSON_TONEMAPPING";
-        }
-        else if (this._operator === 3 /* TonemappingOperator.Photographic */) {
-            defines += "PHOTOGRAPHIC_TONEMAPPING";
-        }
-        //sadly a second call to create the effect.
-        this.updateEffect(defines);
-        this.onApply = (effect) => {
-            effect.setFloat("_ExposureAdjustment", this.exposureAdjustment);
+    constructor(name, operator, exposureAdjustment, camera, samplingMode = 2, engine, textureType = 0, reusable) {
+        const cameraIsCamera = camera === null || camera instanceof Camera;
+        const localOptions = {
+            operator,
+            exposureAdjustment,
+            uniforms: ThinTonemapPostProcess.Uniforms,
+            camera: cameraIsCamera ? camera : undefined,
+            samplingMode,
+            engine,
+            reusable,
+            textureType,
         };
-    }
-    _gatherImports(useWebGPU, list) {
-        if (useWebGPU) {
-            this._webGPUReady = true;
-            list.push(Promise.all([import("../ShadersWGSL/tonemap.fragment.js")]));
+        if (!cameraIsCamera) {
+            Object.assign(localOptions, camera);
         }
-        else {
-            list.push(Promise.all([import("../Shaders/tonemap.fragment.js")]));
-        }
-        super._gatherImports(useWebGPU, list);
+        super(name, ThinTonemapPostProcess.FragmentUrl, {
+            effectWrapper: cameraIsCamera || !camera.effectWrapper ? new ThinTonemapPostProcess(name, engine, localOptions) : undefined,
+            ...localOptions,
+        });
+    }
+    /**
+     * @internal
+     */
+    static _Parse(parsedPostProcess, targetCamera, scene, rootUrl) {
+        return SerializationHelper.Parse(() => {
+            return new TonemapPostProcess(parsedPostProcess.name, parsedPostProcess.operator, parsedPostProcess.exposureAdjustment, targetCamera, parsedPostProcess.renderTargetSamplingMode, scene.getEngine(), parsedPostProcess.textureType, parsedPostProcess.reusable);
+        }, parsedPostProcess, scene, rootUrl);
     }
 }
+__decorate([
+    serialize()
+], TonemapPostProcess.prototype, "exposureAdjustment", null);
+__decorate([
+    serialize()
+], TonemapPostProcess.prototype, "operator", null);
+RegisterClass("BABYLON.TonemapPostProcess", TonemapPostProcess);
 //# sourceMappingURL=tonemapPostProcess.js.map

package/PostProcesses/tonemapPostProcess.js.map

@@ -1 +1 @@
-{"version":3,"file":"tonemapPostProcess.js","sourceRoot":"","sources":["../../../../dev/core/src/PostProcesses/tonemapPostProcess.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAMjD,4CAA4C;AAC5C,MAAM,CAAN,IAAkB,mBASjB;AATD,WAAkB,mBAAmB;IACjC,YAAY;IACZ,+DAAS,CAAA;IACT,eAAe;IACf,qEAAY,CAAA;IACZ,iBAAiB;IACjB,yEAAc,CAAA;IACd,mBAAmB;IACnB,6EAAgB,CAAA;AACpB,CAAC,EATiB,mBAAmB,KAAnB,mBAAmB,QASpC;AAED;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IAC/C;;;OAGG;IACa,YAAY;QACxB,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED;;;;;;;;;;OAUG;IACH,YACI,IAAY,EACJ,SAA8B;IACtC,+CAA+C;IACxC,kBAA0B,EACjC,MAAwB,EACxB,eAAuB,SAAS,CAAC,6BAA6B,EAC9D,MAAuB,EACvB,aAAa,GAAG,SAAS,CAAC,yBAAyB,EACnD,QAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAThH,cAAS,GAAT,SAAS,CAAqB;QAE/B,uBAAkB,GAAlB,kBAAkB,CAAQ;QASjC,IAAI,OAAO,GAAG,UAAU,CAAC;QAEzB,IAAI,IAAI,CAAC,SAAS,sCAA8B,EAAE,CAAC;YAC/C,OAAO,IAAI,mBAAmB,CAAC;QACnC,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,yCAAiC,EAAE,CAAC;YACzD,OAAO,IAAI,sBAAsB,CAAC;QACtC,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,2CAAmC,EAAE,CAAC;YAC3D,OAAO,IAAI,kCAAkC,CAAC;QAClD,CAAC;aAAM,IAAI,IAAI,CAAC,SAAS,6CAAqC,EAAE,CAAC;YAC7D,OAAO,IAAI,0BAA0B,CAAC;QAC1C,CAAC;QAED,2CAA2C;QAC3C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,GAAG,CAAC,MAAc,EAAE,EAAE;YAC9B,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACpE,CAAC,CAAC;IACN,CAAC;IAEkB,cAAc,CAAC,SAAkB,EAAE,IAAoB;QACtE,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;CACJ","sourcesContent":["import type { Camera } from \"../Cameras/camera\";\r\nimport type { Effect } from \"../Materials/effect\";\r\nimport { PostProcess } from \"./postProcess\";\r\nimport { Constants } from \"../Engines/constants\";\r\n\r\nimport type { Nullable } from \"../types\";\r\n\r\nimport type { AbstractEngine } from \"core/Engines/abstractEngine\";\r\n\r\n/** Defines operator used for tonemapping */\r\nexport const enum TonemappingOperator {\r\n    /** Hable */\r\n    Hable = 0,\r\n    /** Reinhard */\r\n    Reinhard = 1,\r\n    /** HejiDawson */\r\n    HejiDawson = 2,\r\n    /** Photographic */\r\n    Photographic = 3,\r\n}\r\n\r\n/**\r\n * Defines a post process to apply tone mapping\r\n */\r\nexport class TonemapPostProcess extends PostProcess {\r\n    /**\r\n     * Gets a string identifying the name of the class\r\n     * @returns \"TonemapPostProcess\" string\r\n     */\r\n    public override getClassName(): string {\r\n        return \"TonemapPostProcess\";\r\n    }\r\n\r\n    /**\r\n     * Creates a new TonemapPostProcess\r\n     * @param name defines the name of the postprocess\r\n     * @param _operator defines the operator to use\r\n     * @param exposureAdjustment defines the required exposure adjustment\r\n     * @param camera defines the camera to use (can be null)\r\n     * @param samplingMode defines the required sampling mode (BABYLON.Texture.BILINEAR_SAMPLINGMODE by default)\r\n     * @param engine defines the hosting engine (can be ignore if camera is set)\r\n     * @param textureFormat defines the texture format to use (BABYLON.Engine.TEXTURETYPE_UNSIGNED_BYTE by default)\r\n     * @param reusable If the post process can be reused on the same frame. (default: false)\r\n     */\r\n    constructor(\r\n        name: string,\r\n        private _operator: TonemappingOperator,\r\n        /** Defines the required exposure adjustment */\r\n        public exposureAdjustment: number,\r\n        camera: Nullable<Camera>,\r\n        samplingMode: number = Constants.TEXTURE_BILINEAR_SAMPLINGMODE,\r\n        engine?: AbstractEngine,\r\n        textureFormat = Constants.TEXTURETYPE_UNSIGNED_BYTE,\r\n        reusable?: boolean\r\n    ) {\r\n        super(name, \"tonemap\", [\"_ExposureAdjustment\"], null, 1.0, camera, samplingMode, engine, reusable, null, textureFormat);\r\n\r\n        let defines = \"#define \";\r\n\r\n        if (this._operator === TonemappingOperator.Hable) {\r\n            defines += \"HABLE_TONEMAPPING\";\r\n        } else if (this._operator === TonemappingOperator.Reinhard) {\r\n            defines += \"REINHARD_TONEMAPPING\";\r\n        } else if (this._operator === TonemappingOperator.HejiDawson) {\r\n            defines += \"OPTIMIZED_HEJIDAWSON_TONEMAPPING\";\r\n        } else if (this._operator === TonemappingOperator.Photographic) {\r\n            defines += \"PHOTOGRAPHIC_TONEMAPPING\";\r\n        }\r\n\r\n        //sadly a second call to create the effect.\r\n        this.updateEffect(defines);\r\n\r\n        this.onApply = (effect: Effect) => {\r\n            effect.setFloat(\"_ExposureAdjustment\", this.exposureAdjustment);\r\n        };\r\n    }\r\n\r\n    protected override _gatherImports(useWebGPU: boolean, list: Promise<any>[]) {\r\n        if (useWebGPU) {\r\n            this._webGPUReady = true;\r\n            list.push(Promise.all([import(\"../ShadersWGSL/tonemap.fragment\")]));\r\n        } else {\r\n            list.push(Promise.all([import(\"../Shaders/tonemap.fragment\")]));\r\n        }\r\n\r\n        super._gatherImports(useWebGPU, list);\r\n    }\r\n}\r\n"]}
+{"version":3,"file":"tonemapPostProcess.js","sourceRoot":"","sources":["../../../../dev/core/src/PostProcesses/tonemapPostProcess.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAKvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAKlE;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IAC/C;;OAEG;IAEH,IAAW,kBAAkB;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC;IAClD,CAAC;IAED,IAAW,kBAAkB,CAAC,KAAa;QACvC,IAAI,CAAC,cAAc,CAAC,kBAAkB,GAAG,KAAK,CAAC;IACnD,CAAC;IAED;;OAEG;IAEH,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;IACxC,CAAC;IAED;;;OAGG;IACa,YAAY;QACxB,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAID;;;;;;;;;;OAUG;IACH,YACI,IAAY,EACZ,QAA6B,EAC7B,kBAA0B,EAC1B,MAAoD,EACpD,eAAuB,SAAS,CAAC,6BAA6B,EAC9D,MAAuB,EACvB,WAAW,GAAG,SAAS,CAAC,yBAAyB,EACjD,QAAkB;QAElB,MAAM,cAAc,GAAG,MAAM,KAAK,IAAI,IAAI,MAAM,YAAY,MAAM,CAAC;QAEnE,MAAM,YAAY,GAAG;YACjB,QAAQ;YACR,kBAAkB;YAClB,QAAQ,EAAE,sBAAsB,CAAC,QAAQ;YACzC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;YAC3C,YAAY;YACZ,MAAM;YACN,QAAQ;YACR,WAAW;SACd,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,KAAK,CAAC,IAAI,EAAE,sBAAsB,CAAC,WAAW,EAAE;YAC5C,aAAa,EAAE,cAAc,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;YAC3H,GAAG,YAAY;SAClB,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACI,MAAM,CAAU,MAAM,CAAC,iBAAsB,EAAE,YAAoB,EAAE,KAAY,EAAE,OAAe;QACrG,OAAO,mBAAmB,CAAC,KAAK,CAC5B,GAAG,EAAE;YACD,OAAO,IAAI,kBAAkB,CACzB,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,QAAQ,EAC1B,iBAAiB,CAAC,kBAAkB,EACpC,YAAY,EACZ,iBAAiB,CAAC,wBAAwB,EAC1C,KAAK,CAAC,SAAS,EAAE,EACjB,iBAAiB,CAAC,WAAW,EAC7B,iBAAiB,CAAC,QAAQ,CAC7B,CAAC;QACN,CAAC,EACD,iBAAiB,EACjB,KAAK,EACL,OAAO,CACV,CAAC;IACN,CAAC;CACJ;AA5FG;IADC,SAAS,EAAE;4DAGX;AAUD;IADC,SAAS,EAAE;kDAGX;AAgFL,aAAa,CAAC,4BAA4B,EAAE,kBAAkB,CAAC,CAAC","sourcesContent":["import { Camera } from \"../Cameras/camera\";\r\nimport type { PostProcessOptions } from \"./postProcess\";\r\nimport { PostProcess } from \"./postProcess\";\r\nimport { Constants } from \"../Engines/constants\";\r\n\r\nimport { RegisterClass } from \"../Misc/typeStore\";\r\nimport { serialize } from \"../Misc/decorators\";\r\nimport { SerializationHelper } from \"../Misc/decorators.serialization\";\r\nimport type { Nullable } from \"../types\";\r\n\r\nimport type { AbstractEngine } from \"core/Engines/abstractEngine\";\r\nimport type { ThinTonemapPostProcessOptions, TonemappingOperator } from \"./thinTonemapPostProcess\";\r\nimport { ThinTonemapPostProcess } from \"./thinTonemapPostProcess\";\r\nimport type { Scene } from \"../scene\";\r\n\r\nexport type ToneMapPostProcessOptions = ThinTonemapPostProcessOptions & PostProcessOptions;\r\n\r\n/**\r\n * Defines a post process to apply tone mapping\r\n */\r\nexport class TonemapPostProcess extends PostProcess {\r\n    /**\r\n     * Defines the required exposure adjustment\r\n     */\r\n    @serialize()\r\n    public get exposureAdjustment() {\r\n        return this._effectWrapper.exposureAdjustment;\r\n    }\r\n\r\n    public set exposureAdjustment(value: number) {\r\n        this._effectWrapper.exposureAdjustment = value;\r\n    }\r\n\r\n    /**\r\n     * Gets the operator used for tonemapping\r\n     */\r\n    @serialize()\r\n    public get operator() {\r\n        return this._effectWrapper.operator;\r\n    }\r\n\r\n    /**\r\n     * Gets a string identifying the name of the class\r\n     * @returns \"TonemapPostProcess\" string\r\n     */\r\n    public override getClassName(): string {\r\n        return \"TonemapPostProcess\";\r\n    }\r\n\r\n    protected override _effectWrapper: ThinTonemapPostProcess;\r\n\r\n    /**\r\n     * Creates a new TonemapPostProcess\r\n     * @param name defines the name of the postprocess\r\n     * @param operator defines the operator to use\r\n     * @param exposureAdjustment defines the required exposure adjustment\r\n     * @param camera defines the camera to use (can be null)\r\n     * @param samplingMode defines the required sampling mode (BABYLON.Texture.BILINEAR_SAMPLINGMODE by default)\r\n     * @param engine defines the hosting engine (can be ignore if camera is set)\r\n     * @param textureType defines the texture format to use (BABYLON.Engine.TEXTURETYPE_UNSIGNED_BYTE by default)\r\n     * @param reusable If the post process can be reused on the same frame. (default: false)\r\n     */\r\n    constructor(\r\n        name: string,\r\n        operator: TonemappingOperator,\r\n        exposureAdjustment: number,\r\n        camera: Nullable<Camera> | ToneMapPostProcessOptions,\r\n        samplingMode: number = Constants.TEXTURE_BILINEAR_SAMPLINGMODE,\r\n        engine?: AbstractEngine,\r\n        textureType = Constants.TEXTURETYPE_UNSIGNED_BYTE,\r\n        reusable?: boolean\r\n    ) {\r\n        const cameraIsCamera = camera === null || camera instanceof Camera;\r\n\r\n        const localOptions = {\r\n            operator,\r\n            exposureAdjustment,\r\n            uniforms: ThinTonemapPostProcess.Uniforms,\r\n            camera: cameraIsCamera ? camera : undefined,\r\n            samplingMode,\r\n            engine,\r\n            reusable,\r\n            textureType,\r\n        };\r\n\r\n        if (!cameraIsCamera) {\r\n            Object.assign(localOptions, camera);\r\n        }\r\n\r\n        super(name, ThinTonemapPostProcess.FragmentUrl, {\r\n            effectWrapper: cameraIsCamera || !camera.effectWrapper ? new ThinTonemapPostProcess(name, engine, localOptions) : undefined,\r\n            ...localOptions,\r\n        });\r\n    }\r\n\r\n    /**\r\n     * @internal\r\n     */\r\n    public static override _Parse(parsedPostProcess: any, targetCamera: Camera, scene: Scene, rootUrl: string): Nullable<TonemapPostProcess> {\r\n        return SerializationHelper.Parse(\r\n            () => {\r\n                return new TonemapPostProcess(\r\n                    parsedPostProcess.name,\r\n                    parsedPostProcess.operator,\r\n                    parsedPostProcess.exposureAdjustment,\r\n                    targetCamera,\r\n                    parsedPostProcess.renderTargetSamplingMode,\r\n                    scene.getEngine(),\r\n                    parsedPostProcess.textureType,\r\n                    parsedPostProcess.reusable\r\n                );\r\n            },\r\n            parsedPostProcess,\r\n            scene,\r\n            rootUrl\r\n        );\r\n    }\r\n}\r\n\r\nRegisterClass(\"BABYLON.TonemapPostProcess\", TonemapPostProcess);\r\n"]}

package/Rendering/geometryBufferRenderer.js

@@ -414,8 +414,13 @@ export class GeometryBufferRenderer {
             return false;
         }
         const defines = [];
-        const attribs = [VertexBuffer.PositionKind, VertexBuffer.NormalKind];
+        const attribs = [VertexBuffer.PositionKind];
         const mesh = subMesh.getMesh();
+        const hasNormals = mesh.isVerticesDataPresent(VertexBuffer.NormalKind);
+        if (hasNormals) {
+            defines.push("#define HAS_NORMAL_ATTRIBUTE");
+            attribs.push(VertexBuffer.NormalKind);
+        }
         let uv1 = false;
         let uv2 = false;
         const color = false;