@forgeax/engine-gltf 0.1.28 → 0.1.29

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { err, ok, createMaterialError, standardMaterialParameters, reconcileMeshMaterialSlotTopology, MESH_MATERIAL_SLOT_SOURCE_OVERRIDE_PAYLOAD_SCHEMA, STANDARD_MATERIAL_PARAM_SCHEMA, STANDARD_PHYSICAL_PARAMETER_NAMES, STANDARD_TRANSMISSION_PARAMETER_NAMES, ImportError, STANDARD_LAYER_PARAMETER_GROUPS, IMPORT_ERROR_HINTS, toShared, resolveMeshMaterialSlotDefaultGuid } from '@forgeax/engine-types';
+import { err, ok, createMaterialError, standardMaterialParameters, reconcileMeshMaterialSlotTopology, MESH_MATERIAL_SLOT_SOURCE_OVERRIDE_PAYLOAD_SCHEMA, STANDARD_MATERIAL_PARAM_SCHEMA, STANDARD_PHYSICAL_PARAMETER_NAMES, STANDARD_TRANSMISSION_PARAMETER_NAMES, ImportError, STANDARD_LAYER_PARAMETER_GROUPS, IMPORT_ERROR_HINTS, parseConservativeAnimatedBounds, readConservativeAnimatedBounds, toShared, resolveMeshMaterialSlotDefaultGuid } from '@forgeax/engine-types';
 export { err, ok } from '@forgeax/engine-types';
 import { computeTangentVec4, packInterleavedVertexAttributes } from '@forgeax/engine-geometry';
 import { box3, mat4, vec3, quat } from '@forgeax/engine-math';
@@ -716,7 +716,7 @@ function composeMat4(out, tx, ty, tz, qx, qy, qz, qw, sx, sy, sz) {
 function gltfDocToSceneAsset(doc, ctx) {
   const sceneIr = doc.scenes[doc.defaultSceneIndex];
   const resultNodes = [];
-  if (sceneIr === void 0) return { kind: "scene", entities: [] };
+  if (sceneIr === void 0) return { kind: "scene", entities: {} };
   const importedLights = doc.lights ?? doc.extensions?.KHR_lights_punctual?.lights ?? [];
   const animationTargetIds = /* @__PURE__ */ new Map();
   for (const clip of doc.animationClips) {
@@ -809,7 +809,10 @@ function gltfDocToSceneAsset(doc, ctx) {
       components.MeshRenderer = { materials: [] };
     }
     if (ir.instancing !== void 0) {
-      components.Instances = { transforms: ir.instancing.transforms };
+      const collectionId = ctx.instanceCollectionIdsByNodeIndex?.get(gltfNodeIdx);
+      if (collectionId !== void 0) {
+        components.Instances = { collectionId };
+      }
     }
     if (isCamera) {
       components.Camera = {
@@ -837,10 +840,20 @@ function gltfDocToSceneAsset(doc, ctx) {
     for (let i = 0; i < 16; i++) parentWorld[i] = savedParent[i] ?? 0;
   };
   for (const rootIdx of sceneIr.nodes) visit(rootIdx, null);
-  const frozen = resultNodes.map((n) => ({
-    localId: n.localId,
-    components: n.components
-  }));
+  const keyByLocalId = /* @__PURE__ */ new Map();
+  for (const node of resultNodes) keyByLocalId.set(node.localIdx, `node-${node.localIdx}`);
+  const entities = {};
+  for (const node of resultNodes) {
+    const components = { ...node.components };
+    const childOf = components.ChildOf;
+    if (childOf !== void 0 && typeof childOf.parent === "number") {
+      const parentKey = keyByLocalId.get(childOf.parent);
+      if (parentKey === void 0)
+        throw new Error(`gltfDocToSceneAsset: missing parent node ${childOf.parent}`);
+      components.ChildOf = { ...childOf, parent: parentKey };
+    }
+    entities[`node-${node.localIdx}`] = { components };
+  }
   const lightFacts = importedLights.map((light) => ({
     kind: light.type,
     intensity: light.intensity,
@@ -849,7 +862,7 @@ function gltfDocToSceneAsset(doc, ctx) {
   }));
   return {
     kind: "scene",
-    entities: frozen,
+    entities,
     ...lightFacts.length === 0 ? {} : { lights: lightFacts }
   };
 }
@@ -2303,8 +2316,6 @@ function parseAnimation(animationsJson, nodesJson, accessors, bufferViews, buffe
   }
   return ok(clips);
 }
-
-// src/parse-skin.ts
 var MAX_JOINTS = 256;
 var SKIN_ACCESSOR_TYPES = ["MAT4"];
 function identityMat4() {
@@ -2385,10 +2396,14 @@ function parseSkin(skinsJson, nodesJson, accessors, bufferViews, buffers) {
       if (!pathResult.ok) return err(pathResult.error);
       jointPaths.push(pathResult.value.join("/"));
     }
+    const bounds = parseConservativeAnimatedBounds(
+      skin.extras?.forgeax?.conservativeAnimatedBounds
+    );
     records.push({
       jointCount: joints.length,
       inverseBindMatrices: ibm,
-      jointPaths
+      jointPaths,
+      ...bounds === void 0 ? {} : { bounds }
     });
   }
   return ok(records);
@@ -3599,6 +3614,16 @@ function isGlbBytes(source) {
 function publishesCatalogProduct(input) {
   return input.importSettings.geometry !== "procedural";
 }
+function applyImportSettingsBounds(doc, importSettings) {
+  let changed = false;
+  const skeletons = doc.skeletons.map((record, sourceIndex) => {
+    const bounds = readConservativeAnimatedBounds(importSettings, sourceIndex);
+    if (bounds === void 0 || record.bounds !== void 0) return record;
+    changed = true;
+    return { ...record, bounds };
+  });
+  return changed ? { ...doc, skeletons } : doc;
+}
 function previousMaterialSlotTopology(ctx, meshSourceKey) {
   if (meshSourceKey === void 0) return void 0;
   const value = ctx.sourceOverrides?.[meshSourceKey]?.materialSlots;
@@ -3918,7 +3943,7 @@ async function importGltf(ctx, meshopt) {
   }
   const parsed = await parseDoc(ctx.source, read.value, ctx);
   if (!parsed.ok) return parsed;
-  const doc = parsed.value;
+  const doc = applyImportSettingsBounds(parsed.value, ctx.importSettings);
   const maps = buildHandleMaps(ctx.subAssets, doc);
   const imageColorSpaces = deriveTextureColorSpace({
     imageCount: (doc.images ?? []).length,
@@ -4217,7 +4242,7 @@ async function importGltf(ctx, meshopt) {
               fieldName: prov.fieldName,
               ...prov.arrayIndex !== void 0 ? { arrayIndex: prov.arrayIndex } : {}
             },
-            sceneEntityId: prov.sceneEntityId
+            sceneEntityKey: prov.sceneEntityKey
           };
         }
         return { guid };
@@ -4228,19 +4253,19 @@ async function importGltf(ctx, meshopt) {
       });
       const handleValueProvenance = /* @__PURE__ */ new Map();
       const skeletonGuidProvenance = /* @__PURE__ */ new Map();
-      for (const entity of scene.entities) {
+      for (const [sceneEntityKey, entity] of Object.entries(scene.entities)) {
         const comps = entity.components;
         const mf = comps.MeshFilter;
         if (mf !== void 0 && typeof mf.assetHandle === "number") {
           handleValueProvenance.set(mf.assetHandle, {
-            sceneEntityId: entity.localId,
+            sceneEntityKey,
             componentName: "MeshFilter",
             fieldName: "assetHandle"
           });
         }
         const skin = comps.Skin;
         if (skin !== void 0 && typeof skin.skeleton === "string") {
-          skeletonGuidProvenance.set(skin.skeleton, { sceneEntityId: entity.localId });
+          skeletonGuidProvenance.set(skin.skeleton, { sceneEntityKey });
         }
       }
       const meshGuidList = [...maps.meshGuidByIndex.values()];
@@ -4258,7 +4283,7 @@ async function importGltf(ctx, meshopt) {
             skProv !== void 0 ? {
               guid,
               sourceField: { componentName: "Skin", fieldName: "skeleton" },
-              sceneEntityId: skProv.sceneEntityId
+              sceneEntityKey: skProv.sceneEntityKey
             } : { guid }
           );
           cursor++;
@@ -4288,7 +4313,8 @@ async function importGltf(ctx, meshopt) {
       const payload = {
         kind: "skeleton",
         inverseBindMatrices: rec.inverseBindMatrices,
-        jointCount: rec.jointCount
+        jointCount: rec.jointCount,
+        ...rec.bounds === void 0 ? {} : { bounds: rec.bounds }
       };
       out.push({ guid: sub.guid, kind: "skeleton", payload, refs: [], artifacts: {} });
     } else if (sub.kind === "skin") {