@babylonjs/core 7.19.1 → 7.20.0

package/Layers/index.d.ts

@@ -4,3 +4,13 @@ export * from "./glowLayer";
 export * from "./highlightLayer";
 export * from "./layer";
 export * from "./layerSceneComponent";
+export * from "../Shaders/glowMapGeneration.fragment";
+export * from "../Shaders/glowMapGeneration.vertex";
+export * from "../ShadersWGSL/glowMapGeneration.fragment";
+export * from "../ShadersWGSL/glowMapGeneration.vertex";
+export * from "../Shaders/glowMapMerge.fragment";
+export * from "../Shaders/glowMapMerge.vertex";
+export * from "../Shaders/glowBlurPostProcess.fragment";
+export * from "../ShadersWGSL/glowMapMerge.fragment";
+export * from "../ShadersWGSL/glowMapMerge.vertex";
+export * from "../ShadersWGSL/glowBlurPostProcess.fragment";

package/Layers/index.js

@@ -4,4 +4,16 @@ export * from "./glowLayer.js";
 export * from "./highlightLayer.js";
 export * from "./layer.js";
 export * from "./layerSceneComponent.js";
+// EffectLayer
+export * from "../Shaders/glowMapGeneration.fragment.js";
+export * from "../Shaders/glowMapGeneration.vertex.js";
+export * from "../ShadersWGSL/glowMapGeneration.fragment.js";
+export * from "../ShadersWGSL/glowMapGeneration.vertex.js";
+// Highlights
+export * from "../Shaders/glowMapMerge.fragment.js";
+export * from "../Shaders/glowMapMerge.vertex.js";
+export * from "../Shaders/glowBlurPostProcess.fragment.js";
+export * from "../ShadersWGSL/glowMapMerge.fragment.js";
+export * from "../ShadersWGSL/glowMapMerge.vertex.js";
+export * from "../ShadersWGSL/glowBlurPostProcess.fragment.js";
 //# sourceMappingURL=index.js.map

package/Layers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../dev/core/src/Layers/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,uBAAuB,CAAC","sourcesContent":["export * from \"./effectLayer\";\r\nexport * from \"./effectLayerSceneComponent\";\r\nexport * from \"./glowLayer\";\r\nexport * from \"./highlightLayer\";\r\nexport * from \"./layer\";\r\nexport * from \"./layerSceneComponent\";\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../dev/core/src/Layers/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,uBAAuB,CAAC;AAEtC,cAAc;AACd,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yCAAyC,CAAC;AAExD,aAAa;AACb,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yCAAyC,CAAC;AACxD,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,6CAA6C,CAAC","sourcesContent":["export * from \"./effectLayer\";\r\nexport * from \"./effectLayerSceneComponent\";\r\nexport * from \"./glowLayer\";\r\nexport * from \"./highlightLayer\";\r\nexport * from \"./layer\";\r\nexport * from \"./layerSceneComponent\";\r\n\r\n// EffectLayer\r\nexport * from \"../Shaders/glowMapGeneration.fragment\";\r\nexport * from \"../Shaders/glowMapGeneration.vertex\";\r\nexport * from \"../ShadersWGSL/glowMapGeneration.fragment\";\r\nexport * from \"../ShadersWGSL/glowMapGeneration.vertex\";\r\n\r\n// Highlights\r\nexport * from \"../Shaders/glowMapMerge.fragment\";\r\nexport * from \"../Shaders/glowMapMerge.vertex\";\r\nexport * from \"../Shaders/glowBlurPostProcess.fragment\";\r\nexport * from \"../ShadersWGSL/glowMapMerge.fragment\";\r\nexport * from \"../ShadersWGSL/glowMapMerge.vertex\";\r\nexport * from \"../ShadersWGSL/glowBlurPostProcess.fragment\";\r\n"]}

package/Lights/Shadows/index.d.ts

@@ -1,3 +1,11 @@
 export * from "./shadowGenerator";
 export * from "./cascadedShadowGenerator";
 export * from "./shadowGeneratorSceneComponent";
+export * from "../../ShadersWGSL/shadowMap.fragment";
+export * from "../../ShadersWGSL/shadowMap.vertex";
+export * from "../../ShadersWGSL/depthBoxBlur.fragment";
+export * from "../../ShadersWGSL/ShadersInclude/shadowMapFragmentSoftTransparentShadow";
+export * from "../../Shaders/shadowMap.fragment";
+export * from "../../Shaders/shadowMap.vertex";
+export * from "../../Shaders/depthBoxBlur.fragment";
+export * from "../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow";

package/Lights/Shadows/index.js

@@ -1,4 +1,13 @@
 export * from "./shadowGenerator.js";
 export * from "./cascadedShadowGenerator.js";
 export * from "./shadowGeneratorSceneComponent.js";
+// Blur postprocess
+export * from "../../ShadersWGSL/shadowMap.fragment.js";
+export * from "../../ShadersWGSL/shadowMap.vertex.js";
+export * from "../../ShadersWGSL/depthBoxBlur.fragment.js";
+export * from "../../ShadersWGSL/ShadersInclude/shadowMapFragmentSoftTransparentShadow.js";
+export * from "../../Shaders/shadowMap.fragment.js";
+export * from "../../Shaders/shadowMap.vertex.js";
+export * from "../../Shaders/depthBoxBlur.fragment.js";
+export * from "../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow.js";
 //# sourceMappingURL=index.js.map

package/Lights/Shadows/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../dev/core/src/Lights/Shadows/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC","sourcesContent":["export * from \"./shadowGenerator\";\r\nexport * from \"./cascadedShadowGenerator\";\r\nexport * from \"./shadowGeneratorSceneComponent\";\r\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../dev/core/src/Lights/Shadows/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iCAAiC,CAAC;AAEhD,mBAAmB;AACnB,cAAc,sCAAsC,CAAC;AACrD,cAAc,oCAAoC,CAAC;AACnD,cAAc,yCAAyC,CAAC;AACxD,cAAc,yEAAyE,CAAC;AACxF,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,cAAc,qEAAqE,CAAC","sourcesContent":["export * from \"./shadowGenerator\";\r\nexport * from \"./cascadedShadowGenerator\";\r\nexport * from \"./shadowGeneratorSceneComponent\";\r\n\r\n// Blur postprocess\r\nexport * from \"../../ShadersWGSL/shadowMap.fragment\";\r\nexport * from \"../../ShadersWGSL/shadowMap.vertex\";\r\nexport * from \"../../ShadersWGSL/depthBoxBlur.fragment\";\r\nexport * from \"../../ShadersWGSL/ShadersInclude/shadowMapFragmentSoftTransparentShadow\";\r\nexport * from \"../../Shaders/shadowMap.fragment\";\r\nexport * from \"../../Shaders/shadowMap.vertex\";\r\nexport * from \"../../Shaders/depthBoxBlur.fragment\";\r\nexport * from \"../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow\";\r\n"]}

package/Lights/Shadows/shadowGenerator.d.ts

@@ -13,11 +13,8 @@ import { PostProcess } from "../../PostProcesses/postProcess";
 import { Observable } from "../../Misc/observable";
 import type { UniformBuffer } from "../../Materials/uniformBuffer";
 import type { Camera } from "../../Cameras/camera";
-import "../../Shaders/shadowMap.fragment";
-import "../../Shaders/shadowMap.vertex";
-import "../../Shaders/depthBoxBlur.fragment";
-import "../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow";
 import type { BaseTexture } from "../../Materials/Textures/baseTexture";
+import { ShaderLanguage } from "../../Materials/shaderLanguage.js";
 /**
  * Defines the options associated with the creation of a custom shader for a shadow generator.
  */
@@ -117,12 +114,19 @@ export interface IShadowGenerator {
  * Default implementation IShadowGenerator.
  * This is the main object responsible of generating shadows in the framework.
  * Documentation: https://doc.babylonjs.com/features/featuresDeepDive/lights/shadows
+ * #IFYDRS#0: WebGL
+ * #IFYDRS#835: WebGPU
  */
 export declare class ShadowGenerator implements IShadowGenerator {
     /**
      * Name of the shadow generator class
      */
     static CLASSNAME: string;
+    /**
+     * Force all the shadow generators to compile to glsl even on WebGPU engines.
+     * False by default. This is mostly meant for backward compatibility.
+     */
+    static ForceGLSL: boolean;
     /**
      * Shadow generator mode None: no filtering applied.
      */
@@ -477,6 +481,12 @@ export declare class ShadowGenerator implements IShadowGenerator {
      * @returns the light generating the shadow
      */
     getLight(): IShadowLight;
+    /** Shader language used by the generator */
+    protected _shaderLanguage: ShaderLanguage;
+    /**
+     * Gets the shader language used in this generator.
+     */
+    get shaderLanguage(): ShaderLanguage;
     /**
      * If true the shadow map is generated by rendering the back face of the mesh instead of the front face.
      * This can help with self-shadowing as the geometry making up the back of objects is slightly offset.
@@ -528,11 +538,14 @@ export declare class ShadowGenerator implements IShadowGenerator {
      * @param usefullFloatFirst By default the generator will try to use half float textures but if you need precision (for self shadowing for instance), you can use this option to enforce full float texture.
      * @param camera Camera associated with this shadow generator (default: null). If null, takes the scene active camera at the time we need to access it
      * @param useRedTextureType Forces the generator to use a Red instead of a RGBA type for the shadow map texture format (default: false)
+     * @param forceGLSL defines a boolean indicating if the shader must be compiled in GLSL even if we are using WebGPU
      */
-    constructor(mapSize: number, light: IShadowLight, usefullFloatFirst?: boolean, camera?: Nullable<Camera>, useRedTextureType?: boolean);
+    constructor(mapSize: number, light: IShadowLight, usefullFloatFirst?: boolean, camera?: Nullable<Camera>, useRedTextureType?: boolean, forceGLSL?: boolean);
     protected _initializeGenerator(): void;
     protected _createTargetRenderTexture(): void;
     protected _initializeShadowMap(): void;
+    private _shadersLoaded;
+    private _initShaderSourceAsync;
     protected _initializeBlurRTTAndPostProcesses(): void;
     protected _renderForShadowMap(opaqueSubMeshes: SmartArray<SubMesh>, alphaTestSubMeshes: SmartArray<SubMesh>, transparentSubMeshes: SmartArray<SubMesh>, depthOnlySubMeshes: SmartArray<SubMesh>): void;
     protected _bindCustomEffectForRenderSubMeshForShadowMap(subMesh: SubMesh, effect: Effect, mesh: AbstractMesh): void;

package/Lights/Shadows/shadowGenerator.js

@@ -12,16 +12,14 @@ import { _WarnImport } from "../../Misc/devTools.js";
 import { EffectFallbacks } from "../../Materials/effectFallbacks.js";
 import { RenderingManager } from "../../Rendering/renderingManager.js";
 import { DrawWrapper } from "../../Materials/drawWrapper.js";
-import "../../Shaders/shadowMap.fragment.js";
-import "../../Shaders/shadowMap.vertex.js";
-import "../../Shaders/depthBoxBlur.fragment.js";
-import "../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow.js";
 import { addClipPlaneUniforms, bindClipPlane, prepareStringDefinesForClipPlanes } from "../../Materials/clipPlaneMaterialHelper.js";
 import { BindMorphTargetParameters, BindSceneUniformBuffer, PrepareAttributesForMorphTargetsInfluencers, PushAttributesForInstances, } from "../../Materials/materialHelper.functions.js";
 /**
  * Default implementation IShadowGenerator.
  * This is the main object responsible of generating shadows in the framework.
  * Documentation: https://doc.babylonjs.com/features/featuresDeepDive/lights/shadows
+ * #IFYDRS#0: WebGL
+ * #IFYDRS#835: WebGPU
  */
 export class ShadowGenerator {
     /**
@@ -465,6 +463,12 @@ export class ShadowGenerator {
     getLight() {
         return this._light;
     }
+    /**
+     * Gets the shader language used in this generator.
+     */
+    get shaderLanguage() {
+        return this._shaderLanguage;
+    }
     _getCamera() {
         return this._camera ?? this._scene.activeCamera;
     }
@@ -489,8 +493,9 @@ export class ShadowGenerator {
      * @param usefullFloatFirst By default the generator will try to use half float textures but if you need precision (for self shadowing for instance), you can use this option to enforce full float texture.
      * @param camera Camera associated with this shadow generator (default: null). If null, takes the scene active camera at the time we need to access it
      * @param useRedTextureType Forces the generator to use a Red instead of a RGBA type for the shadow map texture format (default: false)
+     * @param forceGLSL defines a boolean indicating if the shader must be compiled in GLSL even if we are using WebGPU
      */
-    constructor(mapSize, light, usefullFloatFirst, camera, useRedTextureType) {
+    constructor(mapSize, light, usefullFloatFirst, camera, useRedTextureType, forceGLSL = false) {
         /**
          * Observable triggered before the shadow is rendered. Can be used to update internal effect state
          */
@@ -537,6 +542,8 @@ export class ShadowGenerator {
          * Controls the extent to which the shadows fade out at the edge of the frustum
          */
         this.frustumEdgeFalloff = 0;
+        /** Shader language used by the generator */
+        this._shaderLanguage = 0 /* ShaderLanguage.GLSL */;
         /**
          * If true the shadow map is generated by rendering the back face of the mesh instead of the front face.
          * This can help with self-shadowing as the geometry making up the back of objects is slightly offset.
@@ -552,11 +559,13 @@ export class ShadowGenerator {
         this._currentFaceIndex = 0;
         this._currentFaceIndexCache = 0;
         this._defaultTextureMatrix = Matrix.Identity();
+        this._shadersLoaded = false;
         this._mapSize = mapSize;
         this._light = light;
         this._scene = light.getScene();
         this._camera = camera ?? null;
         this._useRedTextureType = !!useRedTextureType;
+        this._initShaderSourceAsync(forceGLSL);
         let shadowGenerators = light._shadowGenerators;
         if (!shadowGenerators) {
             shadowGenerators = light._shadowGenerators = new Map();
@@ -701,6 +710,27 @@ export class ShadowGenerator {
             this._shadowMap.setRenderingAutoClearDepthStencil(i, false);
         }
     }
+    async _initShaderSourceAsync(forceGLSL = false) {
+        const engine = this._scene.getEngine();
+        if (engine.isWebGPU && !forceGLSL && !ShadowGenerator.ForceGLSL) {
+            this._shaderLanguage = 1 /* ShaderLanguage.WGSL */;
+            await Promise.all([
+                import("../../ShadersWGSL/shadowMap.fragment.js"),
+                import("../../ShadersWGSL/shadowMap.vertex.js"),
+                import("../../ShadersWGSL/depthBoxBlur.fragment.js"),
+                import("../../ShadersWGSL/ShadersInclude/shadowMapFragmentSoftTransparentShadow.js"),
+            ]);
+        }
+        else {
+            await Promise.all([
+                import("../../Shaders/shadowMap.fragment.js"),
+                import("../../Shaders/shadowMap.vertex.js"),
+                import("../../Shaders/depthBoxBlur.fragment.js"),
+                import("../../Shaders/ShadersInclude/shadowMapFragmentSoftTransparentShadow.js"),
+            ]);
+        }
+        this._shadersLoaded = true;
+    }
     _initializeBlurRTTAndPostProcesses() {
         const engine = this._scene.getEngine();
         const targetSize = this._mapSize / this.blurScale;
@@ -1011,6 +1041,9 @@ export class ShadowGenerator {
      * @returns true if ready otherwise, false
      */
     isReady(subMesh, useInstances, isTransparent) {
+        if (!this._shadersLoaded) {
+            return false;
+        }
         const material = subMesh.getMaterial(), shadowDepthWrapper = material?.shadowDepthWrapper;
         this._opacityTexture = null;
         if (!material) {
@@ -1193,6 +1226,7 @@ export class ShadowGenerator {
                     onCompiled: null,
                     onError: null,
                     indexParameters: { maxSimultaneousMorphTargets: morphInfluencers },
+                    shaderLanguage: this._shaderLanguage,
                 }, engine);
                 subMeshEffect.setEffect(effect, cachedDefines);
             }
@@ -1590,6 +1624,11 @@ export class ShadowGenerator {
  * Name of the shadow generator class
  */
 ShadowGenerator.CLASSNAME = "ShadowGenerator";
+/**
+ * Force all the shadow generators to compile to glsl even on WebGPU engines.
+ * False by default. This is mostly meant for backward compatibility.
+ */
+ShadowGenerator.ForceGLSL = false;
 /**
  * Shadow generator mode None: no filtering applied.
  */