@onerjs/core 8.31.5 → 8.31.7

package/Materials/materialHelper.functions.d.ts

@@ -12,6 +12,7 @@ import type { Material } from "./material.js";
 import type { Nullable } from "../types.js";
 import type { MorphTargetManager } from "../Morph/morphTargetManager.js";
 import type { Color3 } from "../Maths/math.color.js";
+import type { Geometry } from "../Meshes/geometry.js";
 export * from "./materialHelper.functions.pure.js";
 /**
  * Binds the fog information from the scene to the effect for the given mesh.
@@ -180,13 +181,34 @@ export declare function HandleFallbacksForShadows(defines: any, fallbacks: Effec
  */
 export declare function GetFogState(mesh: AbstractMesh, scene: Scene): boolean;
 /**
- * Helper used to prepare vertex pulling metadata defines (stride, offset, component count)
- * This should be called when USE_VERTEX_PULLING is enabled to properly configure buffer access
- * @param mesh The mesh being rendered
- * @param defines The defines object to update
- * @param attributeNames Array of attribute names to configure (e.g., ["position", "normal"])
- */
-export declare function PrepareDefinesForVertexPullingMetadata(mesh: AbstractMesh, defines: any, attributeNames?: string[]): void;
+ * Interface representing metadata for vertex pulling
+ */
+export interface IVertexPullingMetadata {
+    /**
+     * Offset in vertex buffer where data starts
+     */
+    offset: number;
+    /**
+     * Stride between elements in the vertex buffer
+     */
+    stride: number;
+    /**
+     * Type of the vertex buffer (e.g., float, int)
+     */
+    type: number;
+}
+/**
+ * Prepares vertex pulling uniforms for the given attributes and mesh
+ * @param geometry The geometry containing the vertex buffers
+ * @returns A map of attribute names to their metadata, or null if unavailable
+ */
+export declare function PrepareVertexPullingUniforms(geometry: Geometry): Nullable<Map<string, IVertexPullingMetadata>>;
+/**
+ * Bind vertex pulling uniforms to the effect
+ * @param effect The effect to bind the uniforms to
+ * @param metadata The vertex pulling metadata
+ */
+export declare function BindVertexPullingUniforms(effect: Effect, metadata: Map<string, IVertexPullingMetadata>): void;
 /**
  * Helper used to prepare the list of defines associated with misc. values for shader compilation
  * @param mesh defines the current mesh

package/Materials/materialHelper.functions.js

@@ -5,7 +5,7 @@ import { LightConstants } from "../Lights/lightConstants.js";
 import { PrepareDefinesForClipPlanes } from "./clipPlaneMaterialHelper.js";
 import { MaterialFlags } from "./materialFlags.js";
 import { Texture } from "./Textures/texture.js";
-import { GetTypeByteLength } from "../Buffers/bufferUtils.js";
+import { Vector3 } from "../Maths/math.vector.js";
 // For backwards compatibility, we export everything from the pure version of this file.
 export * from "./materialHelper.functions.pure.js";
 // Temps
@@ -502,34 +502,69 @@ export function HandleFallbacksForShadows(defines, fallbacks, maxSimultaneousLig
 export function GetFogState(mesh, scene) {
     return scene.fogEnabled && mesh.applyFog && scene.fogMode !== 0;
 }
+// Store vertex pulling metadata per geometry
+const _VertexPullingMetadataCache = new WeakMap();
 /**
- * Helper used to prepare vertex pulling metadata defines (stride, offset, component count)
- * This should be called when USE_VERTEX_PULLING is enabled to properly configure buffer access
- * @param mesh The mesh being rendered
- * @param defines The defines object to update
- * @param attributeNames Array of attribute names to configure (e.g., ["position", "normal"])
+ * Prepares vertex pulling uniforms for the given attributes and mesh
+ * @param geometry The geometry containing the vertex buffers
+ * @returns A map of attribute names to their metadata, or null if unavailable
  */
-export function PrepareDefinesForVertexPullingMetadata(mesh, defines, attributeNames = ["position"]) {
-    if (!defines["USE_VERTEX_PULLING"]) {
-        return;
-    }
-    const geometry = mesh.geometry;
+export function PrepareVertexPullingUniforms(geometry) {
     if (!geometry) {
-        return;
+        return null;
+    }
+    const vertexBuffers = geometry.getVertexBuffers();
+    if (!vertexBuffers) {
+        return null;
+    }
+    // Check cache first
+    let metadata = _VertexPullingMetadataCache.get(geometry);
+    if (!metadata) {
+        metadata = new Map();
+        _VertexPullingMetadataCache.set(geometry, metadata);
     }
-    for (const attributeName of attributeNames) {
-        const vertexBuffer = geometry.getVertexBuffer(attributeName);
-        if (!vertexBuffer) {
-            continue;
+    else {
+        // Return cached metadata if it exists and hasn't changed
+        let needsUpdate = false;
+        for (const vb in vertexBuffers) {
+            if (!metadata.has(vb)) {
+                needsUpdate = true;
+                break;
+            }
+        }
+        if (!needsUpdate) {
+            return metadata;
         }
-        const upperName = attributeName.toUpperCase();
-        const sizeInBytes = GetTypeByteLength(vertexBuffer.type);
-        // Calculate stride in float32 elements
-        const stride = vertexBuffer.effectiveByteStride / sizeInBytes;
-        defines[`${upperName}_STRIDE`] = stride || vertexBuffer.getSize();
-        // Calculate offset in float32 elements
-        const offset = vertexBuffer.effectiveByteOffset / sizeInBytes;
-        defines[`${upperName}_OFFSET`] = offset;
+    }
+    // Build or update metadata
+    for (const vb in vertexBuffers) {
+        const vertexBuffer = vertexBuffers[vb];
+        if (vertexBuffer) {
+            const offset = vertexBuffer.byteOffset;
+            const stride = vertexBuffer.byteStride;
+            const type = vertexBuffer.type;
+            metadata.set(vb, {
+                offset: offset,
+                stride: stride,
+                type: type,
+            });
+        }
+    }
+    return metadata;
+}
+/**
+ * Bind vertex pulling uniforms to the effect
+ * @param effect The effect to bind the uniforms to
+ * @param metadata The vertex pulling metadata
+ */
+export function BindVertexPullingUniforms(effect, metadata) {
+    if (!metadata || !effect) {
+        return;
+    }
+    for (const [attribute, data] of metadata.entries()) {
+        const uniformName = `vp_${attribute}_info`;
+        // Pack into vec3: (offset, stride, type)
+        effect.setVector3(uniformName, new Vector3(data.offset, data.stride, data.type));
     }
 }
 /**