@babylonjs/addons 8.46.2 → 8.47.0

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}.
      */
@@ -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);