@needle-tools/gltf-build-pipeline 2.14.0 → 2.15.0-next.9714120

package/dist/cache/cache.js

@@ -5,9 +5,9 @@ import path from 'path';
 import { getVersion } from "../utils/version.js";
 // import * as CHECKDISCSPACE from 'check-disk-space'
 import xxhash from "xxhash-wasm";
-let hasher = null;
+let xxHashModule = null;
 xxhash().then(module => {
-    hasher = module.create32();
+    xxHashModule = module;
 });
 /**
  * Get the available space on the cache directory in bytes.
@@ -304,9 +304,9 @@ function hashObject(obj, depth = 0) {
     }
 }
 function hashBuffer(buffer, offset, length) {
-    if (hasher) {
+    if (xxHashModule) {
         const view = new Uint8Array(buffer, offset, length);
-        return hasher.update(view).digest();
+        return xxHashModule.h32Raw(view);
     }
     let hash = 0;
     const view = new Uint8Array(buffer, offset, length);

package/dist/scripts/pack-gltf.js

@@ -128,7 +128,8 @@ export async function packGLTF(inputFile, outputFile, options) {
         return true;
     }
     catch (err) {
-        logger.error(`Packing of "${path.basename(inputFile)}" using version ${getVersion()} failed with error:\n${err.message}`);
+        const shortedStackTrace = err instanceof Error && err.stack ? err.stack.split('\n').slice(0, 2).join('\n') : '';
+        logger.error(`Packing of "${path.basename(inputFile)}" using version ${getVersion()} failed with error:\n${err.message}\n${shortedStackTrace}`);
         if (debug)
             throw err;
         return false;

package/dist/transforms/needle_progressive.js

@@ -151,6 +151,7 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
             return Promise.resolve();
         }
         let index = 0;
+        const textureHashCache = new Map();
         for (const texture of doc.getRoot().listTextures()) {
             const textureIndex = index++;
             const name = texture.getName();
@@ -177,8 +178,10 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
                     continue;
                 }
                 else {
+                    if (!textureHashCache.has(texture))
+                        textureHashCache.set(texture, getHash(texture));
                     settings = {
-                        guid: generateGuid(filename + "_texture_" + index.toString()),
+                        guid: generateGuid(textureHashCache.get(texture)),
                         maxSize: _options.size[0],
                     };
                     logger.debug(`[${NAME}] No settings found for texture[${index}] - will use default settings (maxSize: ${settings.maxSize}, guid: ${settings.guid})`);
@@ -213,7 +216,13 @@ export function make_progressive_textures(filePath, _options = TEXTURE_RESIZE_DE
                 logger.debug(`[${NAME}] Skipping, texture[${textureIndex}] is already smaller than the requested size: ${currentSize}px <= ${settings.maxSize}px`);
                 continue;
             }
-            const textureGuid = settings.guid?.length ? settings.guid : generateGuid(filename + "_texture_" + index.toString());
+            if (!settings.guid?.length) {
+                if (!textureHashCache.has(texture))
+                    textureHashCache.set(texture, getHash(texture));
+                const hash = textureHashCache.get(texture);
+                settings.guid = generateGuid(hash);
+            }
+            const textureGuid = settings.guid;
             /** This is the size of the texture that is embedded in the glTF. No LOD should be smaller than this */
             const maxSize = settings.maxSize;
             const LOD_LEVEL = new Array();
@@ -524,7 +533,7 @@ async function resizeTexture(options, texture, logger, uri, slots) {
     }
     dstWidth = Math.floor(dstWidth);
     dstHeight = Math.floor(dstHeight);
-    logger.info(`→ Resize texture (${uri || texture.getName() || slots.join(", ")}) from ${srcWidth}x${srcHeight} to ${dstWidth}x${dstHeight}px`);
+    logger.info(`→ Resize texture (${uri || texture.getName() || slots?.join(", ")}) from ${srcWidth}x${srcHeight} to ${dstWidth}x${dstHeight}px`);
     // https://sharp.pixelplumbing.com/api-resize
     const buffer = await sharp(texture.getImage())
         .resize(dstWidth, dstHeight, {

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

@@ -1 +1 @@
-export declare const version = "2.14.0";
+export declare const version = "2.15.0-next.9714120";

package/dist/utils/version.gen.js

@@ -1 +1 @@
-export const version = "2.14.0";
+export const version = "2.15.0-next.9714120";

package/package.json

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