@babylonjs/core 7.42.0 → 7.43.0

package/Lights/Shadows/shadowGenerator.js

@@ -13,7 +13,7 @@ import { EffectFallbacks } from "../../Materials/effectFallbacks.js";
 import { RenderingManager } from "../../Rendering/renderingManager.js";
 import { DrawWrapper } from "../../Materials/drawWrapper.js";
 import { addClipPlaneUniforms, bindClipPlane, prepareStringDefinesForClipPlanes } from "../../Materials/clipPlaneMaterialHelper.js";
-import { BindMorphTargetParameters, BindSceneUniformBuffer, PrepareAttributesForMorphTargetsInfluencers, PushAttributesForInstances, } from "../../Materials/materialHelper.functions.js";
+import { BindMorphTargetParameters, BindSceneUniformBuffer, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances, } from "../../Materials/materialHelper.functions.js";
 /**
  * Default implementation IShadowGenerator.
  * This is the main object responsible of generating shadows in the framework.
@@ -636,11 +636,32 @@ export class ShadowGenerator {
         }
         // Custom render function.
         this._shadowMap.customRenderFunction = (opaqueSubMeshes, alphaTestSubMeshes, transparentSubMeshes, depthOnlySubMeshes) => this._renderForShadowMap(opaqueSubMeshes, alphaTestSubMeshes, transparentSubMeshes, depthOnlySubMeshes);
-        // Force the mesh is ready function to true as we are double checking it
+        // When preWarm is false, forces the mesh is ready function to true as we are double checking it
         // in the custom render function. Also it prevents side effects and useless
         // shader variations in DEPTHPREPASS mode.
-        this._shadowMap.customIsReadyFunction = () => {
-            return true;
+        this._shadowMap.customIsReadyFunction = (mesh, _refreshRate, preWarm) => {
+            if (!preWarm || !mesh.subMeshes) {
+                return true;
+            }
+            let isReady = true;
+            for (const subMesh of mesh.subMeshes) {
+                const renderingMesh = subMesh.getRenderingMesh();
+                const scene = this._scene;
+                const engine = scene.getEngine();
+                const material = subMesh.getMaterial();
+                if (!material || subMesh.verticesCount === 0 || (this.customAllowRendering && !this.customAllowRendering(subMesh))) {
+                    continue;
+                }
+                const batch = renderingMesh._getInstancesRenderList(subMesh._id, !!subMesh.getReplacementMesh());
+                if (batch.mustReturn) {
+                    continue;
+                }
+                const hardwareInstancedRendering = engine.getCaps().instancedArrays &&
+                    ((batch.visibleInstances[subMesh._id] !== null && batch.visibleInstances[subMesh._id] !== undefined) || renderingMesh.hasThinInstances);
+                const isTransparent = material.needAlphaBlendingForMesh(renderingMesh);
+                isReady = this.isReady(subMesh, hardwareInstancedRendering, isTransparent) && isReady;
+            }
+            return isReady;
         };
         const engine = this._scene.getEngine();
         this._shadowMap.onBeforeBindObservable.add(() => {
@@ -1060,10 +1081,14 @@ export class ShadowGenerator {
             let cachedDefines = subMeshEffect.defines;
             const attribs = [VertexBuffer.PositionKind];
             const mesh = subMesh.getMesh();
+            let useNormal = false;
+            let uv1 = false;
+            let uv2 = false;
             // Normal bias.
             if (this.normalBias && mesh.isVerticesDataPresent(VertexBuffer.NormalKind)) {
                 attribs.push(VertexBuffer.NormalKind);
                 defines.push("#define NORMAL");
+                useNormal = true;
                 if (mesh.nonUniformScaling) {
                     defines.push("#define NONUNIFORMSCALING");
                 }
@@ -1089,11 +1114,13 @@ export class ShadowGenerator {
                     if (mesh.isVerticesDataPresent(VertexBuffer.UVKind)) {
                         attribs.push(VertexBuffer.UVKind);
                         defines.push("#define UV1");
+                        uv1 = true;
                     }
                     if (mesh.isVerticesDataPresent(VertexBuffer.UV2Kind)) {
                         if (this._opacityTexture.coordinatesIndex === 1) {
                             attribs.push(VertexBuffer.UV2Kind);
                             defines.push("#define UV2");
+                            uv2 = true;
                         }
                     }
                 }
@@ -1123,20 +1150,14 @@ export class ShadowGenerator {
                 defines.push("#define NUM_BONE_INFLUENCERS 0");
             }
             // Morph targets
-            const manager = mesh.morphTargetManager;
-            let morphInfluencers = 0;
-            if (manager) {
-                morphInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
-                if (morphInfluencers > 0) {
-                    defines.push("#define MORPHTARGETS");
-                    defines.push("#define MORPHTARGETS_POSITION");
-                    defines.push("#define NUM_MORPH_INFLUENCERS " + morphInfluencers);
-                    if (manager.isUsingTextureForTargets) {
-                        defines.push("#define MORPHTARGETS_TEXTURE");
-                    }
-                    PrepareAttributesForMorphTargetsInfluencers(attribs, mesh, morphInfluencers);
-                }
-            }
+            const numMorphInfluencers = mesh.morphTargetManager
+                ? PrepareDefinesAndAttributesForMorphTargets(mesh.morphTargetManager, defines, attribs, mesh, true, // usePositionMorph
+                useNormal, // useNormalMorph
+                false, // useTangentMorph
+                uv1, // useUVMorph
+                uv2 // useUV2Morph
+                )
+                : 0;
             // ClipPlanes
             prepareStringDefinesForClipPlanes(material, this._scene, defines);
             // Instances
@@ -1226,7 +1247,7 @@ export class ShadowGenerator {
                     fallbacks: fallbacks,
                     onCompiled: null,
                     onError: null,
-                    indexParameters: { maxSimultaneousMorphTargets: morphInfluencers },
+                    indexParameters: { maxSimultaneousMorphTargets: numMorphInfluencers },
                     shaderLanguage: this._shaderLanguage,
                 }, engine);
                 subMeshEffect.setEffect(effect, cachedDefines);