@babylonjs/addons 8.46.2 → 8.47.1

package/atmosphere/ShadersWGSL/transmittance.fragment.d.ts

@@ -0,0 +1,8 @@
+import "../ShadersWGSL/ShadersInclude/atmosphereUboDeclaration.js";
+import "@babylonjs/core/ShadersWGSL/ShadersInclude/helperFunctions.js";
+import "../ShadersWGSL/ShadersInclude/atmosphereFunctions.js";
+/** @internal */
+export declare const transmittancePixelShaderWGSL: {
+    name: string;
+    shader: string;
+};

package/atmosphere/ShadersWGSL/transmittance.fragment.js

@@ -0,0 +1,21 @@
+// Do not edit.
+import { ShaderStore } from "@babylonjs/core/Engines/shaderStore.js";
+import "../ShadersWGSL/ShadersInclude/atmosphereUboDeclaration.js";
+import "@babylonjs/core/ShadersWGSL/ShadersInclude/helperFunctions.js";
+import "../ShadersWGSL/ShadersInclude/atmosphereFunctions.js";
+const name = "transmittancePixelShader";
+const shader = `#define RENDER_TRANSMITTANCE
+#define EXCLUDE_RAY_MARCHING_FUNCTIONS
+#include<atmosphereUboDeclaration>
+#include<helperFunctions>
+#include<atmosphereFunctions>
+varying vUV: vec2f;@fragment
+fn main(input: FragmentInputs)->FragmentOutputs {fragmentOutputs.color=renderTransmittance(input.vUV);}
+`;
+// Sideeffect
+if (!ShaderStore.ShadersStoreWGSL[name]) {
+    ShaderStore.ShadersStoreWGSL[name] = shader;
+}
+/** @internal */
+export const transmittancePixelShaderWGSL = { name, shader };
+//# sourceMappingURL=transmittance.fragment.js.map

package/atmosphere/ShadersWGSL/transmittance.fragment.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transmittance.fragment.js","sourceRoot":"","sources":["../../../../../dev/addons/src/atmosphere/ShadersWGSL/transmittance.fragment.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EAAE,WAAW,EAAE,+CAAiC;AACvD,OAAO,wDAAwD,CAAC;AAChE,uEAAyD;AACzD,OAAO,mDAAmD,CAAC;AAE3D,MAAM,IAAI,GAAG,0BAA0B,CAAC;AACxC,MAAM,MAAM,GAAG;;;;;;;CAOd,CAAC;AACF,aAAa;AACb,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;IACtC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;AAChD,CAAC;AACD,gBAAgB;AAChB,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC","sourcesContent":["// Do not edit.\nimport { ShaderStore } from \"core/Engines/shaderStore\";\nimport \"../ShadersWGSL/ShadersInclude/atmosphereUboDeclaration\";\nimport \"core/ShadersWGSL/ShadersInclude/helperFunctions\";\nimport \"../ShadersWGSL/ShadersInclude/atmosphereFunctions\";\n\nconst name = \"transmittancePixelShader\";\nconst shader = `#define RENDER_TRANSMITTANCE\n#define EXCLUDE_RAY_MARCHING_FUNCTIONS\n#include<atmosphereUboDeclaration>\n#include<helperFunctions>\n#include<atmosphereFunctions>\nvarying vUV: vec2f;@fragment\nfn main(input: FragmentInputs)->FragmentOutputs {fragmentOutputs.color=renderTransmittance(input.vUV);}\n`;\n// Sideeffect\nif (!ShaderStore.ShadersStoreWGSL[name]) {\n    ShaderStore.ShadersStoreWGSL[name] = shader;\n}\n/** @internal */\nexport const transmittancePixelShaderWGSL = { name, shader };\n"]}

package/atmosphere/atmosphere.d.ts

@@ -335,11 +335,6 @@ export declare class Atmosphere implements IDisposable {
      * @returns The result color.
      */
     getDiffuseSkyIrradianceToRef: <T extends IColor3Like>(directionToLight: IVector3Like, pointRadius: number, pointGeocentricNormal: IVector3Like, lightIrradiance: number, result: T) => T;
-    /**
-     * Creates a new {@link EffectWrapper} for the multiple scattering LUT
-     * @returns The newly created {@link EffectWrapper}.
-     */
-    private _createMultiScatteringEffectWrapper;
     /**
      * Draws the multiple scattering LUT using {@link EffectWrapper} and {@link EffectRenderer}.
      */
@@ -380,7 +375,7 @@ export declare class Atmosphere implements IDisposable {
      */
     bindUniformBufferToEffect(effect: Effect): void;
     /**
-     * Updates the atmosphere's uniform buffer.
+     * Updates the values in the atmosphere's uniform buffer.
      */
     updateUniformBuffer(): void;
     /**

package/atmosphere/atmosphere.js

@@ -40,7 +40,7 @@ export class Atmosphere {
      * @returns True if the atmosphere is supported, false otherwise.
      */
     static IsSupported(engine) {
-        return !engine._badOS && !engine.isWebGPU && engine.version >= 2;
+        return !engine._badOS && (engine.isWebGPU || engine.version >= 2);
     }
     /**
      * Controls the overall brightness of the atmosphere rendering.
@@ -563,10 +563,7 @@ export class Atmosphere {
         this.getDiffuseSkyIrradianceToRef = (directionToLight, pointRadius, pointGeocentricNormal, lightIrradiance, result) => this._diffuseSkyIrradianceLut?.getDiffuseSkyIrradianceToRef(directionToLight, pointRadius, pointGeocentricNormal, lightIrradiance, result) ??
             ((result.r = 0), (result.g = 0), (result.b = 0), result);
         const engine = (this._engine = scene.getEngine());
-        if (engine.isWebGPU) {
-            throw new Error("Atmosphere is not supported on WebGPU.");
-        }
-        if (engine.version < 2) {
+        if (!engine.isWebGPU && engine.version < 2) {
             throw new Error(`Atmosphere is not supported on WebGL ${engine.version}.`);
         }
         this._physicalProperties = options?.physicalProperties ?? new AtmospherePhysicalProperties();
@@ -615,6 +612,7 @@ export class Atmosphere {
         });
         this._transmittanceLut = new TransmittanceLut(this);
         this._multiScatteringLutRenderTarget = CreateRenderTargetTexture("atmo-multiScattering", { width: 32, height: 32 }, scene);
+        this._multiScatteringEffectWrapper = CreateMultiScatteringEffectWrapper(engine, this.uniformBuffer, this._groundAlbedo);
         if (options?.isDiffuseSkyIrradianceLutEnabled ?? true) {
             this._diffuseSkyIrradianceLut = new DiffuseSkyIrradianceLut(this);
         }
@@ -753,32 +751,6 @@ export class Atmosphere {
     getClassName() {
         return "Atmosphere";
     }
-    /**
-     * Creates a new {@link EffectWrapper} for the multiple scattering LUT
-     * @returns The newly created {@link EffectWrapper}.
-     */
-    _createMultiScatteringEffectWrapper() {
-        const engine = this._engine;
-        const name = "atmo-multiScattering";
-        const ubo = this.uniformBuffer;
-        const useUbo = ubo.useUbo;
-        const defines = ["#define POSITION_VEC2"];
-        if (!this._groundAlbedo.equals(Color3.BlackReadOnly)) {
-            defines.push("#define USE_GROUND_ALBEDO");
-        }
-        return new EffectWrapper({
-            engine,
-            name,
-            vertexShader: "fullscreenTriangle",
-            fragmentShader: "multiScattering",
-            attributeNames: ["position"],
-            uniformNames: ["depth", ...(useUbo ? [] : ubo.getUniformNames())],
-            uniformBuffers: useUbo ? [ubo.name] : [],
-            samplerNames: ["transmittanceLut"],
-            defines,
-            useShaderStore: true,
-        });
-    }
     /**
      * Draws the multiple scattering LUT using {@link EffectWrapper} and {@link EffectRenderer}.
      */
@@ -810,12 +782,12 @@ export class Atmosphere {
             return;
         }
         const engine = this._engine;
-        this._aerialPerspectiveCompositorEffectWrapper ?? (this._aerialPerspectiveCompositorEffectWrapper = CreateAerialPerspectiveCompositorEffectWrapper(engine, this.uniformBuffer, this._isAerialPerspectiveLutEnabled, this._isSkyViewLutEnabled, this._isLinearSpaceComposition, this._applyApproximateTransmittance, this._aerialPerspectiveIntensity, this._aerialPerspectiveRadianceBias));
+        const effectWrapper = (this._aerialPerspectiveCompositorEffectWrapper ?? (this._aerialPerspectiveCompositorEffectWrapper = CreateAerialPerspectiveCompositorEffectWrapper(engine, this.uniformBuffer, this._isAerialPerspectiveLutEnabled, this._isSkyViewLutEnabled, this._isLinearSpaceComposition, this._applyApproximateTransmittance, this._aerialPerspectiveIntensity, this._aerialPerspectiveRadianceBias)));
         const skyViewLut = this._isSkyViewLutEnabled ? this.skyViewLutRenderTarget : null;
         const multiScatteringLut = this._multiScatteringLutRenderTarget;
         const transmittanceLut = this._transmittanceLut.renderTarget;
         const aerialPerspectiveLut = this._isAerialPerspectiveLutEnabled ? this.aerialPerspectiveLutRenderTarget : null;
-        if (!this._aerialPerspectiveCompositorEffectWrapper.isReady() ||
+        if (!effectWrapper.isReady() ||
             !(skyViewLut?.isReady() ?? true) ||
             !multiScatteringLut.isReady() ||
             !transmittanceLut.isReady() ||
@@ -823,7 +795,7 @@ export class Atmosphere {
             !this.depthTexture.isReady()) {
             return;
         }
-        DrawEffect(engine, this._effectRenderer, this._aerialPerspectiveCompositorEffectWrapper, null, // No render target, it will render to the current buffer.
+        DrawEffect(engine, this._effectRenderer, effectWrapper, null, // No render target, it will render to the current buffer.
         (effectRenderer, _, effect) => {
             if (this.depthTexture === null) {
                 throw new Error("Depth texture is required for aerial perspective compositor.");
@@ -864,14 +836,14 @@ export class Atmosphere {
             return;
         }
         const engine = this._engine;
-        this._skyCompositorEffectWrapper ?? (this._skyCompositorEffectWrapper = CreateSkyCompositorEffectWrapper(engine, this.uniformBuffer, this._isSkyViewLutEnabled, this._isLinearSpaceComposition, this._applyApproximateTransmittance));
+        const effectWrapper = (this._skyCompositorEffectWrapper ?? (this._skyCompositorEffectWrapper = CreateSkyCompositorEffectWrapper(engine, this.uniformBuffer, this._isSkyViewLutEnabled, this._isLinearSpaceComposition, this._applyApproximateTransmittance)));
         const skyViewLut = this._isSkyViewLutEnabled ? this.skyViewLutRenderTarget : null;
         const multiScatteringLut = this._multiScatteringLutRenderTarget;
         const transmittanceLut = this._transmittanceLut.renderTarget;
-        if (!this._skyCompositorEffectWrapper.isReady() || !(skyViewLut?.isReady() ?? true) || !multiScatteringLut.isReady() || !transmittanceLut.isReady()) {
+        if (!effectWrapper.isReady() || !(skyViewLut?.isReady() ?? true) || !multiScatteringLut.isReady() || !transmittanceLut.isReady()) {
             return;
         }
-        DrawEffect(engine, this._effectRenderer, this._skyCompositorEffectWrapper, null, // No render target, it will render to the current buffer.
+        DrawEffect(engine, this._effectRenderer, effectWrapper, null, // No render target, it will render to the current buffer.
         (effectRenderer, _, effect) => {
             this.bindUniformBufferToEffect(effect);
             effectRenderer.bindBuffers(effect);
@@ -902,17 +874,17 @@ export class Atmosphere {
             return;
         }
         const engine = this._engine;
-        this._globeAtmosphereCompositorEffectWrapper ?? (this._globeAtmosphereCompositorEffectWrapper = CreateGlobeAtmosphereCompositorEffectWrapper(engine, this.uniformBuffer, this._isSkyViewLutEnabled, this._isLinearSpaceComposition, this._applyApproximateTransmittance, this._aerialPerspectiveIntensity, this._aerialPerspectiveRadianceBias, this.depthTexture !== null));
+        const effectWrapper = (this._globeAtmosphereCompositorEffectWrapper ?? (this._globeAtmosphereCompositorEffectWrapper = CreateGlobeAtmosphereCompositorEffectWrapper(engine, this.uniformBuffer, this._isSkyViewLutEnabled, this._isLinearSpaceComposition, this._applyApproximateTransmittance, this._aerialPerspectiveIntensity, this._aerialPerspectiveRadianceBias, this.depthTexture !== null)));
         const skyViewLut = this._isSkyViewLutEnabled ? this.skyViewLutRenderTarget : null;
         const multiScatteringLut = this._multiScatteringLutRenderTarget;
         const transmittanceLut = this._transmittanceLut.renderTarget;
-        if (!this._globeAtmosphereCompositorEffectWrapper.isReady() || !(skyViewLut?.isReady() ?? true) || !multiScatteringLut.isReady() || !transmittanceLut.isReady()) {
+        if (!effectWrapper.isReady() || !(skyViewLut?.isReady() ?? true) || !multiScatteringLut.isReady() || !transmittanceLut.isReady()) {
             return;
         }
         if (this.depthTexture !== null && !this.depthTexture.isReady()) {
             return;
         }
-        DrawEffect(engine, this._effectRenderer, this._globeAtmosphereCompositorEffectWrapper, null, // No render target, it will render to the current buffer.
+        DrawEffect(engine, this._effectRenderer, effectWrapper, null, // No render target, it will render to the current buffer.
         (effectRenderer, _, effect) => {
             this.bindUniformBufferToEffect(effect);
             effectRenderer.bindBuffers(effect);
@@ -1022,7 +994,7 @@ export class Atmosphere {
             this._diffuseSkyIrradianceLut?.markDirty();
         }
         if (!this._transmittanceLut.isDirty && !this._hasRenderedMultiScatteringLut) {
-            this._multiScatteringEffectWrapper ?? (this._multiScatteringEffectWrapper = this._createMultiScatteringEffectWrapper());
+            this._multiScatteringEffectWrapper ?? (this._multiScatteringEffectWrapper = CreateMultiScatteringEffectWrapper(this._engine, this.uniformBuffer, this._groundAlbedo));
             if (this._multiScatteringEffectWrapper?.isReady() && this._multiScatteringLutRenderTarget?.isReady()) {
                 this._drawMultiScatteringLut();
                 this._hasRenderedMultiScatteringLut = true;
@@ -1038,17 +1010,18 @@ export class Atmosphere {
      */
     bindUniformBufferToEffect(effect) {
         const uniformBuffer = this.uniformBuffer;
-        const name = uniformBuffer.name;
-        uniformBuffer.bindToEffect(effect, name);
+        const isWGSL = effect.shaderLanguage === 1 /* ShaderLanguage.WGSL */;
+        const blockName = isWGSL ? "atmosphere" : uniformBuffer.name;
+        uniformBuffer.bindToEffect(effect, blockName);
         if (uniformBuffer.useUbo) {
-            uniformBuffer.bindUniformBuffer();
+            uniformBuffer.update();
         }
         else {
             this.updateUniformBuffer();
         }
     }
     /**
-     * Updates the atmosphere's uniform buffer.
+     * Updates the values in the atmosphere's uniform buffer.
      */
     updateUniformBuffer() {
         const physicalProperties = this._physicalProperties;
@@ -1099,7 +1072,6 @@ export class Atmosphere {
         ubo.updateFloat("originHeight", this._originHeight);
         ubo.updateFloat("sinCameraAtmosphereHorizonAngleFromNadir", cameraAtmosphereVariables.sinCameraAtmosphereHorizonAngleFromNadir);
         ubo.updateFloat("atmosphereExposure", this._exposure);
-        ubo.update();
     }
     /**
      * Draws the aerial perspective LUT using {@link EffectWrapper} and {@link EffectRenderer}.
@@ -1172,6 +1144,26 @@ const CreateEffectWrapper = (engine, name, fragmentShader, uniformNames, sampler
         useShaderStore: true,
     });
 };
+const CreateMultiScatteringEffectWrapper = (engine, uniformBuffer, groundAlbedo) => {
+    const name = "atmo-multiScattering";
+    const useUbo = uniformBuffer.useUbo;
+    const defines = ["#define POSITION_VEC2"];
+    if (!groundAlbedo.equals(Color3.BlackReadOnly)) {
+        defines.push("#define USE_GROUND_ALBEDO");
+    }
+    return new EffectWrapper({
+        engine,
+        name,
+        vertexShader: "fullscreenTriangle",
+        fragmentShader: "multiScattering",
+        attributeNames: ["position"],
+        uniformNames: ["depth", ...(useUbo ? [] : uniformBuffer.getUniformNames())],
+        uniformBuffers: useUbo ? [uniformBuffer.name] : [],
+        samplerNames: ["transmittanceLut"],
+        defines,
+        useShaderStore: true,
+    });
+};
 const CreateRenderTargetTexture = (name, size, scene, options) => {
     const caps = scene.getEngine().getCaps();
     const textureType = caps.textureHalfFloatRender
@@ -1229,11 +1221,14 @@ const DrawEffect = (engine, effectRenderer, effectWrapper, renderTarget, drawCal
     effectRenderer.saveStates();
     effectRenderer.setViewport();
     effectRenderer.applyEffectWrapper(effectWrapper, depthTest); // Note, stencil is false by default.
+    const currentCull = engine.depthCullingState.cull;
+    engine.depthCullingState.cull = false;
     const effect = effectWrapper.effect;
     effect.setFloat("depth", depth);
     // Call the specific drawing logic.
     drawCallback(effectRenderer, renderTarget?.renderTarget, effect, engine);
     // Restore state (order matters!)
+    engine.depthCullingState.cull = currentCull;
     engine.setAlphaMode(currentAlphaMode);
     if (currentDepthWrite !== undefined) {
         engine.setDepthWrite(currentDepthWrite);
@@ -1258,7 +1253,7 @@ const DrawEffect = (engine, effectRenderer, effectWrapper, renderTarget, drawCal
  */
 const CreateSkyCompositorEffectWrapper = (engine, uniformBuffer, isSkyViewLutEnabled, isLinearSpaceComposition, applyApproximateTransmittance) => {
     const useUbo = uniformBuffer.useUbo;
-    const defines = ["COMPUTE_WORLD_RAY"];
+    const defines = ["POSITION_VEC2", "COMPUTE_WORLD_RAY"];
     if (isSkyViewLutEnabled) {
         defines.push("USE_SKY_VIEW_LUT");
     }
@@ -1277,7 +1272,7 @@ const CreateSkyCompositorEffectWrapper = (engine, uniformBuffer, isSkyViewLutEna
  * @param uniformBuffer - The uniform buffer to use.
  * @returns The created EffectWrapper.
  */
-const CreateAerialPerspectiveEffectWrapper = (engine, uniformBuffer) => CreateEffectWrapper(engine, "atmo-aerialPerspective", "aerialPerspective", ["layerIdx", "depth", ...(uniformBuffer.useUbo ? [] : uniformBuffer.getUniformNames())], ["transmittanceLut", "multiScatteringLut"], uniformBuffer.useUbo ? [uniformBuffer.name] : [], ["COMPUTE_WORLD_RAY"]);
+const CreateAerialPerspectiveEffectWrapper = (engine, uniformBuffer) => CreateEffectWrapper(engine, "atmo-aerialPerspective", "aerialPerspective", ["layerIdx", "depth", ...(uniformBuffer.useUbo ? [] : uniformBuffer.getUniformNames())], ["transmittanceLut", "multiScatteringLut"], uniformBuffer.useUbo ? [uniformBuffer.name] : [], ["POSITION_VEC2", "COMPUTE_WORLD_RAY"]);
 /**
  * Creates an EffectWrapper for the aerial perspective compositor.
  * @param engine - The engine to use.
@@ -1292,7 +1287,7 @@ const CreateAerialPerspectiveEffectWrapper = (engine, uniformBuffer) => CreateEf
  */
 const CreateAerialPerspectiveCompositorEffectWrapper = (engine, uniformBuffer, isAerialPerspectiveLutEnabled, isSkyViewLutEnabled, isLinearSpaceComposition, applyApproximateTransmittance, aerialPerspectiveIntensity, aerialPerspectiveRadianceBias) => {
     const useUbo = uniformBuffer.useUbo;
-    const defines = ["COMPUTE_WORLD_RAY"];
+    const defines = ["POSITION_VEC2", "COMPUTE_WORLD_RAY"];
     if (isAerialPerspectiveLutEnabled) {
         defines.push("USE_AERIAL_PERSPECTIVE_LUT");
     }
@@ -1334,7 +1329,7 @@ const CreateAerialPerspectiveCompositorEffectWrapper = (engine, uniformBuffer, i
  */
 const CreateGlobeAtmosphereCompositorEffectWrapper = (engine, uniformBuffer, isSkyViewLutEnabled, isLinearSpaceComposition, applyApproximateTransmittance, aerialPerspectiveIntensity, aerialPerspectiveRadianceBias, hasDepthTexture) => {
     const useUbo = uniformBuffer.useUbo;
-    const defines = ["COMPUTE_WORLD_RAY"];
+    const defines = ["POSITION_VEC2", "COMPUTE_WORLD_RAY"];
     if (isSkyViewLutEnabled) {
         defines.push("USE_SKY_VIEW_LUT");
     }
@@ -1368,5 +1363,5 @@ const CreateGlobeAtmosphereCompositorEffectWrapper = (engine, uniformBuffer, isS
  * @param uniformBuffer - The uniform buffer to use.
  * @returns The created EffectWrapper.
  */
-const CreateSkyViewEffectWrapper = (engine, uniformBuffer) => CreateEffectWrapper(engine, "atmo-skyView", "skyView", ["depth", ...(uniformBuffer.useUbo ? [] : uniformBuffer.getUniformNames())], ["transmittanceLut", "multiScatteringLut"], uniformBuffer.useUbo ? [uniformBuffer.name] : []);
+const CreateSkyViewEffectWrapper = (engine, uniformBuffer) => CreateEffectWrapper(engine, "atmo-skyView", "skyView", ["depth", ...(uniformBuffer.useUbo ? [] : uniformBuffer.getUniformNames())], ["transmittanceLut", "multiScatteringLut"], uniformBuffer.useUbo ? [uniformBuffer.name] : [], ["POSITION_VEC2"]);
 //# sourceMappingURL=atmosphere.js.map