@onerjs/core 9.0.1 → 9.0.3

package/Materials/shaderMaterial.pure.js

@@ -14,6 +14,12 @@ import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetPa
 import { PrepareVertexPullingUniforms, BindVertexPullingUniforms } from "./vertexPullingHelper.functions.js";
 import { RegisterClass } from "../Misc/typeStore.js";
 const OnCreatedEffectParameters = { effect: null, subMesh: null };
+// vp_*_info uniforms are bound through the metadata, so callers must pass a copy of the array rather than the shared options one
+function AddVertexPullingUniforms(uniforms, metadata) {
+    metadata.forEach((_, attribute) => {
+        uniforms.push(`vp_${attribute}_info`);
+    });
+}
 /**
  * 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.
  *
@@ -689,16 +695,13 @@ export class ShaderMaterial extends PushMaterial {
             }
         }
         const renderingMesh = subMesh ? subMesh.getRenderingMesh() : mesh;
+        // Metadata prepared by this call only; this._vertexPullingMetadata can be stale from a previous call
+        let vertexPullingMetadata = null;
         if (renderingMesh && this.useVertexPulling) {
             // Add vertex buffer metadata defines for proper stride/offset handling
             const geometry = renderingMesh.geometry;
             if (geometry) {
-                this._vertexPullingMetadata = PrepareVertexPullingUniforms(geometry);
-                if (this._vertexPullingMetadata) {
-                    this._vertexPullingMetadata.forEach((_, attribute) => {
-                        uniforms.push(`vp_${attribute}_info`);
-                    });
-                }
+                vertexPullingMetadata = this._vertexPullingMetadata = PrepareVertexPullingUniforms(geometry);
             }
             defines.push("#define USE_VERTEX_PULLING");
             const indexBuffer = renderingMesh.geometry?.getIndexBuffer();
@@ -709,10 +712,15 @@ export class ShaderMaterial extends PushMaterial {
                 }
             }
         }
+        let hasVertexPullingUniforms = false;
         if (this.customShaderNameResolve) {
             uniforms = uniforms.slice();
             uniformBuffers = uniformBuffers.slice();
             samplers = samplers.slice();
+            if (vertexPullingMetadata) {
+                AddVertexPullingUniforms(uniforms, vertexPullingMetadata);
+                hasVertexPullingUniforms = true;
+            }
             shaderName = this.customShaderNameResolve(this.name, uniforms, uniformBuffers, samplers, defines, attribs);
         }
         const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;
@@ -721,6 +729,11 @@ export class ShaderMaterial extends PushMaterial {
         const join = defines.join("\n");
         let effect = previousEffect;
         if (previousDefines !== join) {
+            if (vertexPullingMetadata && !hasVertexPullingUniforms) {
+                // Copy only when creating the effect, as the array may be shared with the material options
+                uniforms = uniforms.slice();
+                AddVertexPullingUniforms(uniforms, vertexPullingMetadata);
+            }
             effect = engine.createEffect(shaderName, {
                 attributes: attribs,
                 uniformsNames: uniforms,