@onerjs/core 8.31.6 → 8.31.7

package/Materials/shaderMaterial.js

@@ -10,8 +10,7 @@ import { PushMaterial } from "./pushMaterial.js";
 import { EngineStore } from "../Engines/engineStore.js";
 
 import { AddClipPlaneUniforms, BindClipPlane, PrepareStringDefinesForClipPlanes } from "./clipPlaneMaterialHelper.js";
-import { GetTypeByteLength } from "../Buffers/bufferUtils.js";
-import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetParameters, BindSceneUniformBuffer, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances, } from "./materialHelper.functions.js";
+import { BindBonesParameters, BindFogParameters, BindLogDepth, BindMorphTargetParameters, BindSceneUniformBuffer, PrepareDefinesAndAttributesForMorphTargets, PrepareVertexPullingUniforms, BindVertexPullingUniforms, 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.
@@ -64,6 +63,7 @@ export class ShaderMaterial extends PushMaterial {
         this._cachedWorldViewMatrix = new Matrix();
         this._cachedWorldViewProjectionMatrix = new Matrix();
         this._multiview = false;
+        this._vertexPullingMetadata = null;
         /**
          * @internal
          */
@@ -705,21 +705,7 @@ export class ShaderMaterial extends PushMaterial {
             // Add vertex buffer metadata defines for proper stride/offset handling
             const geometry = renderingMesh.geometry;
             if (geometry) {
-                const vertexBuffers = geometry.getVertexBuffers();
-                if (vertexBuffers) {
-                    for (const attributeName in vertexBuffers) {
-                        const vertexBuffer = vertexBuffers[attributeName];
-                        if (vertexBuffer) {
-                            const componentBytes = GetTypeByteLength(vertexBuffer.type);
-                            const upperName = attributeName.toUpperCase();
-                            const stride = vertexBuffer.effectiveByteStride / 4;
-                            const offset = vertexBuffer.effectiveByteOffset / 4;
-                            defines.push(`#define ${upperName}_STRIDE ${stride}`);
-                            defines.push(`#define ${upperName}_OFFSET ${offset}`);
-                            defines.push(`#define ${upperName}_COMPONENT_BYTES ${componentBytes}`);
-                        }
-                    }
-                }
+                this._vertexPullingMetadata = PrepareVertexPullingUniforms(geometry);
             }
         }
         const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;
@@ -857,6 +843,9 @@ export class ShaderMaterial extends PushMaterial {
             BindBonesParameters(mesh, effect);
             // Clip plane
             BindClipPlane(effect, this, scene);
+            if (this._vertexPullingMetadata) {
+                BindVertexPullingUniforms(effect, this._vertexPullingMetadata);
+            }
             // Misc
             if (this._useLogarithmicDepth) {
                 BindLogDepth(storeEffectOnSubMeshes ? subMesh.materialDefines : effect.defines, effect, scene);