@babylonjs/core 7.42.0 → 7.43.0

package/Materials/shaderMaterial.js

@@ -11,7 +11,7 @@ import { PushMaterial } from "./pushMaterial.js";
 import { EngineStore } from "../Engines/engineStore.js";
 
 import { addClipPlaneUniforms, bindClipPlane, prepareStringDefinesForClipPlanes } from "./clipPlaneMaterialHelper.js";
-import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetParameters, BindSceneUniformBuffer, PrepareAttributesForBakedVertexAnimation, PushAttributesForInstances, } from "./materialHelper.functions.js";
+import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetParameters, BindSceneUniformBuffer, PrepareAttributesForBakedVertexAnimation, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances, } from "./materialHelper.functions.js";
 const onCreatedEffectParameters = { effect: null, subMesh: null };
 /**
  * The ShaderMaterial object has the necessary methods to pass data from your scene to the Vertex and Fragment Shaders and returns a material that can be applied to any mesh.
@@ -510,7 +510,7 @@ export class ShaderMaterial extends PushMaterial {
         // Instances
         const defines = [];
         const attribs = [];
-        const fallbacks = new EffectFallbacks();
+        let fallbacks = null;
         let shaderName = this._shaderPath, uniforms = this._options.uniforms, uniformBuffers = this._options.uniformBuffers, samplers = this._options.samplers;
         // global multiview
         if (engine.getCaps().multiview && scene.activeCamera && scene.activeCamera.outputRenderTarget && scene.activeCamera.outputRenderTarget.getViewCount() > 1) {
@@ -554,6 +554,7 @@ export class ShaderMaterial extends PushMaterial {
             }
             const skeleton = mesh.skeleton;
             defines.push("#define NUM_BONE_INFLUENCERS " + mesh.numBoneInfluencers);
+            fallbacks = new EffectFallbacks();
             fallbacks.addCPUSkinningFallback(0, mesh);
             if (skeleton.isUsingTextureForMatrices) {
                 defines.push("#define BONETEXTURE");
@@ -578,32 +579,17 @@ export class ShaderMaterial extends PushMaterial {
         let numInfluencers = 0;
         const manager = mesh ? mesh.morphTargetManager : null;
         if (manager) {
-            const uv = manager.supportsUVs && defines.indexOf("#define UV1") !== -1;
-            const uv2 = manager.supportsUV2s && defines.indexOf("#define UV2") !== -1;
-            const tangent = manager.supportsTangents && defines.indexOf("#define TANGENT") !== -1;
-            const normal = manager.supportsNormals && defines.indexOf("#define NORMAL") !== -1;
-            const position = manager.supportsPositions;
-            numInfluencers = manager.numMaxInfluencers || manager.numInfluencers;
-            if (uv) {
-                defines.push("#define MORPHTARGETS_UV");
-            }
-            if (uv2) {
-                defines.push("#define MORPHTARGETS_UV2");
-            }
-            if (tangent) {
-                defines.push("#define MORPHTARGETS_TANGENT");
-            }
-            if (normal) {
-                defines.push("#define MORPHTARGETS_NORMAL");
-            }
-            if (position) {
-                defines.push("#define MORPHTARGETS_POSITION");
-            }
-            if (numInfluencers > 0) {
-                defines.push("#define MORPHTARGETS");
-            }
+            const uv = defines.indexOf("#define UV1") !== -1;
+            const uv2 = defines.indexOf("#define UV2") !== -1;
+            const tangent = defines.indexOf("#define TANGENT") !== -1;
+            const normal = defines.indexOf("#define NORMAL") !== -1;
+            numInfluencers = PrepareDefinesAndAttributesForMorphTargets(manager, defines, attribs, mesh, true, // usePositionMorph
+            normal, // useNormalMorph
+            tangent, // useTangentMorph
+            uv, // useUVMorph
+            uv2 // useUV2Morph
+            );
             if (manager.isUsingTextureForTargets) {
-                defines.push("#define MORPHTARGETS_TEXTURE");
                 if (uniforms.indexOf("morphTargetTextureIndices") === -1) {
                     uniforms.push("morphTargetTextureIndices");
                 }
@@ -611,19 +597,6 @@ export class ShaderMaterial extends PushMaterial {
                     this._options.samplers.push("morphTargets");
                 }
             }
-            defines.push("#define NUM_MORPH_INFLUENCERS " + numInfluencers);
-            for (let index = 0; index < numInfluencers; index++) {
-                attribs.push(VertexBuffer.PositionKind + index);
-                if (normal) {
-                    attribs.push(VertexBuffer.NormalKind + index);
-                }
-                if (tangent) {
-                    attribs.push(VertexBuffer.TangentKind + index);
-                }
-                if (uv) {
-                    attribs.push(VertexBuffer.UVKind + "_" + index);
-                }
-            }
             if (numInfluencers > 0) {
                 uniforms = uniforms.slice();
                 uniforms.push("morphTargetInfluences");
@@ -743,23 +716,24 @@ export class ShaderMaterial extends PushMaterial {
      * @param effectOverride - If provided, use this effect instead of internal effect
      */
     bindOnlyWorldMatrix(world, effectOverride) {
-        const scene = this.getScene();
         const effect = effectOverride ?? this.getEffect();
         if (!effect) {
             return;
         }
-        if (this._options.uniforms.indexOf("world") !== -1) {
+        const uniforms = this._options.uniforms;
+        if (uniforms.indexOf("world") !== -1) {
             effect.setMatrix("world", world);
         }
-        if (this._options.uniforms.indexOf("worldView") !== -1) {
+        const scene = this.getScene();
+        if (uniforms.indexOf("worldView") !== -1) {
             world.multiplyToRef(scene.getViewMatrix(), this._cachedWorldViewMatrix);
             effect.setMatrix("worldView", this._cachedWorldViewMatrix);
         }
-        if (this._options.uniforms.indexOf("worldViewProjection") !== -1) {
+        if (uniforms.indexOf("worldViewProjection") !== -1) {
             world.multiplyToRef(scene.getTransformMatrix(), this._cachedWorldViewProjectionMatrix);
             effect.setMatrix("worldViewProjection", this._cachedWorldViewProjectionMatrix);
         }
-        if (this._options.uniforms.indexOf("view") !== -1) {
+        if (uniforms.indexOf("view") !== -1) {
             effect.setMatrix("view", scene.getViewMatrix());
         }
     }
@@ -960,9 +934,9 @@ export class ShaderMaterial extends PushMaterial {
         }
         if (effect && mesh && (mustRebind || !this.isFrozen)) {
             // Morph targets
-            const manager = mesh.morphTargetManager;
-            if (manager && manager.numInfluencers > 0) {
-                BindMorphTargetParameters(mesh, effect);
+            BindMorphTargetParameters(mesh, effect);
+            if (mesh.morphTargetManager && mesh.morphTargetManager.isUsingTextureForTargets) {
+                mesh.morphTargetManager._bind(effect);
             }
             const bvaManager = mesh.bakedVertexAnimationManager;
             if (bvaManager && bvaManager.isEnabled) {
@@ -1235,17 +1209,20 @@ export class ShaderMaterial extends PushMaterial {
         // Vector2
         serializationObject.vectors2 = {};
         for (name in this._vectors2) {
-            serializationObject.vectors2[name] = this._vectors2[name].asArray();
+            const v2 = this._vectors2[name];
+            serializationObject.vectors2[name] = [v2.x, v2.y];
         }
         // Vector3
         serializationObject.vectors3 = {};
         for (name in this._vectors3) {
-            serializationObject.vectors3[name] = this._vectors3[name].asArray();
+            const v3 = this._vectors3[name];
+            serializationObject.vectors3[name] = [v3.x, v3.y, v3.z];
         }
         // Vector4
         serializationObject.vectors4 = {};
         for (name in this._vectors4) {
-            serializationObject.vectors4[name] = this._vectors4[name].asArray();
+            const v4 = this._vectors4[name];
+            serializationObject.vectors4[name] = [v4.x, v4.y, v4.z, v4.w];
         }
         // Quaternion
         serializationObject.quaternions = {};