@forgeax/engine-fbx 0.1.3 → 0.1.6

package/src/native/bridge.c

@@ -395,118 +395,6 @@ static void write_nodes(Buf *b, ufbx_scene *scene) {
 
 /* ── Materials writing ─────────────────────────────────────────────── */
 
-static int texture_index(ufbx_scene *scene, const ufbx_texture *texture) {
-    if (!texture) return -1;
-    for (size_t i = 0; i < scene->textures.count; i++) {
-        if (scene->textures.data[i] == texture) return (int)i;
-    }
-    return -1;
-}
-
-static int map_texture_index(ufbx_scene *scene, const ufbx_material_map *map) {
-    if (!map || !map->texture_enabled || !map->texture) return -1;
-    return texture_index(scene, map->texture);
-}
-
-static void write_texture_binding(
-    Buf *b,
-    ufbx_scene *scene,
-    const char *slot,
-    const ufbx_material_map *map,
-    int *first
-) {
-    int index = map_texture_index(scene, map);
-    if (index < 0) return;
-    if (!*first) buf_char(b, ',');
-    *first = 0;
-    buf_str(b, "{\"slot\":");
-    buf_quoted(b, slot);
-    buf_str(b, ",\"textureIndex\":");
-    buf_int(b, index);
-    buf_char(b, '}');
-}
-
-static void write_texture_bindings(Buf *b, ufbx_scene *scene, ufbx_material *mat) {
-    const ufbx_material_map *base_color =
-        map_texture_index(scene, &mat->pbr.base_color) >= 0 ? &mat->pbr.base_color : &mat->fbx.diffuse_color;
-    const ufbx_material_map *normal =
-        map_texture_index(scene, &mat->pbr.normal_map) >= 0 ? &mat->pbr.normal_map : &mat->fbx.normal_map;
-    const ufbx_material_map *specular =
-        map_texture_index(scene, &mat->pbr.specular_color) >= 0 ? &mat->pbr.specular_color : &mat->fbx.specular_color;
-    const ufbx_material_map *emissive =
-        map_texture_index(scene, &mat->pbr.emission_color) >= 0 ? &mat->pbr.emission_color : &mat->fbx.emission_color;
-    const ufbx_material_map *occlusion = &mat->pbr.ambient_occlusion;
-    const ufbx_material_map *metalness = &mat->pbr.metalness;
-    const ufbx_material_map *roughness = &mat->pbr.roughness;
-    int has_any =
-        map_texture_index(scene, base_color) >= 0 ||
-        map_texture_index(scene, normal) >= 0 ||
-        map_texture_index(scene, specular) >= 0 ||
-        map_texture_index(scene, emissive) >= 0 ||
-        map_texture_index(scene, occlusion) >= 0 ||
-        (map_texture_index(scene, metalness) >= 0 && map_texture_index(scene, roughness) >= 0 &&
-         map_texture_index(scene, metalness) == map_texture_index(scene, roughness));
-    if (!has_any) return;
-
-    buf_str(b, ",\"textureBindings\":[");
-    int first = 1;
-    write_texture_binding(b, scene, "baseColorTexture", base_color, &first);
-    write_texture_binding(b, scene, "normalTexture", normal, &first);
-    write_texture_binding(b, scene, "specularTintTexture", specular, &first);
-    write_texture_binding(b, scene, "emissiveTexture", emissive, &first);
-    write_texture_binding(b, scene, "occlusionTexture", occlusion, &first);
-    if (map_texture_index(scene, metalness) >= 0 &&
-        map_texture_index(scene, metalness) == map_texture_index(scene, roughness)) {
-        write_texture_binding(b, scene, "metallicRoughnessTexture", metalness, &first);
-    }
-    buf_char(b, ']');
-}
-
-static const char *texture_type_name(ufbx_texture_type type) {
-    switch (type) {
-        case UFBX_TEXTURE_FILE: return "file";
-        case UFBX_TEXTURE_LAYERED: return "layered";
-        case UFBX_TEXTURE_PROCEDURAL: return "procedural";
-        case UFBX_TEXTURE_SHADER: return "shader";
-        default: return "unknown";
-    }
-}
-
-static void write_textures(Buf *b, ufbx_scene *scene) {
-    if (scene->textures.count == 0) return;
-    buf_str(b, ",\"textures\":[");
-    for (size_t i = 0; i < scene->textures.count; i++) {
-        ufbx_texture *texture = scene->textures.data[i];
-        if (i > 0) buf_char(b, ',');
-        buf_str(b, "{\"name\":");
-        buf_quoted(b, texture->name.data ? texture->name.data : "");
-        buf_str(b, ",\"type\":");
-        buf_quoted(b, texture_type_name(texture->type));
-        buf_str(b, ",\"filePath\":");
-        if (texture->relative_filename.data && texture->relative_filename.data[0] != '\0') {
-            buf_quoted(b, texture->relative_filename.data);
-        } else if (texture->filename.data && texture->filename.data[0] != '\0') {
-            buf_quoted(b, texture->filename.data);
-        } else {
-            buf_quoted(b, "");
-        }
-        buf_str(b, ",\"relativeFilePath\":");
-        buf_quoted(b, texture->relative_filename.data ? texture->relative_filename.data : "");
-        buf_str(b, ",\"absoluteFilePath\":");
-        buf_quoted(b, texture->absolute_filename.data ? texture->absolute_filename.data : "");
-        buf_str(b, ",\"sourceIndex\":");
-        buf_size(b, i);
-        buf_str(b, ",\"embeddedBytes\":[");
-        const unsigned char *content = (const unsigned char *)texture->content.data;
-        for (size_t byte = 0; content && byte < texture->content.size; byte++) {
-            if (byte > 0) buf_char(b, ',');
-            buf_int(b, content[byte]);
-        }
-        buf_str(b, "]}");
-    }
-    buf_char(b, ']');
-}
-
 static void write_materials(Buf *b, ufbx_scene *scene) {
     if (scene->materials.count == 0) return;
 
@@ -596,8 +484,6 @@ static void write_materials(Buf *b, ufbx_scene *scene) {
             buf_str(b, "\"kind\":\"fallback\"");
         }
 
-        write_texture_bindings(b, scene, mat);
-
         buf_str(b, ",\"sourceIndex\":");
         buf_size(b, i);
 
@@ -1024,10 +910,6 @@ void parseFbxWasm(const void *data, size_t size) {
     /* Nodes */
     write_nodes(&b, scene);
 
-    /* Textures must be emitted before materials so the JSON remains easy to
-       inspect; material bindings refer to these stable scene texture indices. */
-    write_textures(&b, scene);
-
     /* Materials */
     write_materials(&b, scene);
 

package/src/parse-material.ts

@@ -7,13 +7,7 @@
 //  3. Lambert      → same formula as Phong (max_gloss=100 default)
 //  4. Fallback     → default grey PBR: baseColor=[0.5,0.5,0.5], metal=0, rough=0.5
 
-import type { MaterialPod, MaterialTextureBindingPod } from '@forgeax/engine-types';
-
-export interface FbxRawTextureBinding {
-  readonly slot: MaterialTextureBindingPod['slot'];
-  readonly textureIndex: number;
-  readonly texCoord?: number;
-}
+import type { MaterialPod } from '@forgeax/engine-types';
 
 /** JSON shape emitted by binding.cc WriteMaterials for a single material. */
 export interface FbxRawMaterial {
@@ -23,7 +17,6 @@ export interface FbxRawMaterial {
   readonly diffuse?: readonly [number, number, number];
   readonly shininess?: number;
   readonly specular?: readonly [number, number, number];
-  readonly textureBindings?: readonly FbxRawTextureBinding[];
   readonly stingrayProps?: {
     readonly baseColor?: readonly [number, number, number];
     readonly metallic?: number;
@@ -50,43 +43,6 @@ function phongRoughness(shininess: number, maxGloss = 100): number {
 export function parseMaterial(raw: FbxRawMaterial, sourceIndex: number): MaterialPod {
   void sourceIndex; // reserved for future cross-referencing
 
-  const textureBindings = raw.textureBindings?.map((binding) => ({
-    slot: binding.slot,
-    textureIndex: binding.textureIndex,
-    ...(binding.texCoord === undefined ? {} : { texCoord: binding.texCoord }),
-  }));
-  const textureFields: Pick<
-    MaterialPod,
-    | 'textureBindings'
-    | 'baseColorTextureIndex'
-    | 'metallicRoughnessTextureIndex'
-    | 'normalTextureIndex'
-    | 'occlusionTextureIndex'
-    | 'emissiveTextureIndex'
-    | 'specularTintTextureIndex'
-  > =
-    textureBindings === undefined || textureBindings.length === 0
-      ? {}
-      : {
-          textureBindings,
-          ...Object.fromEntries(
-            textureBindings.map((binding) => [
-              binding.slot === 'baseColorTexture'
-                ? 'baseColorTextureIndex'
-                : binding.slot === 'metallicRoughnessTexture'
-                  ? 'metallicRoughnessTextureIndex'
-                  : binding.slot === 'normalTexture'
-                    ? 'normalTextureIndex'
-                    : binding.slot === 'occlusionTexture'
-                      ? 'occlusionTextureIndex'
-                      : binding.slot === 'emissiveTexture'
-                        ? 'emissiveTextureIndex'
-                        : 'specularTintTextureIndex',
-              binding.textureIndex,
-            ]),
-          ),
-        };
-
   switch (raw.kind) {
     case 'stingray-pbs': {
       const sp = raw.stingrayProps ?? {};
@@ -100,7 +56,6 @@ export function parseMaterial(raw: FbxRawMaterial, sourceIndex: number): Materia
         ],
         metallicFactor: sp.metallic ?? 0,
         roughnessFactor: sp.roughness ?? 0.5,
-        ...textureFields,
       };
     }
 
@@ -112,7 +67,6 @@ export function parseMaterial(raw: FbxRawMaterial, sourceIndex: number): Materia
         baseColorFactor: [d[0] ?? 0.5, d[1] ?? 0.5, d[2] ?? 0.5, 1],
         metallicFactor: 0,
         roughnessFactor: phongRoughness(gloss),
-        ...textureFields,
       };
     }
 
@@ -123,7 +77,6 @@ export function parseMaterial(raw: FbxRawMaterial, sourceIndex: number): Materia
         baseColorFactor: [d[0] ?? 0.5, d[1] ?? 0.5, d[2] ?? 0.5, 1],
         metallicFactor: 0,
         roughnessFactor: 0.5, // lambert has no specular → default roughness
-        ...textureFields,
       };
     }
 
@@ -133,7 +86,6 @@ export function parseMaterial(raw: FbxRawMaterial, sourceIndex: number): Materia
         baseColorFactor: [0.5, 0.5, 0.5, 1],
         metallicFactor: 0,
         roughnessFactor: 0.5,
-        ...textureFields,
       };
     }
   }

package/src/parse-texture.ts

@@ -4,11 +4,7 @@ import type { TexturePod } from '@forgeax/engine-types';
 
 export interface FbxRawTexture {
   readonly name?: string;
-  readonly filePath?: string;
-  readonly relativeFilePath?: string;
-  readonly absoluteFilePath?: string;
-  readonly embeddedBytes?: readonly number[];
-  readonly type?: 'file' | 'layered' | 'procedural' | 'shader' | 'unknown';
+  readonly filePath: string;
   readonly sourceIndex: number;
 }
 
@@ -16,21 +12,11 @@ export interface FbxRawTextures {
   readonly textures?: readonly FbxRawTexture[];
 }
 
-function normalizePath(path: string): string {
-  return path.replaceAll('\\', '/');
-}
-
 export function parseTextures(raw: FbxRawTextures): TexturePod[] {
   const textures = raw.textures ?? [];
   return textures.map((t) => ({
-    name: t.name ?? t.filePath ?? t.relativeFilePath ?? `texture-${t.sourceIndex}`,
-    filePath: normalizePath(t.filePath ?? t.relativeFilePath ?? ''),
-    ...(t.relativeFilePath === undefined
-      ? {}
-      : { relativeFilePath: normalizePath(t.relativeFilePath) }),
-    ...(t.absoluteFilePath === undefined ? {} : { absoluteFilePath: t.absoluteFilePath }),
-    ...(t.embeddedBytes === undefined ? {} : { embeddedBytes: Uint8Array.from(t.embeddedBytes) }),
-    ...(t.type === undefined ? {} : { type: t.type }),
+    name: t.name ?? t.filePath,
+    filePath: t.filePath,
     sourceIndex: t.sourceIndex,
   }));
 }

package/src/to-asset-pack.ts

@@ -7,18 +7,15 @@
 // The import-runner then validates produced == declared and rejects mismatches.
 
 import { deriveAnimationTargetId } from '@forgeax/engine-animation/target-id';
-import { packMeshBinV4 } from '@forgeax/engine-import';
+import { packMeshBinV4 } from '@forgeax/engine-import/mesh-bin';
 import { box3 } from '@forgeax/engine-math';
 import { AssetGuid } from '@forgeax/engine-pack/guid';
 import type {
   AnimationClipPod,
-  AssetCodec,
   AssetRef,
   ImportedAsset,
   MaterialAsset,
   MaterialPod,
-  MaterialTextureBindingPod,
-  MaterialTextureValue,
   MeshAsset,
   MeshMaterialSlot,
   MeshMaterialSlotTopologyEntry,
@@ -28,7 +25,6 @@ import type {
   SkeletonPod,
   SkinPod,
   SourceOverrideMap,
-  TextureAsset,
   TexturePod,
 } from '@forgeax/engine-types';
 import {
@@ -346,61 +342,11 @@ export function buildMeshAsset(
   };
 }
 
-export interface FbxDecodedTexture {
-  readonly texture: TextureAsset;
-  readonly bytes: Uint8Array;
-  readonly mediaType?: string;
-  readonly assetCodec?: AssetCodec;
-}
-
-function materialBindings(pod: MaterialPod): readonly MaterialTextureBindingPod[] {
-  if (pod.textureBindings !== undefined) return pod.textureBindings;
-  const bindings: MaterialTextureBindingPod[] = [];
-  const legacy: readonly [MaterialTextureBindingPod['slot'], number | undefined][] = [
-    ['baseColorTexture', pod.baseColorTextureIndex],
-    ['metallicRoughnessTexture', pod.metallicRoughnessTextureIndex],
-    ['normalTexture', pod.normalTextureIndex],
-    ['specularTintTexture', pod.specularTintTextureIndex],
-    ['emissiveTexture', pod.emissiveTextureIndex],
-    ['occlusionTexture', pod.occlusionTextureIndex],
-  ];
-  for (const [slot, textureIndex] of legacy) {
-    if (textureIndex !== undefined) bindings.push({ slot, textureIndex });
-  }
-  return bindings;
-}
-
-function buildMaterialAsset(
-  pod: MaterialPod,
-  guid: string,
-  skinned = false,
-  textureGuidByIndex: ReadonlyMap<number, string> = new Map(),
-): ImportedAsset {
+function buildMaterialAsset(pod: MaterialPod, guid: string, skinned = false): ImportedAsset {
   // A material consumed by a skinned mesh must select the pbr-skin shader so the
   // runtime PSO chain (LayoutKind 'pbr-skin' + 18-float vertex layout + joint
   // palette) is exercised; the render-system fail-fasts otherwise (mirror of
   // gltfImporter's `skinned` routing).
-  const values: Record<string, NonNullable<MaterialAsset['values']>[string]> = {
-    baseColor: pod.baseColorFactor as readonly [number, number, number, number],
-    metallic: pod.metallicFactor,
-    roughness: pod.roughnessFactor,
-  };
-  const refs: AssetRef[] = [];
-  for (const binding of materialBindings(pod)) {
-    const textureGuid = textureGuidByIndex.get(binding.textureIndex);
-    if (textureGuid === undefined) continue;
-    const textureValue: MaterialTextureValue = {
-      // Runtime material loading interprets texture handles as indexes into
-      // this asset's refs[]; the GUID is carried by the corresponding edge.
-      texture: refs.length as unknown as MaterialTextureValue['texture'],
-      ...(binding.texCoord === undefined ? {} : { coordinates: { set: binding.texCoord } }),
-    };
-    values[binding.slot] = textureValue;
-    refs.push({
-      guid: textureGuid,
-      sourceField: { componentName: '<material>', fieldName: binding.slot },
-    });
-  }
   const mat: MaterialAsset = {
     kind: 'material',
     colorSpace: 'linear',
@@ -411,14 +357,18 @@ function buildMaterialAsset(
         renderState: { tags: { LightMode: 'Forward' }, queue: 2000 },
       },
     ],
-    values,
+    values: {
+      baseColor: pod.baseColorFactor as readonly [number, number, number, number],
+      metallic: pod.metallicFactor,
+      roughness: pod.roughnessFactor,
+    },
   };
   return {
     guid,
     kind: 'material',
     ...(pod.name !== undefined ? { name: pod.name } : {}),
     payload: mat,
-    refs,
+    refs: [],
     artifacts: {},
   };
 }
@@ -434,7 +384,7 @@ interface SceneBuildContext {
   readonly refs: readonly string[];
   /**
    * Skin GUIDs (inline strings) injected into the SceneAsset payload and the
-   * scene envelope's refs[] so the typed scene load pulls each
+   * scene envelope's refs[] so the runtime recursive loadByGuid walk pulls each
    * SkinAsset on the browser-async pack-fetch path. Mirrors gltf-importer:
    * stored as GUID strings (the on-disk round-trip + parseScenePayload's
    * resolveSkinGuids accept both shapes).
@@ -528,26 +478,18 @@ function buildSceneAsset(pod: ScenePod, guid: string, ctx: SceneBuildContext): I
   };
 }
 
-function buildTextureAsset(
-  pod: TexturePod,
-  guid: string,
-  decoded: FbxDecodedTexture,
-): ImportedAsset {
+// M3: TextureAsset requires decoded pixel data — deferred to M4.
+// TexturePod.filePath is preserved for diagnostics during M3.
+function buildTextureNote(_pod: TexturePod, _guid: string): ImportedAsset {
+  // Produce a minimal placeholder; real texture import (decode + upload)
+  // lands with M4 material parsing.
   return {
-    guid,
+    guid: _guid,
     kind: 'texture',
-    ...(pod.name !== undefined ? { name: pod.name } : {}),
-    payload: decoded.texture,
+    ...(_pod.name !== undefined ? { name: _pod.name } : {}),
+    payload: {} as never,
     refs: [],
-    artifacts: {
-      body: {
-        mediaType: decoded.mediaType?.startsWith('image/ktx2')
-          ? decoded.mediaType
-          : 'application/x-forgeax-rgba8',
-        ...(decoded.assetCodec === undefined ? {} : { assetCodec: decoded.assetCodec }),
-        bytes: decoded.bytes,
-      },
-    },
+    artifacts: {},
   };
 }
 
@@ -561,14 +503,9 @@ export function toAssetPack(params: {
   readonly animationClips: readonly AnimationClipPod[];
   readonly subAssets: readonly SubAsset[];
   readonly sourceOverrides?: SourceOverrideMap;
-  readonly decodedTextures?: ReadonlyMap<number, FbxDecodedTexture>;
 }): readonly ImportedAsset[] {
   const assets: ImportedAsset[] = [];
   const guidOf = makeGuidResolver(params.subAssets);
-  const textureGuidByIndex = new Map<number, string>();
-  for (const texture of params.subAssets) {
-    if (texture.kind === 'texture') textureGuidByIndex.set(texture.sourceIndex, texture.guid);
-  }
   const materialGuidByIndex = new Map<number, string>();
   const materialNameByIndex = new Map<number, string>();
   const materialSourceKeyByIndex = new Map<number, string>();
@@ -642,20 +579,12 @@ export function toAssetPack(params: {
     if (!mat) continue;
     const guid = guidOf('material', i);
     // Single-mesh fixtures: any material is consumed by the skinned mesh.
-    if (guid !== undefined) {
-      assets.push(buildMaterialAsset(mat, guid, hasSkin, textureGuidByIndex));
-    }
+    if (guid !== undefined) assets.push(buildMaterialAsset(mat, guid, hasSkin));
   }
 
   for (const tex of params.textures) {
     const guid = guidOf('texture', tex.sourceIndex);
-    if (guid !== undefined) {
-      const decoded = params.decodedTextures?.get(tex.sourceIndex);
-      if (decoded === undefined) {
-        throw new Error(`fbx texture ${tex.sourceIndex} was declared but not decoded`);
-      }
-      assets.push(buildTextureAsset(tex, guid, decoded));
-    }
+    if (guid !== undefined) assets.push(buildTextureNote(tex, guid));
   }
 
   // Scene refs[] ordering (mirror of gltfImporter): only direct scene

package/dist/__tests__/asset-runtime-fixture.d.ts

@@ -1,9 +0,0 @@
-import { type AssetRegistry } from '@forgeax/engine-assets-runtime';
-import { type DdcPack } from '@forgeax/engine-import';
-import type { AssetDecoder, MeshAsset } from '@forgeax/engine-types';
-type FixtureAsset = DdcPack['assets'][number];
-export declare const normalizedMeshAssetDecoder: AssetDecoder<MeshAsset>;
-export declare function installMeshDecoder(assets: AssetRegistry): import("@forgeax/engine-types").AssetDecoderLease;
-export declare function createAssetRuntimeFixture(sourceAssets: readonly FixtureAsset[]): AssetRegistry;
-export {};
-//# sourceMappingURL=asset-runtime-fixture.d.ts.map

package/dist/__tests__/asset-runtime-fixture.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"asset-runtime-fixture.d.ts","sourceRoot":"","sources":["../../src/__tests__/asset-runtime-fixture.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAGnB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EACV,YAAY,EAEZ,SAAS,EAIV,MAAM,uBAAuB,CAAC;AAwB/B,KAAK,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AA4F9C,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,SAAS,CAqB9D,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,qDAEvD;AAwCD,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,SAAS,YAAY,EAAE,GAAG,aAAa,CAsD9F"}