@forgeax/engine-fbx 0.1.4 → 0.1.7

package/src/fbx-importer.ts

@@ -1,13 +1,6 @@
 // fbx-importer.ts — TS wrapper around the ufbx WASM parser.
 
-import {
-  IMPORT_ERROR_HINTS,
-  type ImportContext,
-  type ImportDiagnostic,
-  ImportError,
-  type Importer,
-  type ImportResult,
-} from '@forgeax/engine-types';
+import type { ImportContext, Importer, ImportResult } from '@forgeax/engine-types';
 import { fbxErr } from './errors.js';
 import { initFbxWasm, parseFbx } from './index.js';
 import {
@@ -21,13 +14,11 @@ import { type FbxRawNodes, parseScene } from './parse-scene.js';
 import { type FbxRawSkeletonDoc, parseSkeleton } from './parse-skeleton.js';
 import { type FbxRawSkinDoc, parseSkin } from './parse-skin.js';
 import { parseTextures } from './parse-texture.js';
-import { resolveFbxTexturePath } from './resolve-texture-path.js';
-import { type FbxDecodedTexture, toAssetPack } from './to-asset-pack.js';
+import { toAssetPack } from './to-asset-pack.js';
 
 export interface FbxSourceKeyOutput {
   readonly kind: string;
   readonly name?: string;
-  readonly sourceKey?: string;
 }
 
 export type FbxSourceKeyResult =
@@ -41,8 +32,6 @@ export type FbxSourceKeyResult =
 export function sourceKeyForFbxOutput(output: FbxSourceKeyOutput): string | undefined {
   const kind = output.kind.trim();
   if (kind.length === 0) return undefined;
-  const explicit = output.sourceKey?.trim();
-  if (explicit !== undefined && explicit.length > 0) return explicit;
   const name = output.name?.trim();
   return name === undefined || name.length === 0 ? `fbx:${kind}` : `fbx:${kind}:${name}`;
 }
@@ -64,97 +53,6 @@ export function deriveFbxSourceKeys(outputs: readonly FbxSourceKeyOutput[]): Fbx
   return { ok: true, keys: keys as string[] };
 }
 
-function validationError(
-  ctx: ImportContext,
-  textureIndex: number,
-  code: string,
-  actual: string,
-  hint: string,
-): ImportError {
-  const diagnostic: ImportDiagnostic = {
-    code,
-    severity: 'error',
-    sourcePath: `${ctx.source}#textures[${textureIndex}]`,
-    sourceRange: { start: 0, end: 0, line: 1, column: 1 },
-    rule: 'fbx-external-texture-dependency-closure',
-    expected:
-      'every bound FBX texture resolves to one readable supported image in the authorized scope',
-    actual,
-    hint,
-  };
-  return new ImportError({
-    code: 'source-validation-failed',
-    expected: diagnostic.expected,
-    hint: IMPORT_ERROR_HINTS['source-validation-failed'],
-    detail: { diagnostics: [diagnostic] },
-  });
-}
-
-const FBX_PARSE_DIAGNOSTIC_MAX = 256;
-const FBX_PARSE_EXPECTED = 'a readable FBX source that ufbx can parse';
-
-function boundedErrorMessage(error: unknown): string {
-  const message = error instanceof Error ? error.message : String(error);
-  return message.length <= FBX_PARSE_DIAGNOSTIC_MAX
-    ? message
-    : `${message.slice(0, FBX_PARSE_DIAGNOSTIC_MAX - 3)}...`;
-}
-
-function parseValidationError(ctx: ImportContext, error: unknown): ImportError {
-  const actual = boundedErrorMessage(error);
-  const diagnostic: ImportDiagnostic = {
-    code: 'fbx-source-parse-failed',
-    severity: 'error',
-    sourcePath: ctx.source,
-    sourceRange: { start: 0, end: 0, line: 1, column: 1 },
-    rule: 'fbx-source-parse',
-    expected: FBX_PARSE_EXPECTED,
-    actual,
-    hint: 'repair or re-export the FBX source, then retry the same importer and source path',
-  };
-  return new ImportError({
-    code: 'source-validation-failed',
-    expected: FBX_PARSE_EXPECTED,
-    actual,
-    hint: IMPORT_ERROR_HINTS['source-validation-failed'],
-    detail: { diagnostics: [diagnostic] },
-  });
-}
-
-function importCandidates(ctx: ImportContext): readonly { readonly relativePath: string }[] {
-  const raw = ctx.importSettings.fbxCandidatePaths;
-  if (!Array.isArray(raw)) return [];
-  return raw.flatMap((path): { readonly relativePath: string }[] =>
-    typeof path === 'string' ? [{ relativePath: path }] : [],
-  );
-}
-
-function mimeForTexture(
-  path: string,
-  bytes: Uint8Array,
-): 'image/png' | 'image/jpeg' | 'image/x-tga' {
-  const lower = path.toLowerCase();
-  if (lower.endsWith('.png') || (bytes[0] === 0x89 && bytes[1] === 0x50 && bytes[2] === 0x4e)) {
-    return 'image/png';
-  }
-  if (
-    lower.endsWith('.jpg') ||
-    lower.endsWith('.jpeg') ||
-    (bytes[0] === 0xff && bytes[1] === 0xd8)
-  ) {
-    return 'image/jpeg';
-  }
-  return 'image/x-tga';
-}
-
-function textureColorSpace(slot: string): 'srgb' | 'linear' {
-  return slot === 'normalTexture' ||
-    slot === 'metallicRoughnessTexture' ||
-    slot === 'occlusionTexture'
-    ? 'linear'
-    : 'srgb';
-}
-
 export const fbxImporter: Importer = {
   key: 'fbx',
 
@@ -164,31 +62,17 @@ export const fbxImporter: Importer = {
     // addon / SDK build step (the WASM module self-loads its .wasm).
     const read = await ctx.readSource();
     if (!read.ok) {
-      return {
-        ok: false,
-        error: new ImportError({
-          code: 'source-read-failed',
-          expected: `readable source file at meta.source "${ctx.source}"`,
-          hint: IMPORT_ERROR_HINTS['source-read-failed'],
-          detail: {
-            source: ctx.source,
-            reason: read.error instanceof Error ? read.error.message : String(read.error),
-          },
-        }),
-      };
+      const wrapper = new Error(`fbx-source-unreadable: ${ctx.source}`);
+      (wrapper as { cause?: unknown }).cause = read.error;
+      throw wrapper;
     }
 
     await initFbxWasm();
-    let doc: FbxRawDocument & FbxRawSkeletonDoc & FbxRawSkinDoc & FbxRawAnimDoc;
-    try {
-      const jsonStr = parseFbx(read.value);
-      doc = JSON.parse(jsonStr) as FbxRawDocument &
-        FbxRawSkeletonDoc &
-        FbxRawSkinDoc &
-        FbxRawAnimDoc;
-    } catch (error) {
-      return { ok: false, error: parseValidationError(ctx, error) };
-    }
+    const jsonStr = parseFbx(read.value);
+    const doc = JSON.parse(jsonStr) as FbxRawDocument &
+      FbxRawSkeletonDoc &
+      FbxRawSkinDoc &
+      FbxRawAnimDoc;
 
     // NURBS / patch fail-fast: the bridge emits an error envelope for
     // unsupported surface types (charter P3 explicit failure).
@@ -241,115 +125,6 @@ export const fbxImporter: Importer = {
     }
     const animationClips = parseAnimationClips(doc);
 
-    const textureSlots = new Map<number, string>();
-    for (const material of materials) {
-      for (const binding of material.textureBindings ?? []) {
-        const prior = textureSlots.get(binding.textureIndex);
-        const colorSpace = textureColorSpace(binding.slot);
-        if (prior !== undefined && prior !== colorSpace) {
-          return {
-            ok: false,
-            error: validationError(
-              ctx,
-              binding.textureIndex,
-              'fbx-texture-color-space-conflict',
-              `texture ${binding.textureIndex} is used as both ${prior} and ${colorSpace}`,
-              'split the source texture or author one color-space semantic per FBX texture',
-            ),
-          };
-        }
-        textureSlots.set(binding.textureIndex, colorSpace);
-      }
-    }
-
-    const decodedTextures = new Map<number, FbxDecodedTexture>();
-    for (const texture of textures) {
-      const guidDeclared = ctx.subAssets.some(
-        (subAsset) => subAsset.kind === 'texture' && subAsset.sourceIndex === texture.sourceIndex,
-      );
-      if (!guidDeclared) continue;
-
-      let bytes: Uint8Array;
-      let sourcePath = texture.filePath;
-      if (texture.embeddedBytes !== undefined && texture.embeddedBytes.byteLength > 0) {
-        bytes = texture.embeddedBytes;
-        sourcePath = texture.relativeFilePath ?? texture.filePath;
-      } else {
-        if (texture.type !== undefined && texture.type !== 'file') {
-          return {
-            ok: false,
-            error: validationError(
-              ctx,
-              texture.sourceIndex,
-              'fbx-material-texture-slot-unsupported',
-              `texture type ${texture.type} is not a single file texture`,
-              'flatten layered/procedural FBX textures to a file texture before importing',
-            ),
-          };
-        }
-        const resolution = resolveFbxTexturePath(
-          ctx.source,
-          {
-            ...(texture.relativeFilePath === undefined
-              ? {}
-              : { declaredRelativePath: texture.relativeFilePath }),
-            ...(texture.filePath.length === 0 ? {} : { declaredFilename: texture.filePath }),
-            ...(texture.absoluteFilePath === undefined
-              ? {}
-              : { declaredAbsolutePath: texture.absoluteFilePath }),
-          },
-          importCandidates(ctx),
-        );
-        if (!resolution.ok) {
-          return {
-            ok: false,
-            error: validationError(
-              ctx,
-              texture.sourceIndex,
-              resolution.code,
-              `${resolution.requestedPath}; candidates=${resolution.candidates.join(', ') || '<none>'}`,
-              resolution.code === 'fbx-external-texture-ambiguous'
-                ? 'select a folder whose dependency path is unique; first-match guessing is disabled'
-                : 'select the containing folder so the FBX and its referenced texture are in the authorized candidate scope',
-            ),
-          };
-        }
-        const read = await ctx.readSibling(resolution.readUri);
-        if (!read.ok) return read;
-        bytes = read.value;
-        sourcePath = resolution.relativePath;
-      }
-
-      const slot =
-        [...textureSlots.entries()].find(([index]) => index === texture.sourceIndex)?.[1] ?? 'srgb';
-      const decoded = await ctx.decodeImage(bytes, mimeForTexture(sourcePath, bytes), {
-        ...ctx.importSettings,
-        colorSpace: slot,
-      });
-      if (!decoded.ok) {
-        const reason =
-          decoded.error.code === 'image-decode-failed'
-            ? decoded.error.detail.reason
-            : `${decoded.error.code}: ${JSON.stringify(decoded.error.detail)}`;
-        return {
-          ok: false,
-          error: validationError(
-            ctx,
-            texture.sourceIndex,
-            'fbx-external-texture-decode-failed',
-            `${sourcePath}: ${reason}`,
-            'repair or re-export the referenced image, then retry the FBX import',
-          ),
-        };
-      }
-      decodedTextures.set(texture.sourceIndex, {
-        texture: decoded.value.texture,
-        bytes: decoded.value.bytes,
-        ...(decoded.value.mediaType === undefined ? {} : { mediaType: decoded.value.mediaType }),
-        ...(decoded.value.assetCodec === undefined ? {} : { assetCodec: decoded.value.assetCodec }),
-      });
-    }
-
     return {
       ok: true,
       value: {
@@ -362,7 +137,6 @@ export const fbxImporter: Importer = {
           skin,
           animationClips,
           subAssets: ctx.subAssets,
-          decodedTextures,
           ...(ctx.sourceOverrides === undefined ? {} : { sourceOverrides: ctx.sourceOverrides }),
         }),
         sourceDependencies: [],

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,
   }));
 }