@forgeax/engine-import 0.1.19 → 0.1.21

package/dist/scriptable-pack-output-producers.d.ts

@@ -2,6 +2,7 @@ import type { ScriptablePackSceneComponent } from '@forgeax/engine-pack/source';
 import { type AssetOutputProducer, AssetOutputProducerRegistry } from './scriptable-pack.js';
 export declare const materialAssetOutputProducer: AssetOutputProducer;
 export declare const meshAssetOutputProducer: AssetOutputProducer;
+export declare const textureAssetOutputProducer: AssetOutputProducer;
 export declare function createSceneAssetOutputProducer(sceneComponents?: readonly ScriptablePackSceneComponent[]): AssetOutputProducer;
 export declare function createStandardAssetOutputProducerRegistry(sceneComponents?: readonly ScriptablePackSceneComponent[]): AssetOutputProducerRegistry;
 //# sourceMappingURL=scriptable-pack-output-producers.d.ts.map

package/dist/scriptable-pack-output-producers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scriptable-pack-output-producers.d.ts","sourceRoot":"","sources":["../src/scriptable-pack-output-producers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AA4BhF,OAAO,EAEL,KAAK,mBAAmB,EACxB,2BAA2B,EAE5B,MAAM,sBAAsB,CAAC;AA4X9B,eAAO,MAAM,2BAA2B,qBAIvC,CAAC;AACF,eAAO,MAAM,uBAAuB,qBAA2D,CAAC;AAEhG,wBAAgB,8BAA8B,CAC5C,eAAe,GAAE,SAAS,4BAA4B,EAAO,GAC5D,mBAAmB,CAKrB;AAED,wBAAgB,yCAAyC,CACvD,eAAe,GAAE,SAAS,4BAA4B,EAAO,GAC5D,2BAA2B,CAuB7B"}
+{"version":3,"file":"scriptable-pack-output-producers.d.ts","sourceRoot":"","sources":["../src/scriptable-pack-output-producers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAkChF,OAAO,EAEL,KAAK,mBAAmB,EACxB,2BAA2B,EAE5B,MAAM,sBAAsB,CAAC;AAyZ9B,eAAO,MAAM,2BAA2B,qBAIvC,CAAC;AACF,eAAO,MAAM,uBAAuB,qBAA2D,CAAC;AAChG,eAAO,MAAM,0BAA0B,qBAItC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,eAAe,GAAE,SAAS,4BAA4B,EAAO,GAC5D,mBAAmB,CAKrB;AAED,wBAAgB,yCAAyC,CACvD,eAAe,GAAE,SAAS,4BAA4B,EAAO,GAC5D,2BAA2B,CAuB7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgeax/engine-import",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "private": false,
   "type": "module",
   "license": "Apache-2.0",
@@ -27,12 +27,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@forgeax/engine-ddc": "0.1.19",
-    "@forgeax/engine-ecs": "0.1.19",
-    "@forgeax/engine-geometry": "0.1.19",
-    "@forgeax/engine-pack": "0.1.19",
-    "@forgeax/engine-scene": "0.1.19",
-    "@forgeax/engine-types": "0.1.19",
+    "@forgeax/engine-ddc": "0.1.21",
+    "@forgeax/engine-ecs": "0.1.21",
+    "@forgeax/engine-geometry": "0.1.21",
+    "@forgeax/engine-pack": "0.1.21",
+    "@forgeax/engine-scene": "0.1.21",
+    "@forgeax/engine-types": "0.1.21",
     "@noble/hashes": "^2.2.0"
   },
   "devDependencies": {

package/src/__tests__/scriptable-pack-product.contract.test.ts

@@ -21,12 +21,11 @@ describe('ScriptablePack terminal product contract', () => {
           ok({
             hero: {
               kind: 'texture',
-              width: 1,
-              height: 1,
-              format: 'rgba8unorm',
-              data: new Uint8Array(),
+              shape: { viewDimension: '2d', extent: { width: 1, height: 1 } },
+              format: 'rgba8unorm-srgb',
+              data: new Uint8Array(4),
               colorSpace: 'srgb',
-              mipmap: false,
+              mips: { kind: 'none' },
             },
           }),
       },

package/src/__tests__/scriptable-pack-production-producers.unit.test.ts

@@ -89,12 +89,11 @@ const matrixAssets = [
   { kind: 'scene', entities: [] } satisfies SceneAsset,
   {
     kind: 'texture',
-    width: 1,
-    height: 1,
-    format: 'rgba8unorm',
+    shape: { viewDimension: '2d', extent: { width: 1, height: 1 } },
+    format: 'rgba8unorm-srgb',
     data: new Uint8Array([255, 255, 255, 255]),
     colorSpace: 'srgb',
-    mipmap: false,
+    mips: { kind: 'none' },
   } satisfies TextureAsset,
   {
     kind: 'equirect',
@@ -119,7 +118,11 @@ const matrixAssets = [
       atlasHeight: 1,
     },
   } satisfies FontAsset,
-  { kind: 'render-pipeline', pipelineId: 'forgeax::urp' } satisfies RenderPipelineAsset,
+  {
+    kind: 'render-pipeline',
+    pipelineId: 'forgeax::standard',
+    renderPath: 'forward',
+  } satisfies RenderPipelineAsset,
   {
     kind: 'tileset',
     atlases: [AssetGuid.format(ATLAS_GUID)],
@@ -179,7 +182,7 @@ describe('standard ScriptablePack output producers', () => {
       scene: 'scene-pack/3',
       skeleton: 'ordinary-pod/1',
       skin: 'ordinary-pod/1',
-      texture: 'ordinary-pod/1',
+      texture: 'texture-pack/1',
       tileset: 'ordinary-pod/1',
       video: 'ordinary-pod/1',
     });

package/src/__tests__/scriptable-pack-texture.unit.test.ts

@@ -0,0 +1,96 @@
+import { AssetGuid } from '@forgeax/engine-pack/guid';
+import type { AssetGuid as AssetGuidType, TextureAsset } from '@forgeax/engine-types';
+import { describe, expect, it } from 'vitest';
+import { textureAssetOutputProducer } from '../scriptable-pack-output-producers.js';
+
+const GUID = '019ffa97-3000-7000-8000-000000000201';
+const SOURCE_KEY = 'density/volume';
+
+function guid(value: string): AssetGuidType {
+  const parsed = AssetGuid.parse(value);
+  if (!parsed.ok) throw parsed.error;
+  return parsed.value;
+}
+
+function texture(shape: TextureAsset['shape'], data: Uint8Array): TextureAsset {
+  return {
+    kind: 'texture',
+    shape,
+    format: 'r8unorm',
+    colorSpace: 'linear',
+    mips: { kind: 'none' },
+    data,
+  };
+}
+
+describe('ScriptablePack texture output producer', () => {
+  it.each([
+    {
+      label: 'array',
+      shape: { viewDimension: '2d-array' as const, extent: { width: 8, height: 4, layers: 3 } },
+      bytes: 8 * 4 * 3,
+    },
+    {
+      label: 'volume',
+      shape: { viewDimension: '3d' as const, extent: { width: 4, height: 4, depth: 4 } },
+      bytes: 4 * 4 * 4,
+    },
+  ])('matches source producer facts for a $label logical asset', async ({ shape, bytes }) => {
+    const payload = texture(shape, new Uint8Array(bytes).fill(23));
+    const result = await textureAssetOutputProducer.produce({
+      guid: GUID,
+      sourceKey: SOURCE_KEY,
+      asset: payload,
+    });
+
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect(result.value.payload).toEqual(payload);
+    expect(result.value.artifacts.body).toMatchObject({
+      mediaType: 'application/x-forgeax-r8',
+      assetCodec: { name: 'r8unorm', version: '1' },
+    });
+    expect(result.value.artifacts.body?.bytes).toEqual(payload.data);
+    expect(result.value.refs).toEqual([]);
+  });
+
+  it('keeps one publication GUID and rejects slice or layer identity fabrication', async () => {
+    const payload = texture(
+      { viewDimension: '3d', extent: { width: 2, height: 2, depth: 2 } },
+      new Uint8Array(8),
+    );
+    const result = await textureAssetOutputProducer.produce({
+      guid: AssetGuid.format(guid(GUID)),
+      sourceKey: SOURCE_KEY,
+      asset: payload,
+    });
+
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect((result.value.payload as TextureAsset).shape).toEqual(payload.shape);
+    expect(result.value.artifacts.body?.bytes.byteLength).toBe(8);
+    expect(result.value.refs).toEqual([]);
+    expect(result.value).not.toHaveProperty('sliceGuids');
+    expect(result.value).not.toHaveProperty('layerGuids');
+  });
+
+  it('fails fast when the payload data is not a canonical byte stream', async () => {
+    const payload = texture(
+      { viewDimension: '3d', extent: { width: 2, height: 2, depth: 2 } },
+      new Uint8Array(7),
+    );
+    const result = await textureAssetOutputProducer.produce({
+      guid: GUID,
+      sourceKey: SOURCE_KEY,
+      asset: payload,
+    });
+
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error.code).toBe('import-internal-error');
+      expect(result.error.detail).toMatchObject({
+        reason: expect.stringContaining('texture data is not canonical'),
+      });
+    }
+  });
+});

package/src/index.ts

@@ -126,6 +126,7 @@ export {
   createStandardAssetOutputProducerRegistry,
   materialAssetOutputProducer,
   meshAssetOutputProducer,
+  textureAssetOutputProducer,
 } from './scriptable-pack-output-producers.js';
 export {
   createScriptablePackStagedAssetSnapshotSource,

package/src/scriptable-pack-output-producers.ts

@@ -23,7 +23,13 @@ import type {
   TilesetAsset,
   VideoAsset,
 } from '@forgeax/engine-types';
-import { err, ImportError, MATERIAL_TEXTURE_SLOTS, ok } from '@forgeax/engine-types';
+import {
+  deriveTextureLayout,
+  err,
+  ImportError,
+  MATERIAL_TEXTURE_SLOTS,
+  ok,
+} from '@forgeax/engine-types';
 import { sha256 } from '@noble/hashes/sha2.js';
 import { bytesToHex } from '@noble/hashes/utils.js';
 import { packMeshBinV4 } from './mesh-bin.js';
@@ -105,7 +111,9 @@ function materialProduct(input: AssetOutputInput): AssetOutputProduct {
       ? new Set<string>(MATERIAL_TEXTURE_SLOTS)
       : new Set(
           material.parameters
-            .filter((parameter) => parameter.type === 'texture')
+            .filter(
+              (parameter) => parameter.type === 'texture' || parameter.type === 'texture_cube',
+            )
             .map((parameter) => parameter.name),
         );
 
@@ -246,23 +254,50 @@ function bytes(value: Uint8Array | Uint8ClampedArray): Uint8Array {
   return Uint8Array.from(value);
 }
 
+function textureProduct(input: AssetOutputInput): AssetOutputProduct {
+  if (input.asset.kind !== 'texture') throw new TypeError('expected TextureAsset');
+  const texture = input.asset as TextureAsset;
+  const layout = deriveTextureLayout({
+    shape: texture.shape,
+    format: texture.format,
+    mips: texture.mips,
+    actualByteLength: texture.data.byteLength,
+    order: 'mip-major,image-major,row-major',
+  });
+  if (!layout.ok) {
+    const expectedBytes =
+      layout.error.code === 'texture-packing-invalid'
+        ? layout.error.detail.expectedBytes
+        : texture.data.byteLength;
+    const actualBytes =
+      layout.error.code === 'texture-packing-invalid'
+        ? layout.error.detail.actualBytes
+        : texture.data.byteLength;
+    throw new TypeError(
+      `texture data is not canonical: expected ${expectedBytes} bytes, got ${actualBytes}`,
+    );
+  }
+  return {
+    payload: texture,
+    refs: [],
+    artifacts: {
+      body: {
+        mediaType:
+          texture.format === 'r8unorm'
+            ? 'application/x-forgeax-r8'
+            : `application/x-forgeax-${texture.format}`,
+        assetCodec: { name: texture.format, version: '1' },
+        bytes: bytes(texture.data),
+      },
+    },
+  };
+}
+
 function ordinaryPodProduct(input: AssetOutputInput): AssetOutputProduct {
   const asset = input.asset;
   switch (asset.kind) {
-    case 'texture': {
-      const texture = asset as TextureAsset;
-      return {
-        payload: texture,
-        refs: [],
-        artifacts: {
-          body: {
-            mediaType: 'image/raw',
-            assetCodec: { name: 'raw-image', version: '1' },
-            bytes: bytes(texture.data),
-          },
-        },
-      };
-    }
+    case 'texture':
+      return textureProduct(input);
     case 'equirect': {
       const equirect = asset as EquirectAsset;
       return {
@@ -418,6 +453,11 @@ export const materialAssetOutputProducer = createSafeProducer(
   materialProduct,
 );
 export const meshAssetOutputProducer = createSafeProducer('mesh', 'mesh-binary/4', meshProduct);
+export const textureAssetOutputProducer = createSafeProducer(
+  'texture',
+  'texture-pack/1',
+  textureProduct,
+);
 
 export function createSceneAssetOutputProducer(
   sceneComponents: readonly ScriptablePackSceneComponent[] = [],
@@ -434,9 +474,9 @@ export function createStandardAssetOutputProducerRegistry(
   const registry = new AssetOutputProducerRegistry();
   registry.register(materialAssetOutputProducer);
   registry.register(meshAssetOutputProducer);
+  registry.register(textureAssetOutputProducer);
   registry.register(createSceneAssetOutputProducer(sceneComponents));
   for (const kind of [
-    'texture',
     'equirect',
     'sampler',
     'font',