rayzee 11.13.0 → 11.14.0

package/README.md

@@ -533,7 +533,7 @@ To pause rendering for image-viewing UI, set `engine.pauseRendering = true` and
 
 ### Renderer core (`rayzee/core`)
 
-`PathTracerApp` is built on `RayzeeRenderer`, the renderer without the viewer: a scene and camera in, path-traced samples accumulated, the image out. The denoisers, camera controls, gizmo, overlays, timeline and animation playback exist only in `PathTracerApp`; six capabilities come as add-ons — file formats beyond glTF and `.hdr`, the physical sky, scene archives, bidirectional path tracing, OpenColorIO colour and on-disk storage. Its entry point downloads about 40 % less (249 KB against 418 KB compressed). It takes the same constructor options except `container`, and renders the same pixels.
+`PathTracerApp` is built on `RayzeeRenderer`, the renderer without the viewer: a scene and camera in, path-traced samples accumulated, the image out. The denoisers, camera controls, gizmo, overlays, timeline and animation playback exist only in `PathTracerApp`; six capabilities come as add-ons — file formats beyond glTF and `.hdr`, the physical sky, scene archives, bidirectional path tracing, OpenColorIO colour and on-disk storage. Its entry point downloads about 30 % less at startup (277 KB against 404 KB compressed). It takes the same constructor options except `container`, and renders the same pixels.
 
 ```js
 import { RayzeeRenderer } from 'rayzee/core';
@@ -890,8 +890,8 @@ await engine.unloadColorConfig();
 ```
 
 - **Load and unload through `engine.loadColorConfig()` / `unloadColorConfig()`** once a scene exists: they undo an adopted working space while the config that converted the environment is still loaded.
-- A view is baked to a log2 shaper and a 65³ table, interpolated tetrahedrally; the same table drives the canvas, the GPU and CPU readbacks and the menu (`listViewTransforms()`, `onRegistryChange()`). An OCIO view returns display-encoded colour, so the engine switches the output pass to linear while one is active.
-- **Baked views.** `await engine.color.saveBakedView(id)` writes a view's table to a file (157 KB gzip for 65³), and `await engine.color.loadBakedView(bytes, { expect })` registers it with no runtime and no config — show the look on the first frame, load the config later. When that config loads, a baked view whose files match the fingerprint it was baked from is kept as is: no rebake, no new id, no restart.
+- A view is baked to a log2 shaper and a 65³ table, interpolated tetrahedrally — where that measures poorly, on linear Rec.709's axes and at 97³, whichever is closer (`entry.error` says what it cost); the same table drives the canvas, the GPU and CPU readbacks and the menu (`listViewTransforms()`, `onRegistryChange()`). An OCIO view returns display-encoded colour, so the engine switches the output pass to linear while one is active.
+- **Baked views.** `await engine.color.saveBakedView(id)` writes a view's table to a file (157 KB gzip for 65³, 426 KB for 97³), and `await engine.color.loadBakedView(bytes, { expect })` registers it with no runtime and no config — show the look on the first frame, load the config later. When that config loads, a baked view whose files match the fingerprint it was baked from is kept as is: no rebake, no new id, no restart.
 - `renderToBuffer({ colorSpace })` takes `'srgb'` (display bytes through the active view), `'linear'` (the working-space accumulation) or a config colour space; `source: 'display'` reads what the viewport shows, denoised, instead of the raw accumulation.
 - Degradations (a view that cannot bake, a display the canvas cannot show) are recorded as warnings in the [degradation contract](#degradation-contract).
 
@@ -1083,6 +1083,7 @@ surface** — pin a version and branch on the strings; they are never renamed or
 | `denoiser.unavailable` | a requested denoise or upscale produced nothing — the denoiser was not built, OIDN was off while accumulating, or the pass needs a canvas in a document |
 | `output.source_fallback` | `renderToBuffer( { source: 'display' } )` found no denoised picture and returned the raw accumulation |
 | `output.tonemap_fallback` | `renderToBuffer`'s `'srgb'` bytes were tone-mapped on the CPU, not the GPU — the picture is the same within a level, only slower (a warning: strict does not throw) |
+| `output.pass_unavailable` | `exportImage` was asked for an EXR layer it cannot write, such as `albedo` or `normal` with no denoiser on (`detail.pass`); the file is written without it |
 | `light.placeholder_skipped` | a `RectAreaLightPlaceholder` node lacked `userData.name` or `userData.type: 'RectAreaLight'`, so no light was made for it |
 | `capability.missing` | a feature was asked for whose add-on is not installed on the core (procedural sky, an unregistered integrator, a colour config, storage) — names the add-on |
 | `color.config_load_failed` / `viewTransform.bake_failed` / `viewTransform.display_mismatch` | a colour config failed to load (the previous one stays), a view could not be rebaked, or a view targets a display the canvas cannot show (a saved buffer is still right) — warnings |
@@ -1111,7 +1112,7 @@ setting as `{ value, source, routed }`, and `routed: false` means stored but rea
 
 ### Output Methods
 
-Canvas output, screenshots, and scene statistics — accessed as direct methods on the engine.
+Canvas output, screenshots, saved files and scene statistics — accessed as direct methods on the engine.
 
 ```js
 engine.getCanvas()                    // Get the canvas with the final rendered image
@@ -1135,6 +1136,54 @@ a.click();
 URL.revokeObjectURL(url);
 ```
 
+#### Saving a file
+
+`exportImage()` writes the render as a file and returns `{ blob, extension, mimeType, width, height, colorSpace, … }`.
+It works on the core too, and headless.
+
+| `format` | What the file holds |
+|---|---|
+| `'png'` (`bitDepth: 8` or `16`), `'jpeg'`, `'webp'` | the picture the canvas shows: exposure, view and denoising applied; at 8 bits, JPEG and WebP, the AI upscaler's picture while one shows (`upscaled: false` skips it) |
+| `'heic'`, `'avif'` | the same picture, written by the browser's video encoder |
+| `'exr'` (`precision: 'half'` or `'float'`), `'hdr'` (Radiance) | the light itself, before exposure and view, in the working space or `colorSpace`; with `asShown: true`, the light the screen gives off for the picture, so any viewer shows it as the screen does |
+
+```js
+const { blob, extension } = await engine.exportImage({ format: 'png', bitDepth: 16 });
+const exr = await engine.exportImage({ format: 'exr', passes: ['albedo', 'normal', 'depth'] });
+const photo = await engine.exportImage({ format: 'jpeg', gainMap: true });   // an HDR photo
+engine.exportInfo();   // what can be written now: { width, height, upscaled, hdr, layers: { albedo, normal, depth } }
+```
+
+- **HDR photos.** `gainMap: true` on `'jpeg'`, `'heic'` or `'avif'` adds a gain map — a second, small picture that
+  says how much brighter each part of the HDR version is (ISO 21496-1; Ultra HDR in a JPEG). Photo viewers that read gain
+  maps show the file in HDR, others the normal picture. It needs the screen showing HDR
+  (`engine.color.setHdrOutput(true)` on an HDR display; `exportInfo().hdr`).
+- **EXR layers.** `albedo` and `normal` are the denoisers' guide images, so they exist only while a denoiser is on;
+  `depth` is measured when asked for. A layer that cannot be written records `output.pass_unavailable`.
+- **Where each works.** JPEG, WebP, HEIC and AVIF need a browser (its canvas or video encoder); PNG, EXR and HDR work in
+  Node too. `canEncodeStill('heic')` from `rayzee/encoders` says whether this browser can write HEIC or AVIF.
+- Render details (samples, size, view, settings, versions) go into the file, except a WebP, unless `metadata: false`.
+  The file writers download on the first export, not at startup.
+
+The writers are also a module of their own, `rayzee/encoders`, for pixels a host already has. It is part of the
+package, not an add-on: nothing to install, and importing it loads nothing else (9 KB compressed).
+
+```js
+import { encodePNG, encodeEXR, encodeHDR, IMAGE_FORMATS } from 'rayzee/encoders';
+
+const png = await encodePNG({ data, width, height });   // RGBA, Uint8Array (8 bits) or Uint16Array (16), top row first
+const hdr = await encodeHDR({ data: floats, width, height });   // RGBA Float32Array
+const exr = await encodeEXR({ width, height, channels: [
+  { name: 'R', data: floats, stride: 4, offset: 0 },
+  { name: 'G', data: floats, stride: 4, offset: 1 },
+  { name: 'B', data: floats, stride: 4, offset: 2 },
+] });
+```
+
+Chrome on macOS takes about 5 seconds to start its first hardware video encoder after the browser launches, and about
+2 ms after that. HEIC and MP4 both use it. `prepareStill('heic')` starts it ahead of time without encoding anything,
+for example when an export menu opens.
+
 ---
 
 ### Render Resolution Reserve
@@ -1616,6 +1665,12 @@ import { acquireSharedStorage } from 'rayzee/addons/storage';
 // Headless rendering (see Deterministic & Headless Rendering)
 import { renderHeadless, openHeadless, captureHeadless } from 'rayzee';
 
+// File writers behind exportImage(), for pixels a host already has (see Saving a file)
+import {
+  IMAGE_FORMATS, encodePNG, encodeEXR, encodeHDR, encodeWithCanvas, encodeGainMapJPEG,
+  encodeStill, canEncodeStill, prepareStill,
+} from 'rayzee/encoders';
+
 // Platform services for hosts without a browser (see Running in Node)
 import { configurePlatform, getPlatform } from 'rayzee';
 import { nodePlatform, NodeWorker } from 'rayzee/node';

package/dist/{ArchiveImporter-DQU55mit.js → ArchiveImporter-DBMmDG98.js}

@@ -1,10 +1,10 @@
-import { n as e } from "./BidirectionalIntegrator-CLmFjSN3.js";
-import { A as t, T as n, Z as r, at as i, n as a, r as o, st as s, v as c, x as l } from "./sceneCachePolicy-DavHt6Ii.js";
-import { n as u, r as d, t as f } from "./EngineIssues-CfJiBaNj.js";
-import { r as p } from "./shared-BGBcSxBQ.js";
-import { i as m, n as h, o as g, r as _ } from "./identity-C1cLD1C0.js";
-import { a as v, s as y, t as b } from "./SceneMetadata-CoAHTAmo.js";
-import { n as x, t as S } from "./ZipReader-gDSWr0I5.js";
+import { n as e } from "./BidirectionalIntegrator-D6rcU7N1.js";
+import { A as t, B as n, J as r, T as i, X as a, n as o, r as s, v as c, x as l } from "./sceneCachePolicy-DcEWCTKO.js";
+import { n as u, r as d, t as f } from "./EngineIssues-B14FGIHX.js";
+import { r as p } from "./shared-ubP8eJlr.js";
+import { i as m, n as h, o as g, r as _ } from "./identity-CtOwEU7N.js";
+import { a as v, s as y, t as b } from "./SceneMetadata-BBx6k2EY.js";
+import { n as x, t as S } from "./ZipReader-Bva4oiva.js";
 import { AnimationClip as C, BooleanKeyframeTrack as w, BoxGeometry as T, BufferAttribute as E, BufferGeometry as D, CapsuleGeometry as ee, ClampToEdgeWrapping as te, Color as O, ConeGeometry as ne, CylinderGeometry as re, DataTexture as k, DirectionalLight as ie, DoubleSide as A, EquirectangularReflectionMapping as ae, Euler as oe, Float32BufferAttribute as j, FloatType as se, FrontSide as ce, Group as le, InstancedBufferAttribute as ue, InstancedMesh as de, LinearFilter as fe, LoadingManager as pe, MaterialLoader as me, Matrix4 as M, Mesh as he, MeshPhysicalMaterial as N, MirroredRepeatWrapping as ge, NoColorSpace as _e, NumberKeyframeTrack as ve, Object3D as ye, OrthographicCamera as be, PerspectiveCamera as xe, PlaneGeometry as Se, PointLight as Ce, Quaternion as we, QuaternionKeyframeTrack as Te, RGBAFormat as Ee, RectAreaLight as De, RepeatWrapping as Oe, SRGBColorSpace as P, SphereGeometry as ke, SpotLight as Ae, Texture as je, Uint32BufferAttribute as F, Vector3 as I, VectorKeyframeTrack as Me } from "three";
 import { HDRLoader as Ne } from "three/addons/loaders/HDRLoader.js";
 import { Gunzip as Pe, strFromU8 as Fe } from "three/addons/libs/fflate.module.js";
@@ -646,44 +646,49 @@ function Vt(e, t) {
 }
 async function Ht(e, t, { loadTexture: n }) {
 	if (e?.v !== 2) throw Error("scene graph: unknown format");
-	let r = await Rt(t, zt(e)), i = (e) => r.get(e.offset), a = /* @__PURE__ */ new Map(), o = {};
+	let r = await Rt(t, zt(e)), i = (e) => r.get(e.offset), a = /* @__PURE__ */ new Map(), o = {}, s = /* @__PURE__ */ new Map();
 	for (let t of e.textures) {
 		let e;
 		if (t.path) {
-			if (e = await n(t.path, t.loader), !e) throw Error(`scene graph: "${t.path}" is missing from the archive`);
+			let r = `${t.loader}|${t.path}`, i = s.get(r);
+			if (i) e = i.clone(), e.userData = {};
+			else {
+				if (e = await n(t.path, t.loader), !e) throw Error(`scene graph: "${t.path}" is missing from the archive`);
+				s.set(r, e);
+			}
 			e.userData[_t] = t.path, e.userData[vt] = t.loader;
 		} else e = new k(i(t.data.section), t.data.width, t.data.height);
 		Vt(e, t), o[t.uuid] = e;
 	}
-	let s = new me().setTextures(o), c = {};
+	let c = new me().setTextures(o), l = {};
 	for (let t of e.materials) {
-		let e = s.parse(t);
+		let e = c.parse(t);
 		for (let [n, r] of Object.entries(t.exactColors ?? {})) n === "diffuseTransmissionColor" && (e[n] = new O()), e[n]?.setRGB(r[0], r[1], r[2]);
 		t.exactIor !== void 0 && (e.ior = t.exactIor), t.diffuseTransmission !== void 0 && (e.diffuseTransmission = t.diffuseTransmission), t.diffuseRoughness !== void 0 && (e.diffuseRoughness = t.diffuseRoughness);
 		for (let [n, r] of Object.entries(t.engineTextures ?? {})) o[r] && (e[n] = o[r]);
-		c[t.uuid] = e;
+		l[t.uuid] = e;
 	}
-	let l = {};
+	let u = {};
 	for (let t of e.geometries) {
 		let e = new D();
 		e.uuid = t.uuid, e.name = t.name;
 		for (let [n, i] of Object.entries(t.attributes)) e.setAttribute(n, Bt(r, i));
 		t.index && e.setIndex(Bt(r, t.index));
 		for (let n of t.groups) e.addGroup(n.start, n.count, n.materialIndex);
-		e.setDrawRange(t.drawRange.start, t.drawRange.count), e.userData = t.userData, l[t.uuid] = e;
+		e.setDrawRange(t.drawRange.start, t.drawRange.count), e.userData = t.userData, u[t.uuid] = e;
 	}
-	let u = [];
+	let d = [];
 	for (let t of e.nodes) {
-		let e = Array.isArray(t.material) ? t.material.map((e) => c[e]) : c[t.material], n;
+		let e = Array.isArray(t.material) ? t.material.map((e) => l[e]) : l[t.material], n;
 		switch (t.type) {
 			case "InstancedMesh": {
-				n = new de(l[t.geometry], e, 1);
+				n = new de(u[t.geometry], e, 1);
 				let r = a.get(t.instanceMatrix.offset);
 				r || a.set(t.instanceMatrix.offset, r = new ue(i(t.instanceMatrix), 16)), n.instanceMatrix = r, n.count = t.count, t.instanceColor && (n.instanceColor = new ue(i(t.instanceColor), 3));
 				break;
 			}
 			case "Mesh":
-				n = new he(l[t.geometry], e);
+				n = new he(u[t.geometry], e);
 				break;
 			case "PerspectiveCamera":
 				n = new xe();
@@ -728,13 +733,13 @@ async function Ht(e, t, { loadTexture: n }) {
 			n.color.fromArray(t.color);
 			for (let e of wt) t[e] !== void 0 && (n[e] = t[e]);
 		}
-		u.push(n), t.parent >= 0 && u[t.parent].add(n);
+		d.push(n), t.parent >= 0 && d[t.parent].add(n);
 	}
-	let d = new Map(u.map((e) => [e.uuid, e]));
+	let f = new Map(d.map((e) => [e.uuid, e]));
 	return e.nodes.forEach((e, t) => {
-		e.target && d.has(e.target) && (u[t].target = d.get(e.target));
+		e.target && f.has(e.target) && (d[t].target = f.get(e.target));
 	}), {
-		root: u[0],
+		root: d[0],
 		environment: e.environment ? o[e.environment] : null,
 		animations: e.animations.map((e) => C.parse(e)),
 		stats: e.stats
@@ -3501,7 +3506,7 @@ var Ri = class {
 		return this._countedGeometries.has(e) || (this._countedGeometries.add(e), this.triangleCount += t), t;
 	}
 	async _buildInstances(e, t) {
-		let n = 0;
+		let r = 0;
 		e.skippedInstances > 0 && (this.skippedForBudget += e.skippedInstances);
 		let i = new Float64Array(16), a = new M(), o = /* @__PURE__ */ new Map(), s = (e, s, c, l, u, d, f) => {
 			let p = l ? Array.prototype.join.call(l, ",") : "", m = o.get(e);
@@ -3509,7 +3514,7 @@ var Ri = class {
 			let h = m.get(p), g = Math.max(0, this.maxPlacements - this.placementCount), _ = h ? h.count : Math.min(e.count, g);
 			if (!h && _ < e.count && (this.skippedForBudget += e.count - _), _ === 0) return;
 			let v = new de(s, c, _);
-			if (v.name = `instance_${n++}`, v.frustumCulled = !1, h) v.instanceMatrix = h.attribute;
+			if (v.name = `instance_${r++}`, v.frustumCulled = !1, h) v.instanceMatrix = h.attribute;
 			else {
 				for (let t = 0; t < _; t++) {
 					if (l) _n(i, e.matrices, t * 16, l);
@@ -3521,7 +3526,7 @@ var Ri = class {
 					count: _
 				}), this.placementCount += _;
 			}
-			r(v), t.add(v), this.reportedMeshes += _, this.report.length < Xr && this.report.push({
+			n(v), t.add(v), this.reportedMeshes += _, this.report.length < Xr && this.report.push({
 				mesh: `${v.name} ×${_}`,
 				shape: u,
 				material: d,
@@ -8190,7 +8195,7 @@ var ms = /* @__PURE__ */ e({
 		return e instanceof Uint8Array ? e.subarray(0, t) : typeof e.slice == "function" && typeof e.arrayBuffer == "function" ? new Uint8Array(await e.slice(0, t).arrayBuffer()) : new Uint8Array((await this.loader.readFileAsArrayBuffer(e)).slice(0, t));
 	}
 	async inspectArchive(e) {
-		let t = Ue(await this._readHead(e)), n = (e) => s({
+		let t = Ue(await this._readHead(e)), n = (e) => a({
 			isLoading: !0,
 			status: `Scanning archive… ${(e.bytes / 1e9).toFixed(1)} GB`,
 			progress: 4
@@ -8205,11 +8210,11 @@ var ms = /* @__PURE__ */ e({
 			path: e.name,
 			size: e.size
 		}));
-		let { root: i, elements: a } = lt(r);
+		let { root: i, elements: o } = lt(r);
 		return {
 			kind: t ?? "zip",
 			root: i,
-			elements: a,
+			elements: o,
 			entryCount: r.length,
 			totalBytes: r.reduce((e, t) => e + t.size, 0)
 		};
@@ -8224,7 +8229,7 @@ var ms = /* @__PURE__ */ e({
 					filter: ct(r),
 					part: [...r].sort().join(",")
 				} : {},
-				onProgress: (e) => s({
+				onProgress: (e) => a({
 					isLoading: !0,
 					status: `Unpacking archive… ${(e / 1e9).toFixed(1)} GB`,
 					progress: 4
@@ -8309,16 +8314,16 @@ var ms = /* @__PURE__ */ e({
 		return this.loader._sourceKey = this.loader._keyed(s, a), l;
 	}
 	async _loadStoredGraph(e, t, { imageFromBytes: n, envFromBytes: r }) {
-		let i = this.loader.storage?.area(p.SCENES), a = i ? await i.open(e) : null;
-		if (!a) return null;
-		let o = performance.now(), c = null;
+		let i = this.loader.storage?.area(p.SCENES), o = i ? await i.open(e) : null;
+		if (!o) return null;
+		let s = performance.now(), c = null;
 		try {
-			s({
+			a({
 				isLoading: !0,
 				status: "Opening the stored scene...",
 				progress: 6
 			});
-			let e = await a.json("graph.json"), i = await a.file("data.bin"), c = new aa({}, t), l = await Ht(e, i, { loadTexture: async (e, t) => {
+			let e = await o.json("graph.json"), i = await o.file("data.bin"), c = new aa({}, t), l = await Ht(e, i, { loadTexture: async (e, t) => {
 				let i = await c.readPath(e);
 				return i ? t === "environment" ? r(i, e) : n(i, e) : null;
 			} });
@@ -8329,13 +8334,13 @@ var ms = /* @__PURE__ */ e({
 				animations: l.animations,
 				report: null,
 				parseMs: 0,
-				buildMs: performance.now() - o,
+				buildMs: performance.now() - s,
 				fromStorage: !0
 			};
 		} catch (e) {
 			return c = e, null;
 		} finally {
-			a.release(), c && (console.warn(`The stored scene could not be used, parsing the archive instead: ${c.message}`), this.loader._issues?.warn(u.STORAGE_ENTRY_CORRUPT, `stored scene unusable: ${c.message}`, { key: e }), i.remove(e).catch(() => {}));
+			o.release(), c && (console.warn(`The stored scene could not be used, parsing the archive instead: ${c.message}`), this.loader._issues?.warn(u.STORAGE_ENTRY_CORRUPT, `stored scene unusable: ${c.message}`, { key: e }), i.remove(e).catch(() => {}));
 		}
 	}
 	_storeGraph(e, t, n) {
@@ -8365,7 +8370,7 @@ var ms = /* @__PURE__ */ e({
 			e instanceof Et ? console.info(`Scene not stored for next time: ${e.message}`) : console.warn("Scene not stored for next time:", e);
 			return;
 		}
-		let o, s = new AbortController(), c = {
+		let a, s = new AbortController(), c = {
 			key: e,
 			encoded: i,
 			label: n,
@@ -8375,19 +8380,19 @@ var ms = /* @__PURE__ */ e({
 			parseMs: (t.parseMs ?? 0) + (t.buildMs ?? 0),
 			triangles: t.triangleCount ?? null,
 			accepted: new Promise((e) => {
-				o = e;
+				a = e;
 			}),
 			decide: (e) => {
-				o(e), e || s.abort();
+				a(e), e || s.abort();
 			}
 		};
-		this._store = c, a(c.parseMs, i.byteLength) && this._writeGraph(r, c);
+		this._store = c, o(c.parseMs, i.byteLength) && this._writeGraph(r, c);
 	}
 	flushPendingGraph(e) {
 		let t = this._store;
 		if (!t || t.writing) return;
 		let n = this.loader.storage?.area(p.SCENES);
-		n && a(t.parseMs + e, t.encoded.byteLength) ? this._writeGraph(n, t) : this._store = null;
+		n && o(t.parseMs + e, t.encoded.byteLength) ? this._writeGraph(n, t) : this._store = null;
 	}
 	commitPendingGraph(e) {
 		let t = this._store;
@@ -8412,16 +8417,16 @@ var ms = /* @__PURE__ */ e({
 			}
 		})();
 	}
-	async _openSeekableArchive(e, t, n, r, { index: i = null, zip: a = !1 } = {}) {
-		let o = Array.isArray(n) ? n.filter(Boolean) : n ? [n] : [], c = o.length ? ct(o) : null, l;
-		if (a) l = await S(e, { filter: c });
+	async _openSeekableArchive(e, t, n, r, { index: i = null, zip: o = !1 } = {}) {
+		let s = Array.isArray(n) ? n.filter(Boolean) : n ? [n] : [], c = s.length ? ct(s) : null, l;
+		if (o) l = await S(e, { filter: c });
 		else {
 			let t = i ?? await mt(e, this.loader.storage);
 			l = await ot(e, {
 				index: t,
 				headersOnly: !0,
 				filter: c,
-				onProgress: (e) => s({
+				onProgress: (e) => a({
 					isLoading: !0,
 					status: `Indexing archive… ${(e.bytes / 1e9).toFixed(1)} GB`,
 					progress: 4
@@ -8429,7 +8434,7 @@ var ms = /* @__PURE__ */ e({
 			}), t || ht(e, this.loader.storage, l.index).catch(() => {});
 		}
 		let u = l.listing.reduce((e, t) => e + t.size, 0);
-		return o.length === 0 && this._requireElementChoice(t, l.listing, u, r), console.info(`Archive "${t}": indexed ${l.indexed} entries, ${(u / 1e9).toFixed(1)} GB, none resident` + (o.length ? `, ${o.length} part${o.length > 1 ? "s" : ""} selected.` : ".")), l;
+		return s.length === 0 && this._requireElementChoice(t, l.listing, u, r), console.info(`Archive "${t}": indexed ${l.indexed} entries, ${(u / 1e9).toFixed(1)} GB, none resident` + (s.length ? `, ${s.length} part${s.length > 1 ? "s" : ""} selected.` : ".")), l;
 	}
 	_requireElementChoice(e, t, n, r = Ss) {
 		if (n < r) return;
@@ -8443,16 +8448,16 @@ var ms = /* @__PURE__ */ e({
 		}, d.WARNING), o;
 	}
 	async _readStreamedArchive(e, t, n, r, i) {
-		let a = Array.isArray(r) ? r.filter(Boolean) : r ? [r] : [], { entries: o, listing: c, retainedBytes: l, truncated: f } = await nt(e, {
-			filter: a.length ? ct(a) : null,
+		let o = Array.isArray(r) ? r.filter(Boolean) : r ? [r] : [], { entries: s, listing: c, retainedBytes: l, truncated: f } = await nt(e, {
+			filter: o.length ? ct(o) : null,
 			...i === void 0 ? {} : { byteBudget: i },
-			onProgress: (e) => s({
+			onProgress: (e) => a({
 				isLoading: !0,
 				status: `Reading archive… ${(e.bytes / 1e9).toFixed(1)} GB`,
 				progress: 4
 			})
 		});
-		if (f && a.length === 0) {
+		if (f && o.length === 0) {
 			let { root: e, elements: n } = lt(c), r = c.reduce((e, t) => e + t.size, 0), i = /* @__PURE__ */ Error(`"${t}" unpacks to ${(r / 1e9).toFixed(1)} GB, past the load budget. Load one of its ${n.length} parts instead.`);
 			throw i.code = "ARCHIVE_NEEDS_ELEMENT", i.root = e, i.elements = n, i.totalBytes = r, this.loader._issues?.record(u.ASSET_ARCHIVE_TOO_LARGE, `archive unpacks to ${(r / 1e9).toFixed(1)} GB; choose one of ${n.length} parts`, {
 				root: e,
@@ -8461,17 +8466,17 @@ var ms = /* @__PURE__ */ e({
 			}, d.WARNING), i;
 		}
 		if (f) {
-			let e = ct(a), t = c.filter((t) => e(t.path, t.size) && !o[t.path]).length;
+			let e = ct(o), t = c.filter((t) => e(t.path, t.size) && !s[t.path]).length;
 			this.loader._issues?.record(u.ASSET_ARCHIVE_TOO_LARGE, `${t} files of the chosen parts were left out: they did not fit the ${((i ?? 15e8) / 1e9).toFixed(1)} GB in-memory read budget`, {
-				elements: a,
+				elements: o,
 				missing: t,
 				retainedBytes: l
 			}, d.WARNING);
 		}
-		return a.length && console.info(`Archive "${t}": loaded ${a.map((e) => `"${e}"`).join(", ")} — ${Object.keys(o).length} of ${c.length} files, ${(l / 1048576).toFixed(1)} MB.`), o;
+		return o.length && console.info(`Archive "${t}": loaded ${o.map((e) => `"${e}"`).join(", ")} — ${Object.keys(s).length} of ${c.length} files, ${(l / 1048576).toFixed(1)} MB.`), s;
 	}
-	async loadPBRTFromZip(e, t, n = null, r = {}, a = null) {
-		if (s({
+	async loadPBRTFromZip(e, t, n = null, i = {}, o = null) {
+		if (a({
 			isLoading: !0,
 			status: "Parsing PBRT scene...",
 			progress: 5
@@ -8480,26 +8485,26 @@ var ms = /* @__PURE__ */ e({
 			this.loader.loaderCache.ply = new e();
 		}
 		let c = (e) => this.loader.loaderCache.ply.parse(e), l = (e, t) => this._archiveImage(e, t), f = (e, t) => this._archiveEnvironment(e, t), p = performance.now(), m = {
-			animation: r.animation,
-			maxTriangles: r.maxTriangles,
-			maxPlacements: r.maxPlacements,
-			mergeShapesAbove: r.mergeShapesAbove,
-			curveSteps: r.curveSteps,
-			curveSides: r.curveSides,
-			curveTolerance: r.curveTolerance,
-			instanceIncludes: r.instanceIncludes
-		}, h = a?.archiveId ? this.loader._keyed(`pbrt:2.14:${o}`, `${a.archiveId}|${n ?? ""}|${[...a.elements ?? []].sort().join(",")}|${JSON.stringify(m)}`) : null, g = h ? await this._loadStoredGraph(h, a, {
+			animation: i.animation,
+			maxTriangles: i.maxTriangles,
+			maxPlacements: i.maxPlacements,
+			mergeShapesAbove: i.mergeShapesAbove,
+			curveSteps: i.curveSteps,
+			curveSides: i.curveSides,
+			curveTolerance: i.curveTolerance,
+			instanceIncludes: i.instanceIncludes
+		}, h = o?.archiveId ? this.loader._keyed(`pbrt:2.14:${s}`, `${o.archiveId}|${n ?? ""}|${[...o.elements ?? []].sort().join(",")}|${JSON.stringify(m)}`) : null, g = h ? await this._loadStoredGraph(h, o, {
 			imageFromBytes: l,
 			envFromBytes: f
 		}) : null, _ = g ?? await va({
 			vfs: e,
-			source: a,
+			source: o,
 			entryPath: n,
 			plyParser: c,
 			imageFromBytes: l,
 			envFromBytes: f,
 			...m,
-			pause: this._buildPause(i())
+			pause: this._buildPause(r())
 		});
 		this.loader._throwDeferred();
 		let { group: v, environment: y, animations: b, report: x, warnings: S, meshCount: C, entryPath: w, candidates: T, frames: E, parseMs: D, buildMs: ee, triangleCount: te, placementCount: O, mergedShapes: ne, skippedForBudget: re, droppedNoTemplate: k, parameters: ie } = _;
@@ -8529,7 +8534,7 @@ var ms = /* @__PURE__ */ e({
 				intensity: 1
 			} : { enabled: !1 },
 			..._.render ? { render: { ..._.render } } : {}
-		}, s({
+		}, a({
 			isLoading: !0,
 			status: "Processing PBRT geometry...",
 			progress: 10
@@ -8572,38 +8577,38 @@ var ms = /* @__PURE__ */ e({
 		}
 	}
 	async loadUSDScene(e, t, n = {}) {
-		s({
+		a({
 			isLoading: !0,
 			status: "Reading USD scene...",
 			progress: 5
 		});
-		let r = Object.keys(e), a = new vo(r, async (t) => e[t] ? vs(e[t]) : null, { omitted: (n.listing ?? []).filter((t) => !(t.path in e)).map((e) => e.path) }), o = ls(r);
-		if (o.length === 0) throw Error(`No USD layer found in ${t}`);
-		let c = o[0];
-		o.length > 1 && (console.warn(`${t} holds ${o.length} top-level USD layers; loaded "${c}". Others: ${o.slice(1).join(", ")}`), this.loader._issues?.record(u.ASSET_AMBIGUOUS_ENTRY, `${t} holds ${o.length} top-level USD layers; loaded "${c}"`, {
+		let i = Object.keys(e), o = new vo(i, async (t) => e[t] ? vs(e[t]) : null, { omitted: (n.listing ?? []).filter((t) => !(t.path in e)).map((e) => e.path) }), s = ls(i);
+		if (s.length === 0) throw Error(`No USD layer found in ${t}`);
+		let c = s[0];
+		s.length > 1 && (console.warn(`${t} holds ${s.length} top-level USD layers; loaded "${c}". Others: ${s.slice(1).join(", ")}`), this.loader._issues?.record(u.ASSET_AMBIGUOUS_ENTRY, `${t} holds ${s.length} top-level USD layers; loaded "${c}"`, {
 			loaded: c,
-			alternatives: o.slice(1)
-		}, d.WARNING)), (Array.isArray(n.element) ? n.element : [n.element]).filter(Boolean).length === 0 && await this._requireUSDPartChoice(t, a, c, n.listing ?? r.map((t) => ({
+			alternatives: s.slice(1)
+		}, d.WARNING)), (Array.isArray(n.element) ? n.element : [n.element]).filter(Boolean).length === 0 && await this._requireUSDPartChoice(t, o, c, n.listing ?? i.map((t) => ({
 			path: t,
 			size: e[t]?.size ?? e[t]?.byteLength ?? 0
 		})), n.promptBytes);
-		let l = performance.now(), f = i(), p = await ds({
-			files: a,
+		let l = performance.now(), f = r(), p = await ds({
+			files: o,
 			entryPath: c,
 			pauseRead: (e, t) => {
 				let n = f();
-				return n && s({
+				return n && a({
 					status: `${t ? "Counting" : "Reading"} USD scene... ${e.toLocaleString()} prims`,
 					progress: t ? 5 : 6
 				}), n;
 			},
 			pauseBuild: this._buildPause(f),
 			resolveImage: async (e) => {
-				let t = await a.read(e);
+				let t = await o.read(e);
 				return t ? this._archiveImage(t, e) : null;
 			},
 			resolveEnvironment: async (e) => {
-				let t = await a.read(e);
+				let t = await o.read(e);
 				return t ? this._archiveEnvironment(t, e) : null;
 			},
 			maxTriangles: n.maxTriangles,
@@ -8631,7 +8636,7 @@ var ms = /* @__PURE__ */ e({
 		}, d.WARNING), g.length && (console.warn(`USD loader: ${g.length} warning(s) loading "${c}"`), g.forEach((e) => console.warn("  •", e))), h?.texture && (h.texture.generateMipmaps = !0, this.loader.applyEnvironmentToScene(h.texture)), m.name = c.split("/").pop(), this.loader.releaseTargetModel(), this.loader.targetModel = m, this.loader.animations = [], this.loader.sceneMetadata = h?.texture ? { environment: {
 			rotation: h.rotation,
 			intensity: h.intensity
-		} } : null, s({
+		} } : null, a({
 			isLoading: !0,
 			status: "Processing USD geometry...",
 			progress: 10
@@ -8644,7 +8649,7 @@ var ms = /* @__PURE__ */ e({
 	_buildPause(e) {
 		return (t, n) => {
 			let r = e();
-			return r && s({
+			return r && a({
 				status: `Building scene... ${t.toLocaleString()} of ${n.toLocaleString()} shapes`,
 				progress: 8
 			}), r;
@@ -8755,27 +8760,27 @@ var ms = /* @__PURE__ */ e({
 	}
 	async loadModelFromZipEntry(e, t, n, r, i = "ZIP") {
 		try {
-			s({
+			a({
 				isLoading: !0,
 				status: `Processing ${n.toUpperCase()} from ${i}...`,
 				progress: 5
 			});
-			let a;
+			let o;
 			switch (n) {
 				case "glb":
 				case "gltf":
-					a = await this.handleGltfFromZip(n, e, t, r);
+					o = await this.handleGltfFromZip(n, e, t, r);
 					break;
 				case "obj":
-					a = await this.handleObjFromZip(e, t, r);
+					o = await this.handleObjFromZip(e, t, r);
 					break;
-				default: a = await this.loader._loadModelFileByExtension(new File([e], t), t);
+				default: o = await this.loader._loadModelFileByExtension(new File([e], t), t);
 			}
 			return this.loader.dispatchEvent({
 				type: "load",
 				model: this.loader.targetModel,
 				filename: `${t} (from ${i})`
-			}), a;
+			}), o;
 		} catch (e) {
 			throw console.error(`Error loading ${n} from ${i}:`, e), this.loader.dispatchEvent({
 				type: "error",
@@ -8784,19 +8789,19 @@ var ms = /* @__PURE__ */ e({
 			}), e;
 		}
 	}
-	async handleGltfFromZip(e, t, r, i) {
+	async handleGltfFromZip(e, t, n, r) {
 		if (e === "gltf") {
-			let e = await ys(t), a = new pe(), o = r.split("/").slice(0, -1).join("/");
-			a.setURLModifier((e) => this.resolveZipResource(e, o, i));
+			let e = await ys(t), a = new pe(), o = n.split("/").slice(0, -1).join("/");
+			a.setURLModifier((e) => this.resolveZipResource(e, o, r));
 			let s = await this.loader.createGLTFLoader();
 			s.manager = a;
 			try {
-				let t = await n(() => new Promise((t, n) => s.parse(e, "", t, n)));
+				let t = await i(() => new Promise((t, n) => s.parse(e, "", t, n)));
 				return this.loader._throwDeferred(), this.loader.releaseTargetModel(), this.loader.targetModel = t.scene, this.loader.sceneMetadata = b(t), await this.loader.onModelLoad(this.loader.targetModel), t;
 			} finally {
 				this.loader._disposeGLTFLoader(s);
 			}
-		} else return await this.loader.loadGLBFromArrayBuffer(await xs(t), r);
+		} else return await this.loader.loadGLBFromArrayBuffer(await xs(t), n);
 	}
 	async handleObjFromZip(e, t, n) {
 		let r = await ys(e), i = r.match(/mtllib\s+([^\s]+)/), a = null;