@jgengine/assets 0.11.0 → 0.12.0

package/dist/download.js

@@ -29,6 +29,37 @@ export function boundedExtractFilter(matches) {
         return true;
     };
 }
+const PACK_IMAGE_EXT = /\.(png|jpe?g|webp)$/i;
+/** Flatten a glTF image URI ("../Textures/color%20map.png") to its decoded basename. */
+function imageUriBasename(uri) {
+    const decoded = (() => {
+        try {
+            return decodeURIComponent(uri);
+        }
+        catch {
+            return uri;
+        }
+    })();
+    const clean = decoded.replace(/\\/g, "/");
+    return clean.split("/").pop() ?? clean;
+}
+/**
+ * Rewrite external image URIs to flat basenames so a model always finds its
+ * texture beside itself in the pack dir, no matter how the source archive
+ * nested it ("Textures/x.png", "../texture/x.png", "x.png" all become "x.png").
+ * Returns the basenames of every external image the model references.
+ */
+function normalizeGltfImageUris(json) {
+    const referenced = [];
+    for (const image of json.images ?? []) {
+        if (image.uri === undefined || image.uri.startsWith("data:"))
+            continue;
+        const base = imageUriBasename(image.uri);
+        image.uri = base;
+        referenced.push(base);
+    }
+    return referenced;
+}
 function resolveRelative(path, pageUrl) {
     try {
         return new URL(path, pageUrl).toString();
@@ -194,23 +225,7 @@ function dedupeByBasename(archive, pattern) {
     }
     return Array.from(byName, ([file, bytes]) => ({ file, bytes })).sort((a, b) => a.file.localeCompare(b.file));
 }
-/**
- * Pack a `.gltf` + optional external `.bin` into a single `.glb` so reindex /
- * the shell only ever deal in one-file models. Strips buffer `uri` fields so
- * the binary chunk is self-contained. External image URIs stay as-is (loaders
- * resolve relative to the catalog URL only for GLB-embedded images).
- * @internal
- */
-export function packGltfToGlb(gltfBytes, binBytes) {
-    const json = JSON.parse(new TextDecoder().decode(gltfBytes));
-    if (Array.isArray(json.buffers)) {
-        for (const buffer of json.buffers) {
-            delete buffer.uri;
-            if (binBytes !== undefined)
-                buffer.byteLength = binBytes.byteLength;
-        }
-    }
-    const jsonText = JSON.stringify(json);
+function buildGlb(jsonText, binBytes) {
     const jsonPad = (4 - (jsonText.length % 4)) % 4;
     const jsonChunk = new Uint8Array(jsonText.length + jsonPad);
     new TextEncoder().encodeInto(jsonText, jsonChunk);
@@ -239,22 +254,109 @@ export function packGltfToGlb(gltfBytes, binBytes) {
     }
     return out;
 }
+/** Parse a `.glb` container into its JSON document and optional BIN chunk. Returns null for non-glb bytes. */
+function parseGlb(bytes) {
+    if (bytes.byteLength < 20)
+        return null;
+    const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    if (view.getUint32(0, true) !== 0x46546c67)
+        return null;
+    let offset = 12;
+    let json;
+    let bin;
+    while (offset + 8 <= bytes.byteLength) {
+        const length = view.getUint32(offset, true);
+        const kind = view.getUint32(offset + 4, true);
+        const body = bytes.subarray(offset + 8, offset + 8 + length);
+        if (kind === 0x4e4f534a) {
+            try {
+                json = JSON.parse(new TextDecoder().decode(body));
+            }
+            catch {
+                return null;
+            }
+        }
+        else if (kind === 0x004e4942) {
+            bin = body;
+        }
+        offset += 8 + length;
+    }
+    if (json === undefined)
+        return null;
+    return bin === undefined ? { json } : { json, bin };
+}
+/**
+ * External image basenames a packed `.glb` still references (its textures must
+ * sit beside it in the pack dir). Empty for self-contained models.
+ * @internal
+ */
+export function externalGlbImages(bytes) {
+    const chunks = parseGlb(bytes);
+    if (chunks === null)
+        return [];
+    return (chunks.json.images ?? [])
+        .map((image) => image.uri)
+        .filter((uri) => uri !== undefined && !uri.startsWith("data:"))
+        .map((uri) => imageUriBasename(uri));
+}
+/** Rewrite a native `.glb`'s external image URIs to flat basenames; returns the input untouched when nothing changes. */
+function normalizeGlbImageUris(bytes) {
+    const chunks = parseGlb(bytes);
+    if (chunks === null)
+        return { bytes, referenced: [] };
+    const before = JSON.stringify(chunks.json.images ?? []);
+    const referenced = normalizeGltfImageUris(chunks.json);
+    if (referenced.length === 0 || JSON.stringify(chunks.json.images ?? []) === before) {
+        return { bytes, referenced };
+    }
+    return { bytes: buildGlb(JSON.stringify(chunks.json), chunks.bin), referenced };
+}
 /**
- * Pull every GLB out of an archive. Also converts co-located `.gltf` + `.bin`
- * pairs (Quaternius Standard packs on OpenGameArt) into `.glb` so the catalog
- * stays one-file-per-model. GLB wins when both formats share a basename.
+ * Pack a `.gltf` + optional external `.bin` into a single `.glb` so reindex /
+ * the shell only ever deal in one-file models. Strips buffer `uri` fields so
+ * the binary chunk is self-contained; external image URIs are flattened to
+ * basenames so the pack ships each referenced texture beside the models
+ * (loaders resolve the relative URI against the model's own URL).
+ * @internal
+ */
+export function packGltfToGlb(gltfBytes, binBytes) {
+    const json = JSON.parse(new TextDecoder().decode(gltfBytes));
+    if (Array.isArray(json.buffers)) {
+        for (const buffer of json.buffers) {
+            delete buffer.uri;
+            if (binBytes !== undefined)
+                buffer.byteLength = binBytes.byteLength;
+        }
+    }
+    normalizeGltfImageUris(json);
+    return buildGlb(JSON.stringify(json), binBytes);
+}
+/**
+ * Pull every GLB out of an archive, plus the textures those models reference.
+ * Converts co-located `.gltf` + `.bin` pairs (Quaternius Standard packs on
+ * OpenGameArt, KayKit bits packs) into `.glb` so the catalog stays
+ * one-file-per-model; GLB wins when both formats share a basename. External
+ * image URIs are flattened to basenames and the matching archive images are
+ * returned for writing beside the models — a pulled pack renders textured, not
+ * as white clay (#1005).
   * @internal
   */
 export function extractGlbs(archive) {
     const entries = unzipSync(archive, {
-        filter: boundedExtractFilter((file) => /\.(glb|gltf|bin)$/i.test(file.name)),
+        filter: boundedExtractFilter((file) => /\.(glb|gltf|bin)$/i.test(file.name) || PACK_IMAGE_EXT.test(file.name)),
     });
     const byDirBase = new Map();
+    const imagesByBase = new Map();
     for (const [path, bytes] of Object.entries(entries)) {
         const parts = path.replace(/\\/g, "/").split("/");
         const file = parts.pop();
         if (file === undefined || file.length === 0)
             continue;
+        if (PACK_IMAGE_EXT.test(file)) {
+            if (!imagesByBase.has(file))
+                imagesByBase.set(file, bytes);
+            continue;
+        }
         const dir = parts.join("/");
         // KayKit ships some files as `name.gltf.glb` — strip both suffixes for a clean id.
         const base = file.replace(/\.gltf\.glb$/i, "").replace(/\.(glb|gltf|bin)$/i, "");
@@ -275,20 +377,32 @@ export function extractGlbs(archive) {
         byDirBase.set(key, slot);
     }
     const byName = new Map();
+    const referenced = new Set();
     for (const [key, slot] of byDirBase) {
         const base = key.split("\0")[1];
         const file = `${base}.glb`;
+        if (byName.has(file))
+            continue;
         if (slot.glb !== undefined) {
-            if (!byName.has(file))
-                byName.set(file, slot.glb);
+            const normalized = normalizeGlbImageUris(slot.glb);
+            byName.set(file, normalized.bytes);
+            for (const image of normalized.referenced)
+                referenced.add(image);
             continue;
         }
         if (slot.gltf !== undefined) {
-            if (!byName.has(file))
-                byName.set(file, packGltfToGlb(slot.gltf, slot.bin));
+            const packed = packGltfToGlb(slot.gltf, slot.bin);
+            byName.set(file, packed);
+            for (const image of externalGlbImages(packed))
+                referenced.add(image);
         }
     }
-    return Array.from(byName, ([file, bytes]) => ({ file, bytes })).sort((a, b) => a.file.localeCompare(b.file));
+    const models = Array.from(byName, ([file, bytes]) => ({ file, bytes })).sort((a, b) => a.file.localeCompare(b.file));
+    const images = Array.from(referenced)
+        .filter((file) => imagesByBase.has(file))
+        .map((file) => ({ file, bytes: imagesByBase.get(file) }))
+        .sort((a, b) => a.file.localeCompare(b.file));
+    return { models, images };
 }
 /** Pulls every SVG/PNG out of a sprite/icon-pack archive, deduped by basename regardless of nesting depth.
  * @internal
@@ -296,23 +410,6 @@ export function extractGlbs(archive) {
 export function extractSpriteFiles(archive) {
     return dedupeByBasename(archive, /\.(svg|png)$/i);
 }
-const TEXTURE_ENTRY = /(?:^|\/)(Textures\/[^/]+)$/i;
-/** @internal */
-export function extractTextures(archive) {
-    const entries = unzipSync(archive, {
-        filter: boundedExtractFilter((file) => TEXTURE_ENTRY.test(file.name)),
-    });
-    const byRel = new Map();
-    for (const [path, bytes] of Object.entries(entries)) {
-        const match = path.match(TEXTURE_ENTRY);
-        if (match === null)
-            continue;
-        const rel = match[1];
-        if (!byRel.has(rel))
-            byRel.set(rel, bytes);
-    }
-    return Array.from(byRel, ([file, bytes]) => ({ file, bytes })).sort((a, b) => a.file.localeCompare(b.file));
-}
 /** @internal */
 export async function sha256Hex(bytes) {
     const buffer = new ArrayBuffer(bytes.byteLength);

package/dist/generated/kaykit-adventurers.json

@@ -17,7 +17,8 @@
         "x": -0.004841230809688568,
         "z": 0.010057404637336731
       },
-      "minY": -0.32719185948371887
+      "minY": -0.32719185948371887,
+      "maxY": 0.40435054898262024
     }
   },
   {
@@ -38,7 +39,8 @@
         "x": 0.0000034403055906295776,
         "z": 0.016935043036937714
       },
-      "minY": -0.38292860984802246
+      "minY": -0.38292860984802246,
+      "maxY": 0.36561787128448486
     }
   },
   {
@@ -59,7 +61,8 @@
         "x": -0.23169700056314468,
         "z": 5.736947059631348e-7
       },
-      "minY": -0.27304908633232117
+      "minY": -0.27304908633232117,
+      "maxY": 0.9713736176490784
     }
   },
   {
@@ -80,7 +83,8 @@
         "x": 0,
         "z": 0.0000011622905731201172
       },
-      "minY": -0.43298184871673584
+      "minY": -0.43298184871673584,
+      "maxY": 1.2916465997695923
     }
   },
   {
@@ -101,7 +105,8 @@
         "x": -0.015458569234047537,
         "z": 0.3998250197287797
       },
-      "minY": -0.000026527046429691836
+      "minY": -0.000026527046429691836,
+      "maxY": 2.397774257224249
     }
   },
   {
@@ -122,7 +127,8 @@
         "x": 0.0012482255697250366,
         "z": 0.33325251936912537
       },
-      "minY": -0.17123575508594513
+      "minY": -0.17123575508594513,
+      "maxY": 0.23463644087314606
     }
   },
   {
@@ -143,7 +149,8 @@
         "x": 0.00001755356788635254,
         "z": 0.442745566368103
       },
-      "minY": -0.17123575508594513
+      "minY": -0.17123575508594513,
+      "maxY": 0.30800661444664
     }
   },
   {
@@ -164,7 +171,8 @@
         "x": 0.009482886642217636,
         "z": 7.450580596923828e-9
       },
-      "minY": -0.22489459812641144
+      "minY": -0.22489459812641144,
+      "maxY": 0.9809512495994568
     }
   },
   {
@@ -185,7 +193,8 @@
         "x": 0.04200405905131843,
         "z": 0.7091565314913972
       },
-      "minY": -0.000026527046429691836
+      "minY": -0.000026527046429691836,
+      "maxY": 2.4665521719403785
     }
   },
   {
@@ -206,7 +215,8 @@
         "x": 0.08435849880093571,
         "z": -0.018152036592924414
       },
-      "minY": -0.000026527046429691836
+      "minY": -0.000026527046429691836,
+      "maxY": 3.0028017151609516
     }
   },
   {
@@ -227,7 +237,8 @@
         "x": 0.06913799792528152,
         "z": -2.3096799850463867e-7
       },
-      "minY": -0.23884634673595428
+      "minY": -0.23884634673595428,
+      "maxY": 0.2479029893875122
     }
   },
   {
@@ -248,7 +259,8 @@
         "x": 0.06913799792528152,
         "z": -2.3096799850463867e-7
       },
-      "minY": -0.23884634673595428
+      "minY": -0.23884634673595428,
+      "maxY": 0.3095194399356842
     }
   },
   {
@@ -269,7 +281,8 @@
         "x": 0,
         "z": 0.024237211793661118
       },
-      "minY": -0.5085819363594055
+      "minY": -0.5085819363594055,
+      "maxY": 0.4207805097103119
     }
   },
   {
@@ -290,7 +303,8 @@
         "x": -0.4691928529064687,
         "z": 0.20674141575997773
       },
-      "minY": -0.000026527046429691836
+      "minY": -0.000026527046429691836,
+      "maxY": 2.2512404918670654
     }
   },
   {
@@ -311,7 +325,8 @@
         "x": -0.4691928529064687,
         "z": 0.24231619467442933
       },
-      "minY": -0.000026527046429691836
+      "minY": -0.000026527046429691836,
+      "maxY": 2.186978340148926
     }
   },
   {
@@ -332,7 +347,8 @@
         "x": 0.0000029653310775756836,
         "z": -0.02182820811867714
       },
-      "minY": -0.5401484966278076
+      "minY": -0.5401484966278076,
+      "maxY": 0.4814440906047821
     }
   },
   {
@@ -353,7 +369,8 @@
         "x": 0.0000029653310775756836,
         "z": -0.02182820811867714
       },
-      "minY": -0.5401484966278076
+      "minY": -0.5401484966278076,
+      "maxY": 0.4814440906047821
     }
   },
   {
@@ -374,7 +391,8 @@
         "x": 0.0000028312206268310547,
         "z": 0.02120475471019745
       },
-      "minY": -0.44131818413734436
+      "minY": -0.44131818413734436,
+      "maxY": 0.44128894805908203
     }
   },
   {
@@ -395,7 +413,8 @@
         "x": 0.0000028312206268310547,
         "z": 0.02120475471019745
       },
-      "minY": -0.44131818413734436
+      "minY": -0.44131818413734436,
+      "maxY": 0.44128894805908203
     }
   },
   {
@@ -416,7 +435,8 @@
         "x": -0.0000028312206268310547,
         "z": 0.02120475471019745
       },
-      "minY": -0.44131818413734436
+      "minY": -0.44131818413734436,
+      "maxY": 0.44128894805908203
     }
   },
   {
@@ -437,7 +457,8 @@
         "x": 0.0000028312206268310547,
         "z": 0.08512479811906815
       },
-      "minY": -0.555518388748169
+      "minY": -0.555518388748169,
+      "maxY": 0.4814440906047821
     }
   },
   {
@@ -458,7 +479,8 @@
         "x": 0.0000028312206268310547,
         "z": 0.08512479811906815
       },
-      "minY": -0.555518388748169
+      "minY": -0.555518388748169,
+      "maxY": 0.4814440906047821
     }
   },
   {
@@ -479,7 +501,8 @@
         "x": -7.450580596923828e-8,
         "z": 0.005772128701210022
       },
-      "minY": -0.5964440107345581
+      "minY": -0.5964440107345581,
+      "maxY": 0.5964441299438477
     }
   },
   {
@@ -500,7 +523,8 @@
         "x": -7.450580596923828e-8,
         "z": 0.005772128701210022
       },
-      "minY": -0.5964440107345581
+      "minY": -0.5964440107345581,
+      "maxY": 0.5964441299438477
     }
   },
   {
@@ -521,7 +545,8 @@
         "x": 0.0000010728836059570312,
         "z": -0.0000025480985641479492
       },
-      "minY": -0.17134758830070496
+      "minY": -0.17134758830070496,
+      "maxY": 0.2517341077327728
     }
   },
   {
@@ -542,7 +567,8 @@
         "x": 0,
         "z": 0.0021018609404563904
       },
-      "minY": -0.28749969601631165
+      "minY": -0.28749969601631165,
+      "maxY": 0.28750017285346985
     }
   },
   {
@@ -563,7 +589,8 @@
         "x": 0,
         "z": 0.023397032171487808
       },
-      "minY": -0.2844379246234894
+      "minY": -0.2844379246234894,
+      "maxY": 0.28441160917282104
     }
   },
   {
@@ -584,7 +611,8 @@
         "x": 0.042737267911434174,
         "z": -1.4901161193847656e-8
       },
-      "minY": -0.9004455804824829
+      "minY": -0.9004455804824829,
+      "maxY": 1.2542541027069092
     }
   },
   {
@@ -605,7 +633,8 @@
         "x": 0.0000036209821701049805,
         "z": -1.1175870895385742e-8
       },
-      "minY": -0.36576569080352783
+      "minY": -0.36576569080352783,
+      "maxY": 1.4094958305358887
     }
   },
   {
@@ -626,7 +655,8 @@
         "x": 0.0000035315752029418945,
         "z": -7.078051567077637e-8
       },
-      "minY": -0.4013613760471344
+      "minY": -0.4013613760471344,
+      "maxY": 1.9644392728805542
     }
   },
   {
@@ -647,7 +677,8 @@
         "x": 0.0000035315752029418945,
         "z": -7.078051567077637e-8
       },
-      "minY": -0.4013613760471344
+      "minY": -0.4013613760471344,
+      "maxY": 1.9644392728805542
     }
   },
   {
@@ -668,7 +699,8 @@
         "x": -0.000029809772968292236,
         "z": 1.4901161193847656e-8
       },
-      "minY": -0.26569339632987976
+      "minY": -0.26569339632987976,
+      "maxY": 0.7004468441009521
     }
   }
 ]