@babylonjs/core 6.40.0 → 6.41.1

package/Materials/shaderMaterial.js

@@ -1,4 +1,5 @@
 import { SerializationHelper } from "../Misc/decorators.js";
+import { Scene } from "../scene.js";
 import { Matrix, Vector3, Vector2, Vector4, Quaternion } from "../Maths/math.vector.js";
 import { VertexBuffer } from "../Buffers/buffer.js";
 import { Texture } from "../Materials/Textures/texture.js";
@@ -71,7 +72,20 @@ export class ShaderMaterial extends PushMaterial {
          */
         this._materialHelperNeedsPreviousMatrices = false;
         this._shaderPath = shaderPath;
-        this._options = Object.assign({ needAlphaBlending: false, needAlphaTesting: false, attributes: ["position", "normal", "uv"], uniforms: ["worldViewProjection"], uniformBuffers: [], samplers: [], externalTextures: [], samplerObjects: [], storageBuffers: [], defines: [], useClipPlane: false }, options);
+        this._options = {
+            needAlphaBlending: false,
+            needAlphaTesting: false,
+            attributes: ["position", "normal", "uv"],
+            uniforms: ["worldViewProjection"],
+            uniformBuffers: [],
+            samplers: [],
+            externalTextures: [],
+            samplerObjects: [],
+            storageBuffers: [],
+            defines: [],
+            useClipPlane: false,
+            ...options,
+        };
     }
     /**
      * Gets the shader path used to define the shader code
@@ -481,19 +495,11 @@ export class ShaderMaterial extends PushMaterial {
      * @returns true if ready, otherwise false
      */
     isReady(mesh, useInstances, subMesh) {
-        var _a, _b, _c, _d;
         const storeEffectOnSubMeshes = subMesh && this._storeEffectOnSubMeshes;
         if (this.isFrozen) {
-            if (storeEffectOnSubMeshes) {
-                if (subMesh.effect && subMesh.effect._wasPreviouslyReady) {
-                    return true;
-                }
-            }
-            else {
-                const effect = this._drawWrapper.effect;
-                if (effect && effect._wasPreviouslyReady && effect._wasPreviouslyUsingInstances === useInstances) {
-                    return true;
-                }
+            const drawWrapper = storeEffectOnSubMeshes ? subMesh._drawWrapper : this._drawWrapper;
+            if (drawWrapper.effect && drawWrapper._wasPreviouslyReady && drawWrapper._wasPreviouslyUsingInstances === useInstances) {
+                return true;
             }
         }
         const scene = this.getScene();
@@ -507,8 +513,8 @@ export class ShaderMaterial extends PushMaterial {
         if (engine.getCaps().multiview && scene.activeCamera && scene.activeCamera.outputRenderTarget && scene.activeCamera.outputRenderTarget.getViewCount() > 1) {
             this._multiview = true;
             defines.push("#define MULTIVIEW");
-            if (this._options.uniforms.indexOf("viewProjection") !== -1 && this._options.uniforms.indexOf("viewProjectionR") === -1) {
-                this._options.uniforms.push("viewProjectionR");
+            if (uniforms.indexOf("viewProjection") !== -1 && uniforms.indexOf("viewProjectionR") === -1) {
+                uniforms.push("viewProjectionR");
             }
         }
         for (let index = 0; index < this._options.defines.length; index++) {
@@ -527,7 +533,7 @@ export class ShaderMaterial extends PushMaterial {
         if (useInstances) {
             defines.push("#define INSTANCES");
             MaterialHelper.PushAttributesForInstances(attribs, this._materialHelperNeedsPreviousMatrices);
-            if (mesh === null || mesh === void 0 ? void 0 : mesh.hasThinInstances) {
+            if (mesh?.hasThinInstances) {
                 defines.push("#define THIN_INSTANCES");
                 if (mesh && mesh.isVerticesDataPresent(VertexBuffer.ColorInstanceKind)) {
                     attribs.push(VertexBuffer.ColorInstanceKind);
@@ -548,8 +554,8 @@ export class ShaderMaterial extends PushMaterial {
             fallbacks.addCPUSkinningFallback(0, mesh);
             if (skeleton.isUsingTextureForMatrices) {
                 defines.push("#define BONETEXTURE");
-                if (this._options.uniforms.indexOf("boneTextureWidth") === -1) {
-                    this._options.uniforms.push("boneTextureWidth");
+                if (uniforms.indexOf("boneTextureWidth") === -1) {
+                    uniforms.push("boneTextureWidth");
                 }
                 if (this._options.samplers.indexOf("boneSampler") === -1) {
                     this._options.samplers.push("boneSampler");
@@ -557,8 +563,8 @@ export class ShaderMaterial extends PushMaterial {
             }
             else {
                 defines.push("#define BonesPerMesh " + (skeleton.bones.length + 1));
-                if (this._options.uniforms.indexOf("mBones") === -1) {
-                    this._options.uniforms.push("mBones");
+                if (uniforms.indexOf("mBones") === -1) {
+                    uniforms.push("mBones");
                 }
             }
         }
@@ -572,7 +578,7 @@ export class ShaderMaterial extends PushMaterial {
             const uv = manager.supportsUVs && defines.indexOf("#define UV1") !== -1;
             const tangent = manager.supportsTangents && defines.indexOf("#define TANGENT") !== -1;
             const normal = manager.supportsNormals && defines.indexOf("#define NORMAL") !== -1;
-            numInfluencers = manager.numInfluencers;
+            numInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
             if (uv) {
                 defines.push("#define MORPHTARGETS_UV");
             }
@@ -587,8 +593,8 @@ export class ShaderMaterial extends PushMaterial {
             }
             if (manager.isUsingTextureForTargets) {
                 defines.push("#define MORPHTARGETS_TEXTURE");
-                if (this._options.uniforms.indexOf("morphTargetTextureIndices") === -1) {
-                    this._options.uniforms.push("morphTargetTextureIndices");
+                if (uniforms.indexOf("morphTargetTextureIndices") === -1) {
+                    uniforms.push("morphTargetTextureIndices");
                 }
                 if (this._options.samplers.indexOf("morphTargets") === -1) {
                     this._options.samplers.push("morphTargets");
@@ -610,6 +616,7 @@ export class ShaderMaterial extends PushMaterial {
             if (numInfluencers > 0) {
                 uniforms = uniforms.slice();
                 uniforms.push("morphTargetInfluences");
+                uniforms.push("morphTargetCount");
                 uniforms.push("morphTargetTextureInfo");
                 uniforms.push("morphTargetTextureIndices");
             }
@@ -622,14 +629,14 @@ export class ShaderMaterial extends PushMaterial {
             const bvaManager = mesh.bakedVertexAnimationManager;
             if (bvaManager && bvaManager.isEnabled) {
                 defines.push("#define BAKED_VERTEX_ANIMATION_TEXTURE");
-                if (this._options.uniforms.indexOf("bakedVertexAnimationSettings") === -1) {
-                    this._options.uniforms.push("bakedVertexAnimationSettings");
+                if (uniforms.indexOf("bakedVertexAnimationSettings") === -1) {
+                    uniforms.push("bakedVertexAnimationSettings");
                 }
-                if (this._options.uniforms.indexOf("bakedVertexAnimationTextureSizeInverted") === -1) {
-                    this._options.uniforms.push("bakedVertexAnimationTextureSizeInverted");
+                if (uniforms.indexOf("bakedVertexAnimationTextureSizeInverted") === -1) {
+                    uniforms.push("bakedVertexAnimationTextureSizeInverted");
                 }
-                if (this._options.uniforms.indexOf("bakedVertexAnimationTime") === -1) {
-                    this._options.uniforms.push("bakedVertexAnimationTime");
+                if (uniforms.indexOf("bakedVertexAnimationTime") === -1) {
+                    uniforms.push("bakedVertexAnimationTime");
                 }
                 if (this._options.samplers.indexOf("bakedVertexAnimationTexture") === -1) {
                     this._options.samplers.push("bakedVertexAnimationTexture");
@@ -652,11 +659,24 @@ export class ShaderMaterial extends PushMaterial {
             addClipPlaneUniforms(uniforms);
             prepareStringDefinesForClipPlanes(this, scene, defines);
         }
+        // Fog
+        if (scene.fogEnabled && mesh?.applyFog && scene.fogMode !== Scene.FOGMODE_NONE) {
+            defines.push("#define FOG");
+            if (uniforms.indexOf("view") === -1) {
+                uniforms.push("view");
+            }
+            if (uniforms.indexOf("vFogInfos") === -1) {
+                uniforms.push("vFogInfos");
+            }
+            if (uniforms.indexOf("vFogColor") === -1) {
+                uniforms.push("vFogColor");
+            }
+        }
         // Misc
         if (this._useLogarithmicDepth) {
             defines.push("#define LOGARITHMICDEPTH");
-            if (this._options.uniforms.indexOf("logarithmicDepthConstant") === -1) {
-                this._options.uniforms.push("logarithmicDepthConstant");
+            if (uniforms.indexOf("logarithmicDepthConstant") === -1) {
+                uniforms.push("logarithmicDepthConstant");
             }
         }
         if (this.customShaderNameResolve) {
@@ -665,9 +685,9 @@ export class ShaderMaterial extends PushMaterial {
             samplers = samplers.slice();
             shaderName = this.customShaderNameResolve(shaderName, uniforms, uniformBuffers, samplers, defines, attribs);
         }
-        const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper() : this._drawWrapper;
-        const previousEffect = (_a = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.effect) !== null && _a !== void 0 ? _a : null;
-        const previousDefines = (_b = drawWrapper === null || drawWrapper === void 0 ? void 0 : drawWrapper.defines) !== null && _b !== void 0 ? _b : null;
+        const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;
+        const previousEffect = drawWrapper?.effect ?? null;
+        const previousDefines = drawWrapper?.defines ?? null;
         const join = defines.join("\n");
         let effect = previousEffect;
         if (previousDefines !== join) {
@@ -691,18 +711,18 @@ export class ShaderMaterial extends PushMaterial {
             }
             if (this._onEffectCreatedObservable) {
                 onCreatedEffectParameters.effect = effect;
-                onCreatedEffectParameters.subMesh = (_c = subMesh !== null && subMesh !== void 0 ? subMesh : mesh === null || mesh === void 0 ? void 0 : mesh.subMeshes[0]) !== null && _c !== void 0 ? _c : null;
+                onCreatedEffectParameters.subMesh = subMesh ?? mesh?.subMeshes[0] ?? null;
                 this._onEffectCreatedObservable.notifyObservers(onCreatedEffectParameters);
             }
         }
-        effect._wasPreviouslyUsingInstances = !!useInstances;
-        if ((_d = !(effect === null || effect === void 0 ? void 0 : effect.isReady())) !== null && _d !== void 0 ? _d : true) {
+        drawWrapper._wasPreviouslyUsingInstances = !!useInstances;
+        if (!effect?.isReady() ?? true) {
             return false;
         }
         if (previousEffect !== effect) {
             scene.resetCachedMaterial();
         }
-        effect._wasPreviouslyReady = true;
+        drawWrapper._wasPreviouslyReady = true;
         return true;
     }
     /**
@@ -712,7 +732,7 @@ export class ShaderMaterial extends PushMaterial {
      */
     bindOnlyWorldMatrix(world, effectOverride) {
         const scene = this.getScene();
-        const effect = effectOverride !== null && effectOverride !== void 0 ? effectOverride : this.getEffect();
+        const effect = effectOverride ?? this.getEffect();
         if (!effect) {
             return;
         }
@@ -727,6 +747,9 @@ export class ShaderMaterial extends PushMaterial {
             world.multiplyToRef(scene.getTransformMatrix(), this._cachedWorldViewProjectionMatrix);
             effect.setMatrix("worldViewProjection", this._cachedWorldViewProjectionMatrix);
         }
+        if (this._options.uniforms.indexOf("view") !== -1) {
+            effect.setMatrix("view", scene.getViewMatrix());
+        }
     }
     /**
      * Binds the submesh to this material by preparing the effect and shader to draw
@@ -735,8 +758,7 @@ export class ShaderMaterial extends PushMaterial {
      * @param subMesh defines the submesh to bind the material to
      */
     bindForSubMesh(world, mesh, subMesh) {
-        var _a;
-        this.bind(world, mesh, (_a = subMesh._drawWrapperOverride) === null || _a === void 0 ? void 0 : _a.effect, subMesh);
+        this.bind(world, mesh, subMesh._drawWrapperOverride?.effect, subMesh);
     }
     /**
      * Binds the material to the mesh
@@ -746,10 +768,9 @@ export class ShaderMaterial extends PushMaterial {
      * @param subMesh defines the submesh to bind the material to
      */
     bind(world, mesh, effectOverride, subMesh) {
-        var _a;
         // Std values
         const storeEffectOnSubMeshes = subMesh && this._storeEffectOnSubMeshes;
-        const effect = effectOverride !== null && effectOverride !== void 0 ? effectOverride : (storeEffectOnSubMeshes ? subMesh.effect : this.getEffect());
+        const effect = effectOverride ?? (storeEffectOnSubMeshes ? subMesh.effect : this.getEffect());
         if (!effect) {
             return;
         }
@@ -776,7 +797,7 @@ export class ShaderMaterial extends PushMaterial {
                 }
             }
         }
-        const mustRebind = mesh && storeEffectOnSubMeshes ? this._mustRebind(scene, effect, mesh.visibility) : scene.getCachedMaterial() !== this;
+        const mustRebind = mesh && storeEffectOnSubMeshes ? this._mustRebind(scene, effect, subMesh, mesh.visibility) : scene.getCachedMaterial() !== this;
         if (effect && mustRebind) {
             if (!useSceneUBO && this._options.uniforms.indexOf("view") !== -1) {
                 effect.setMatrix("view", scene.getViewMatrix());
@@ -801,6 +822,10 @@ export class ShaderMaterial extends PushMaterial {
             if (this._useLogarithmicDepth) {
                 MaterialHelper.BindLogDepth(storeEffectOnSubMeshes ? subMesh.materialDefines : effect.defines, effect, scene);
             }
+            // Fog
+            if (mesh) {
+                MaterialHelper.BindFogParameters(scene, mesh, effect);
+            }
             let name;
             // Texture
             for (name in this._textures) {
@@ -919,10 +944,11 @@ export class ShaderMaterial extends PushMaterial {
             }
             const bvaManager = mesh.bakedVertexAnimationManager;
             if (bvaManager && bvaManager.isEnabled) {
-                (_a = mesh.bakedVertexAnimationManager) === null || _a === void 0 ? void 0 : _a.bind(effect, !!effect._wasPreviouslyUsingInstances);
+                const drawWrapper = storeEffectOnSubMeshes ? subMesh._drawWrapper : this._drawWrapper;
+                mesh.bakedVertexAnimationManager?.bind(effect, !!drawWrapper._wasPreviouslyUsingInstances);
             }
         }
-        this._afterBind(mesh, effect);
+        this._afterBind(mesh, effect, subMesh);
     }
     /**
      * Gets the active textures from the material
@@ -976,10 +1002,10 @@ export class ShaderMaterial extends PushMaterial {
         result.id = name;
         // Shader code path
         if (typeof result._shaderPath === "object") {
-            result._shaderPath = Object.assign({}, result._shaderPath);
+            result._shaderPath = { ...result._shaderPath };
         }
         // Options
-        this._options = Object.assign({}, this._options);
+        this._options = { ...this._options };
         Object.keys(this._options).forEach((propName) => {
             const propValue = this._options[propName];
             if (Array.isArray(propValue)) {