@needle-tools/gltf-build-pipeline 2.15.8 → 2.15.9-next.53d13f4

package/dist/extensions/NEEDLE_lightmaps/index.js

@@ -3,6 +3,8 @@ import { existsSync, readFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { isLightmap } from '../../utils/texture.js';
 import { getExtensionInputFile } from '../index.js';
+import { findSource, getTexture } from '../utils.js';
+import { testAssert } from '../../utils/test-assert.js';
 const EXTENSION_NAME = 'NEEDLE_lightmaps';
 /**
  * Opaque-like ExtensionProperty that holds NEEDLE_lightmaps data on the Root.
@@ -66,7 +68,8 @@ export class NEEDLE_lightmaps_ext extends Extension {
                 continue;
             const exrPath = inputDir ? join(inputDir, entry.pointer) : '';
             if (!exrPath || !existsSync(exrPath)) {
-                this.document.getLogger().warn(`NEEDLE_lightmaps: External EXR not found: ${exrPath || entry.pointer}`);
+                this.document.getLogger().error(`NEEDLE_lightmaps: External EXR not found: ${exrPath || entry.pointer}`);
+                testAssert(false, `NEEDLE_lightmaps: External EXR not found: ${exrPath || entry.pointer}`);
                 continue;
             }
             // Read EXR bytes and inject into JSON so the core reader creates a Texture
@@ -113,12 +116,7 @@ export class NEEDLE_lightmaps_ext extends Extension {
                 const texDef = textureDefs[texIndex];
                 if (texDef) {
                     inputTextureDef = texDef;
-                    const imageIndex = texDef.source
-                        ?? texDef.extensions?.['EXT_texture_exr']?.source
-                        ?? texDef.extensions?.['KHR_texture_basisu']?.source;
-                    if (imageIndex !== undefined) {
-                        texture = context.textures[imageIndex] ?? null;
-                    }
+                    texture = getTexture(context, texDef) ?? null;
                 }
             }
             else if (entry.pointer.match(/\.exr$/i)) {
@@ -126,7 +124,19 @@ export class NEEDLE_lightmaps_ext extends Extension {
                 const imageIndex = this.injectedImageIndices.get(entry.pointer);
                 if (imageIndex !== undefined) {
                     texture = context.textures[imageIndex] ?? null;
-                    inputTextureDef = textureDefs.find(t => t.source === imageIndex);
+                    inputTextureDef = textureDefs.find(t => findSource(t) === imageIndex);
+                }
+            }
+            else if (!entry.pointer.startsWith('/')) {
+                // Already-processed external pointer (e.g. "sunrise.pmrem.ktx2")
+                // Find the texture by matching the URI in the existing images
+                const images = json.images ?? [];
+                for (let i = 0; i < images.length; i++) {
+                    if (images[i].uri === entry.pointer) {
+                        texture = context.textures[i] ?? null;
+                        inputTextureDef = textureDefs.find(t => findSource(t) === i);
+                        break;
+                    }
                 }
             }
             if (texture) {
@@ -141,7 +151,8 @@ export class NEEDLE_lightmaps_ext extends Extension {
                 }
             }
             else {
-                logger.warn(`NEEDLE_lightmaps: Could not resolve texture for pointer "${entry.pointer}"`);
+                logger.error(`NEEDLE_lightmaps: Could not resolve texture for pointer "${entry.pointer}"`);
+                testAssert(false, `NEEDLE_lightmaps: Could not resolve texture for pointer "${entry.pointer}"`);
             }
         }
         // Lightmap workaround: prevent compression on lightmap textures (non-EXR)
@@ -217,11 +228,7 @@ export class NEEDLE_lightmaps_ext extends Extension {
         const textures = context.jsonDoc.json.textures = context.jsonDoc.json.textures || [];
         // Try to find an existing texture def pointing to the same image
         for (let i = 0; i < textures.length; i++) {
-            const texDef = textures[i];
-            const source = texDef.source
-                ?? texDef.extensions?.['KHR_texture_basisu']?.source
-                ?? texDef.extensions?.['NEEDLE_pmrem']?.source;
-            if (source === imageIndex) {
+            if (findSource(textures[i]) === imageIndex) {
                 return i;
             }
         }

package/dist/extensions/NEEDLE_opaque/NEEDLE_opaque.js

@@ -1,5 +1,5 @@
 import { Extension, ExtensionProperty, PropertyType, Node, TextureChannel } from '@gltf-transform/core';
-import { getTexture, tryGetInArray, writeExtension } from '../utils.js';
+import { findSource, getTexture, tryGetInArray, writeExtension } from '../utils.js';
 import { isLightmap } from '../../utils/texture.js';
 import { NEEDLE_progressive_texture_settings } from '../NEEDLE_progressive_texture_settings/index.js';
 import { testAssert } from '../../utils/test-assert.js';
@@ -655,7 +655,8 @@ class JsonPointerHandler {
                             this.externalExrPointers.push({ obj, key, texture });
                         }
                         else if (exrPath) {
-                            console.warn(`WARN: External EXR not found: ${exrPath}`);
+                            this.document.getLogger().error(`NEEDLE_opaque: External EXR not found: ${exrPath}`);
+                            testAssert(false, `NEEDLE_opaque: External EXR not found: ${exrPath}`);
                         }
                     }
                     if (value.startsWith("/materials/")) {
@@ -999,22 +1000,6 @@ class TextureIndexResolver extends PointerResolver {
         return json.samplers.length - 1;
     }
 }
-function findSource(texDef) {
-    if (texDef.source !== undefined) {
-        return texDef.source;
-    }
-    if (texDef.extensions) {
-        const keys = Object.keys(texDef.extensions);
-        for (let i = 0; i < keys.length; i++) {
-            const key = keys[i];
-            const ext = texDef.extensions[key];
-            if (ext["source"] !== undefined) {
-                return ext["source"];
-            }
-        }
-    }
-    return undefined;
-}
 class MaterialIndexResolver extends PointerResolver {
     init(context) {
     }

package/dist/extensions/utils.d.ts

@@ -3,4 +3,7 @@ import { GLTF } from '@gltf-transform/core';
 export declare function tryGetInArray<T>(arr: Array<T> | undefined | null, index: number | undefined): T | null;
 export declare function writeExtension(prop: GLTF.IProperty | null, name: string, ext: any): void;
 export declare function getTexture(context: ReaderContext, tex: GLTF.ITexture): Texture;
+/** Resolve the image source index from a texture definition, checking `texDef.source`
+ *  and then iterating all extension keys for a `.source` property. */
+export declare function findSource(texDef: GLTF.ITexture): number | undefined;
 export declare function getTextureDefinition(context: WriterContext | ReaderContext, tex: Texture): GLTF.ITexture | null;

package/dist/extensions/utils.js

@@ -21,19 +21,26 @@ export function writeExtension(prop, name, ext) {
 export function getTexture(context, tex) {
     if (!context.jsonDoc.json.images)
         return null;
-    if (tex.source !== undefined) {
-        return context.textures[tex.source];
+    const source = findSource(tex);
+    if (source !== undefined) {
+        return context.textures[source];
     }
-    else {
-        for (const key of Object.keys(tex.extensions)) {
-            const ext = tex.extensions[key];
-            if (ext && typeof ext["source"] === "number") {
-                return context.textures[ext["source"]];
-            }
+    console.log("Could not find texture", tex);
+    return null;
+}
+/** Resolve the image source index from a texture definition, checking `texDef.source`
+ *  and then iterating all extension keys for a `.source` property. */
+export function findSource(texDef) {
+    if (texDef.source !== undefined)
+        return texDef.source;
+    if (texDef.extensions) {
+        for (const key of Object.keys(texDef.extensions)) {
+            const ext = texDef.extensions[key];
+            if (ext && ext["source"] !== undefined)
+                return ext["source"];
         }
     }
-    console.log("Could not fnd texture", tex);
-    return null;
+    return undefined;
 }
 export function getTextureDefinition(context, tex) {
     const textureDefinitions = context.jsonDoc.json.textures;

package/dist/transforms/needle_pmrem.js

@@ -146,7 +146,7 @@ export class NeedlePmremContext {
         const dstSizestr = ktx2Bytes.length < 100 * 1024
             ? `${(ktx2Bytes.length / 1024).toFixed(0)} KB`
             : `${(ktx2Bytes.length / (1024 * 1024)).toFixed(2)} MB`;
-        this.logger.info(`pmrem:texture[${index}] ${name}: ${sizeStr} EXR → ${dstSizestr} KTX2`);
+        this.logger.info(`pmrem:texture[${index}] ${name}: ${sizeStr} EXR → ${dstSizestr} KTX2 (${texture.getURI() || texture.getName() || name})`);
         this.convertedTextures.push(texture);
         this.processed++;
         return true;
@@ -172,16 +172,24 @@ export class NeedlePmremContext {
                 return cached;
             }
         }
-        // 1. Run PMREM on the EXR bytes
-        this.logger.info(`pmrem:texture[${index}] ${name}: Running PMREM...`);
+        // 1. Run PMREM on the EXR bytes (synchronous WASM — may take a while)
+        const inputSize = exrBytes.byteLength < 100 * 1024
+            ? `${(exrBytes.byteLength / 1024).toFixed(0)} KB`
+            : `${(exrBytes.byteLength / (1024 * 1024)).toFixed(2)} MB`;
+        this.logger.info(`pmrem:texture[${index}] ${name}: Running PMREM WASM (${inputSize} EXR) — this may take a while...`);
+        // Yield to allow log to flush before blocking WASM call
+        await new Promise(r => setTimeout(r, 0));
+        const t0 = Date.now();
         const pmremExrBytes = this.wasmModule.pmrem_exr(exrBytes);
+        const elapsed = ((Date.now() - t0) / 1000).toFixed(1);
+        this.logger.info(`pmrem:texture[${index}] ${name}: PMREM done in ${elapsed}s (${(pmremExrBytes.byteLength / 1024 / 1024).toFixed(1)} MB)`);
         // 2. Write PMREM EXR to temp file
         const id = uuid();
         const tempExr = join(this.tmpDir, `${id}.pmrem.exr`);
         const tempKtx2 = join(this.tmpDir, `${id}.ktx2`);
         writeFileSync(tempExr, Buffer.from(pmremExrBytes));
         // 3. Encode to KTX2 HDR via basisu
-        this.logger.debug(`pmrem:texture[${index}] ${name}: Encoding KTX2 HDR...`);
+        this.logger.info(`pmrem:texture[${index}] ${name}: Encoding KTX2 HDR...`);
         const variant = 'hdr4x4'; // 6x6 needs an update in Needle
         await encodeKTX2WithBasisu(this.basisuExe, tempExr, tempKtx2, variant, true);
         if (!existsSync(tempKtx2)) {

package/dist/utils/version.gen.d.ts

@@ -1 +1 @@
-export declare const version = "2.15.8";
+export declare const version = "2.15.9-next.53d13f4";

package/dist/utils/version.gen.js

@@ -1 +1 @@
-export const version = "2.15.8";
+export const version = "2.15.9-next.53d13f4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@needle-tools/gltf-build-pipeline",
-  "version": "2.15.8",
+  "version": "2.15.9-next.53d13f4",
   "description": "Pipeline and tools for optimizing gltf files using gltf-transform and compression settings within glTF extensions",
   "main": "dist/index.js",
   "type": "module",