@babylonjs/addons 8.50.0 → 8.50.2

package/atmosphere/atmosphere.js

@@ -14,11 +14,8 @@ import { TransmittanceLut } from "./transmittanceLut.js";
 import { UniformBuffer } from "@babylonjs/core/Materials/uniformBuffer.js";
 import { Vector3 } from "@babylonjs/core/Maths/math.vector.js";
 import "./Shaders/compositeAerialPerspective.fragment.js";
-import "./Shaders/compositeSky.fragment.js";
 import "./Shaders/compositeGlobeAtmosphere.fragment.js";
 import "./Shaders/fullscreenTriangle.vertex.js";
-import "./Shaders/skyView.fragment.js";
-import "./Shaders/aerialPerspective.fragment.js";
 import "./Shaders/ShadersInclude/atmosphereFragmentDeclaration.js";
 import "./Shaders/ShadersInclude/atmosphereFunctions.js";
 import "./Shaders/ShadersInclude/atmosphereUboDeclaration.js";
@@ -1155,9 +1152,11 @@ export class Atmosphere {
  * @param samplerNames - The sampler names to use.
  * @param uniformBuffers - The uniform buffers to use.
  * @param defineNames - Array of define names to prepend with "#define ".
+ * @param useWebGPU - Whether to use WebGPU shaders.
+ * @param extraInitializations - Optional extra initializations callback for loading shaders.
  * @returns The effect wrapper.
  */
-const CreateEffectWrapper = (engine, name, fragmentShader, uniformNames, samplerNames, uniformBuffers, defineNames) => {
+const CreateEffectWrapper = (engine, name, fragmentShader, uniformNames, samplerNames, uniformBuffers, defineNames, useWebGPU = false, extraInitializations) => {
     const defines = defineNames?.map((defineName) => `#define ${defineName}`) ?? [];
     return new EffectWrapper({
         engine,
@@ -1170,6 +1169,8 @@ const CreateEffectWrapper = (engine, name, fragmentShader, uniformNames, sampler
         samplerNames,
         defines,
         useShaderStore: true,
+        shaderLanguage: useWebGPU ? 1 /* ShaderLanguage.WGSL */ : 0 /* ShaderLanguage.GLSL */,
+        extraInitializations,
     });
 };
 const CreateMultiScatteringEffectWrapper = (engine, uniformBuffer, groundAlbedo) => {
@@ -1194,7 +1195,7 @@ const CreateMultiScatteringEffectWrapper = (engine, uniformBuffer, groundAlbedo)
         useShaderStore: true,
         shaderLanguage: useWebGPU ? 1 /* ShaderLanguage.WGSL */ : 0 /* ShaderLanguage.GLSL */,
         extraInitializations: (_, list) => {
-            list.push(Promise.all(useWebGPU
+            list.push(...(useWebGPU
                 ? [import("./ShadersWGSL/fullscreenTriangle.vertex.js"), import("./ShadersWGSL/multiScattering.fragment.js")]
                 : [import("./Shaders/fullscreenTriangle.vertex.js"), import("./Shaders/multiScattering.fragment.js")]));
         },
@@ -1250,11 +1251,8 @@ const DrawEffect = (engine, effectRenderer, effectWrapper, renderTarget, drawCal
     }
     const currentDepthFunction = engine.getDepthFunction();
     engine.setDepthFunction(depthFunction);
-    // Likewise with the alpha mode, which can affect depth state too.
     const currentAlphaMode = engine.getAlphaMode();
-    if (alphaMode !== Constants.ALPHA_DISABLE) {
-        engine.setAlphaMode(alphaMode);
-    }
+    engine.setAlphaMode(alphaMode, true);
     const currentCull = engine.depthCullingState.cull;
     effectRenderer.setViewport();
     effectRenderer.applyEffectWrapper(effectWrapper, depthTest); // Note, stencil is false by default.
@@ -1265,7 +1263,7 @@ const DrawEffect = (engine, effectRenderer, effectWrapper, renderTarget, drawCal
     drawCallback(effectRenderer, renderTarget?.renderTarget, effect, engine);
     // Restore state (order matters!)
     engine.depthCullingState.cull = currentCull;
-    engine.setAlphaMode(currentAlphaMode);
+    engine.setAlphaMode(currentAlphaMode, true);
     if (currentDepthWrite !== undefined) {
         engine.setDepthWrite(currentDepthWrite);
     }
@@ -1289,6 +1287,8 @@ const DrawEffect = (engine, effectRenderer, effectWrapper, renderTarget, drawCal
  */
 const CreateSkyCompositorEffectWrapper = (engine, uniformBuffer, isSkyViewLutEnabled, isLinearSpaceComposition, applyApproximateTransmittance) => {
     const useUbo = uniformBuffer.useUbo;
+    const useWebGPU = engine.isWebGPU && !EffectWrapper.ForceGLSL;
+    const uboName = useWebGPU ? "atmosphere" : uniformBuffer.name;
     const defines = ["POSITION_VEC2", "COMPUTE_WORLD_RAY"];
     if (isSkyViewLutEnabled) {
         defines.push("USE_SKY_VIEW_LUT");
@@ -1300,7 +1300,11 @@ const CreateSkyCompositorEffectWrapper = (engine, uniformBuffer, isSkyViewLutEna
         defines.push("APPLY_TRANSMITTANCE_BLENDING");
     }
     const textures = isSkyViewLutEnabled ? ["skyViewLut"] : ["transmittanceLut", "multiScatteringLut"];
-    return CreateEffectWrapper(engine, "atmo-skyCompositor", "compositeSky", ["depth", ...(useUbo ? [] : uniformBuffer.getUniformNames())], textures, useUbo ? [uniformBuffer.name] : [], defines);
+    return CreateEffectWrapper(engine, "atmo-skyCompositor", "compositeSky", ["depth", ...(useUbo ? [] : uniformBuffer.getUniformNames())], textures, useUbo ? [uboName] : [], defines, useWebGPU, (_, list) => {
+        list.push(...(useWebGPU
+            ? [import("./ShadersWGSL/fullscreenTriangle.vertex.js"), import("./ShadersWGSL/compositeSky.fragment.js")]
+            : [import("./Shaders/fullscreenTriangle.vertex.js"), import("./Shaders/compositeSky.fragment.js")]));
+    });
 };
 /**
  * Creates an EffectWrapper for the aerial perspective LUT.
@@ -1308,7 +1312,15 @@ 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] : [], ["POSITION_VEC2", "COMPUTE_WORLD_RAY"]);
+const CreateAerialPerspectiveEffectWrapper = (engine, uniformBuffer) => {
+    const useWebGPU = engine.isWebGPU && !EffectWrapper.ForceGLSL;
+    const uboName = useWebGPU ? "atmosphere" : uniformBuffer.name;
+    return CreateEffectWrapper(engine, "atmo-aerialPerspective", "aerialPerspective", ["layerIdx", ...(uniformBuffer.useUbo ? [] : uniformBuffer.getUniformNames())], ["transmittanceLut", "multiScatteringLut"], uniformBuffer.useUbo ? [uboName] : [], ["POSITION_VEC2", "COMPUTE_WORLD_RAY"], useWebGPU, (_, list) => {
+        list.push(...(useWebGPU
+            ? [import("./ShadersWGSL/fullscreenTriangle.vertex.js"), import("./ShadersWGSL/aerialPerspective.fragment.js")]
+            : [import("./Shaders/fullscreenTriangle.vertex.js"), import("./Shaders/aerialPerspective.fragment.js")]));
+    });
+};
 /**
  * Creates an EffectWrapper for the aerial perspective compositor.
  * @param engine - The engine to use.
@@ -1399,5 +1411,13 @@ 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] : [], ["POSITION_VEC2"]);
+const CreateSkyViewEffectWrapper = (engine, uniformBuffer) => {
+    const useWebGPU = engine.isWebGPU && !EffectWrapper.ForceGLSL;
+    const uboName = useWebGPU ? "atmosphere" : uniformBuffer.name;
+    return CreateEffectWrapper(engine, "atmo-skyView", "skyView", ["depth", ...(uniformBuffer.useUbo ? [] : uniformBuffer.getUniformNames())], ["transmittanceLut", "multiScatteringLut"], uniformBuffer.useUbo ? [uboName] : [], ["POSITION_VEC2"], useWebGPU, (_, list) => {
+        list.push(...(useWebGPU
+            ? [import("./ShadersWGSL/fullscreenTriangle.vertex.js"), import("./ShadersWGSL/skyView.fragment.js")]
+            : [import("./Shaders/fullscreenTriangle.vertex.js"), import("./Shaders/skyView.fragment.js")]));
+    });
+};
 //# sourceMappingURL=atmosphere.js.map