@onerjs/core 8.30.4 → 8.30.6

package/Materials/shaderMaterial.js

@@ -10,6 +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, PrepareAttributesForBakedVertexAnimation, PrepareDefinesAndAttributesForMorphTargets, PushAttributesForInstances, } from "./materialHelper.functions.js";
 const OnCreatedEffectParameters = { effect: null, subMesh: null };
 /**
@@ -674,12 +675,31 @@ export class ShaderMaterial extends PushMaterial {
         if (renderingMesh && this.useVertexPulling) {
             defines.push("#define USE_VERTEX_PULLING");
             const indexBuffer = renderingMesh.geometry?.getIndexBuffer();
-            if (indexBuffer) {
+            if (indexBuffer && !renderingMesh.isUnIndexed) {
                 defines.push("#define VERTEX_PULLING_USE_INDEX_BUFFER");
                 if (indexBuffer.is32Bits) {
                     defines.push("#define VERTEX_PULLING_INDEX_BUFFER_32BITS");
                 }
             }
+            // 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}`);
+                        }
+                    }
+                }
+            }
         }
         const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;
         const previousEffect = drawWrapper?.effect ?? null;