@forgeax/engine-gltf 0.1.33 → 0.1.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-gltf",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -35,21 +35,21 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-animation": "0.1.33",
-    "@forgeax/engine-geometry": "0.1.33",
-    "@forgeax/engine-import": "0.1.33",
-    "@forgeax/engine-math": "0.1.33",
-    "@forgeax/engine-pack": "0.1.33",
-    "@forgeax/engine-scene": "0.1.33",
-    "@forgeax/engine-types": "0.1.33",
+    "@forgeax/engine-animation": "0.1.34",
+    "@forgeax/engine-geometry": "0.1.34",
+    "@forgeax/engine-import": "0.1.34",
+    "@forgeax/engine-math": "0.1.34",
+    "@forgeax/engine-pack": "0.1.34",
+    "@forgeax/engine-scene": "0.1.34",
+    "@forgeax/engine-types": "0.1.34",
     "@webgpu/types": "^0.1.71",
     "meshoptimizer": "^0.20.0"
   },
   "devDependencies": {
-    "@forgeax/engine-assets-runtime": "0.1.33",
-    "@forgeax/engine-picking": "0.1.33",
-    "@forgeax/engine-render": "0.1.33",
-    "@forgeax/engine-runtime": "0.1.33",
+    "@forgeax/engine-assets-runtime": "0.1.34",
+    "@forgeax/engine-picking": "0.1.34",
+    "@forgeax/engine-render": "0.1.34",
+    "@forgeax/engine-runtime": "0.1.34",
     "@types/node": "^20.14.0"
   },
   "forgeax": {

package/src/__tests__/bridge.unit.test.ts

@@ -133,7 +133,6 @@ const STANDARD_MATERIAL: GltfMaterialIr = {
   const ctx = {
     meshHandles: new Map([[0, fakeMeshHandle(1)]]),
     materialHandles: new Map([[0, fakeMaterialHandle(7)]]),
-    instanceCollectionIdsByNodeIndex: new Map([[0, 41]]),
   };
 
   describe('bridge-name-instances.test.ts', () => {
@@ -177,16 +176,19 @@ const STANDARD_MATERIAL: GltfMaterialIr = {
       });
     });
 
-    describe('bridge.ts Instances association', () => {
-      it('attaches the renderer-owned collection identity without copying transforms', () => {
+    describe('bridge.ts Instances attachment (M4 w11/w12)', () => {
+      it('AC-10 attaches Instances with transforms.length === N*16', () => {
         const scene = gltfDocToSceneAsset(baseDoc(), ctx);
         const node = scene.entities['node-0'];
         expect(node?.components.Instances).toBeDefined();
         const inst = node?.components.Instances;
-        expect(inst).toEqual({ collectionId: 41 });
+        if (inst !== undefined) {
+          const transforms = inst.transforms as Float32Array;
+          expect(transforms.length).toBe(4 * 16);
+        }
       });
 
-      it('preserves the caller-owned identity when the IR matrix payload changes', () => {
+      it('AC-10 transforms identity is byte-equal to importer composed buffer', () => {
         const seed = new Float32Array(4 * 16);
         for (let i = 0; i < seed.length; i++) seed[i] = i;
         const doc: GltfDoc = {
@@ -199,7 +201,7 @@ const STANDARD_MATERIAL: GltfMaterialIr = {
           ],
         };
         const scene = gltfDocToSceneAsset(doc, ctx);
-        expect(scene.entities['node-0']?.components.Instances).toEqual({ collectionId: 41 });
+        expect(scene.entities['node-0']?.components.Instances).toEqual({ transforms: seed });
       });
 
       it('AC-11 1 entity carries MeshFilter+MeshRenderer+Instances (no flatten)', () => {
@@ -222,12 +224,14 @@ const STANDARD_MATERIAL: GltfMaterialIr = {
         expect(scene.entities['node-0']?.components.Instances).toBeUndefined();
       });
 
-      it('omits an instancing association when no renderer collection is supplied', () => {
+      it('preserves authored instancing without a Renderer', () => {
         const scene = gltfDocToSceneAsset(baseDoc(), {
           meshHandles: ctx.meshHandles,
           materialHandles: ctx.materialHandles,
         });
-        expect(scene.entities['node-0']?.components.Instances).toBeUndefined();
+        expect(scene.entities['node-0']?.components.Instances).toEqual({
+          transforms: baseDoc().nodes[0]?.instancing?.transforms,
+        });
       });
     });
   });

package/src/bridge.ts

@@ -458,13 +458,6 @@ export interface GltfBridgeContext {
    * matching SkinAsset.jointPaths against the spawn subtree to fill Skin.joints[].
    */
   readonly skeletonGuidBySkinIndex?: ReadonlyMap<number, string>;
-  /**
-   * glTF node index -> a live renderer-owned instance collection identity.
-   * The bridge is intentionally pure and cannot mint collection ids or copy
-   * matrix bytes into ECS. Runtime consumers create collections through their
-   * Renderer first, then provide this map when lowering the SceneAsset.
-   */
-  readonly instanceCollectionIdsByNodeIndex?: ReadonlyMap<number, number>;
 }
 
 interface MutableSceneEntity {
@@ -711,16 +704,9 @@ export function gltfDocToSceneAsset(doc: GltfDoc, ctx: GltfBridgeContext): Scene
       components.MeshRenderer = { materials: [] };
     }
 
-    // Instances on the same entity as MeshFilter/MeshRenderer. The bridge
-    // only carries the renderer-owned identity; IR matrix bytes stay in the
-    // caller's collection and never become an ECS managed array. Build-time
-    // consumers that do not have a Renderer omit this optional association and
-    // must materialise the collection at their runtime boundary.
+    // Scene authoring preserves instance matrices without a Renderer.
     if (ir.instancing !== undefined) {
-      const collectionId = ctx.instanceCollectionIdsByNodeIndex?.get(gltfNodeIdx);
-      if (collectionId !== undefined) {
-        components.Instances = { collectionId };
-      }
+      components.Instances = { transforms: ir.instancing.transforms };
     }
 
     if (isCamera) {