@forgeax/engine-geometry 0.1.33 → 0.1.35

package/dist/vertex-attribute-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vertex-attribute-layout.d.ts","sourceRoot":"","sources":["../src/vertex-attribute-layout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vertex-attribute-layout.d.ts","sourceRoot":"","sources":["../src/vertex-attribute-layout.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-geometry",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -22,10 +22,10 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-ecs": "0.1.33",
-    "@forgeax/engine-math": "0.1.33",
-    "@forgeax/engine-pack": "0.1.33",
-    "@forgeax/engine-types": "0.1.33"
+    "@forgeax/engine-ecs": "0.1.35",
+    "@forgeax/engine-math": "0.1.35",
+    "@forgeax/engine-pack": "0.1.35",
+    "@forgeax/engine-types": "0.1.35"
   },
   "forgeax": {
     "metrics": {

package/src/__tests__/vertex-attribute-layout-owner.unit.test.ts

@@ -33,6 +33,22 @@ function makeCompleteAttributeMap(): VertexAttributeMap {
 }
 
 describe('vertex attribute layout owner', () => {
+  it('shares immutable layouts by attribute presence while observing mutable map edits', () => {
+    const map = { position: makeBuffer(), normal: makeBuffer() };
+    const first = deriveVertexLayoutProjection(map);
+    const sibling = deriveVertexLayoutProjection({ normal: makeBuffer(), position: makeBuffer() });
+    expect(sibling).toBe(first);
+    expect(deriveVertexLayoutProjectionFromMask(first.mask).unwrap()).toBe(first);
+    expect(Object.isFrozen(first.attributes[0])).toBe(true);
+    const edited: Record<string, Float32Array> = map;
+    edited.color = makeBuffer();
+    const colored = deriveVertexLayoutProjection(edited);
+    expect(colored).not.toBe(first);
+    expect(colored.arrayStride).toBe(first.arrayStride + 16);
+    delete edited.color;
+    expect(deriveVertexLayoutProjection(edited)).toBe(first);
+  });
+
   it('publishes the ordinary and skinned maps from the same geometry owner', () => {
     expect(Object.keys(DEFAULT_VERTEX_ATTRIBUTE_MAP)).toEqual([
       'position',

package/src/vertex-attribute-layout.ts

@@ -315,24 +315,31 @@ function fnv1a(input: string): string {
   return `vlp-v1-${(hash >>> 0).toString(16).padStart(8, '0')}`;
 }
 
+// The finite canonical mask is the complete layout identity. Do not key this
+// cache by a mesh/map object: authoring maps may change in place.
+const layoutsByMask = new Map<number, VertexLayoutProjection>();
+
 /** Derive the one canonical immutable layout projection for a vertex map. */
 export function deriveVertexLayoutProjection(map: VertexAttributeMap): VertexLayoutProjection {
+  let mask = 0;
+  for (let index = 0; index < CANONICAL_KEYS.length; index += 1) {
+    const key = CANONICAL_KEYS[index];
+    if (key !== undefined && map[key] !== undefined) mask |= 1 << index;
+  }
+  return layoutFromMask(mask);
+}
+
+function layoutFromMask(mask: number): VertexLayoutProjection {
+  const cached = layoutsByMask.get(mask);
+  if (cached !== undefined) return cached;
   const attributes: VertexLayoutProjectionAttribute[] = [];
   let offset = 0;
-  let mask = 0;
-  for (const key of CANONICAL_KEYS) {
-    const value = map[key];
-    if (value === undefined) continue;
+  for (let index = 0; index < CANONICAL_KEYS.length; index += 1) {
+    const key = CANONICAL_KEYS[index];
+    if (key === undefined || (mask & (1 << index)) === 0) continue;
     const format = ATTRIBUTE_FORMAT_MAP[key];
     const byteLength = bytesForFormat(format);
-    attributes.push({
-      key,
-      shaderLocation: CANONICAL_KEYS.indexOf(key),
-      offset,
-      format,
-      byteLength,
-    });
-    mask |= 1 << CANONICAL_KEYS.indexOf(key);
+    attributes.push(Object.freeze({ key, shaderLocation: index, offset, format, byteLength }));
     offset += byteLength;
   }
   const digestInput = [
@@ -343,13 +350,15 @@ export function deriveVertexLayoutProjection(map: VertexAttributeMap): VertexLay
       (entry) => `${entry.key},${entry.shaderLocation},${entry.offset},${entry.format}`,
     ),
   ].join('|');
-  return Object.freeze({
+  const projection: VertexLayoutProjection = Object.freeze({
     schemaVersion: 1,
     attributes: Object.freeze(attributes),
     mask,
     arrayStride: offset,
     digest: fnv1a(digestInput),
   });
+  layoutsByMask.set(mask, projection);
+  return projection;
 }
 
 export interface PackedVertexAttributes {
@@ -405,14 +414,7 @@ export function deriveVertexLayoutProjectionFromMask(
       detail: { mask, knownMask, unknownMask, reason: 'unknown-bits' },
     });
   }
-  const map: Record<string, Float32Array | Uint16Array> = {};
-  for (let index = 0; index < CANONICAL_KEYS.length; index += 1) {
-    if ((mask & (1 << index)) === 0) continue;
-    const key = CANONICAL_KEYS[index];
-    if (key !== undefined)
-      map[key] = key === 'skinIndex' ? new Uint16Array(0) : new Float32Array(0);
-  }
-  return ok(deriveVertexLayoutProjection(map as VertexAttributeMap));
+  return ok(layoutFromMask(unsignedMask));
 }
 
 /** Pack tightly-owned attributes into the projection's canonical interleaved bytes. */