rayzee 10.0.0 → 11.1.0

package/src/Processor/AssetLoader.js

@@ -1,71 +1,42 @@
 import { Box3, BufferGeometry, Vector3, RectAreaLight, Color, FloatType, LinearFilter, EquirectangularReflectionMapping,
-	TextureLoader, Texture, SRGBColorSpace, RepeatWrapping, Mesh, MeshStandardMaterial, MeshPhysicalMaterial,
-	CircleGeometry, Points, PointsMaterial, LoadingManager, EventDispatcher, LoaderUtils
+	TextureLoader, SRGBColorSpace, Mesh, MeshPhysicalMaterial,
+	CircleGeometry, LoadingManager, EventDispatcher, LoaderUtils
 } from 'three';
 import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
 import { HDRLoader } from 'three/addons/loaders/HDRLoader.js';
-import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js';
-import { KTX2Loader } from 'three/addons/loaders/KTX2Loader.js';
-import { EXRLoader } from 'three/addons/loaders/EXRLoader.js';
 import { createMeshesFromMultiMaterialMesh } from 'three/addons/utils/SceneUtils.js';
 import { clone as cloneWithSkeletons } from 'three/addons/utils/SkeletonUtils.js';
-import { MeshoptDecoder } from 'three/addons/libs/meshopt_decoder.module.js';
-import { zipSync, strFromU8 } from 'three/addons/libs/fflate.module.js';
-import {
-	detectArchiveKind, readTarGz, elementFilter, listArchiveElements, openTar, indexTarHeaders } from './ArchiveReader.js';
-import { openZip, readZipDirectory } from './ZipReader.js';
-import { unpackTarGz, loadTarIndex, saveTarIndex } from './ArchiveCache.js';
 import { DownloadCache, nameFromUrl, cachedObjectURL } from '../Storage/DownloadCache.js';
 import { setEnvironmentSource } from '../Storage/CDFCache.js';
-import { fileIdentity, identityKey, sampleHash } from '../Storage/identity.js';
-import { ENGINE_AREAS } from '../Storage/StorageManager.js';
-import { encodeSceneGraph, writeSceneGraph, decodeSceneGraph, SceneGraphUnsupported, SCENE_GRAPH_FORMAT, ARCHIVE_PATH, ARCHIVE_LOADER } from '../Storage/SceneGraphCodec.js';
-import { worthStoring } from '../Storage/sceneCachePolicy.js';
-import { VERSION } from '../version.js';
+import { fileIdentity, identityKey } from '../Storage/identity.js';
 import { disposeEngineOwnedResources, disposeObjectFromMemory, updateLoading } from './utils';
 import { BuildTimer } from './BuildTimer.js';
-import { getAssetConfig } from '../AssetConfig.js';
-import { getPlatform } from '../Platform.js';
-import { loadPlatformImage, platformImagesPlugin } from './PlatformImageLoader.js';
-import { loadPBRTScene, pickEntryPath, VirtualFS, PBRT_BUILD_REVISION } from './PBRT/index.js';
+import { getPlatform, hasImageDecoder, withHostWorker } from '../Platform.js';
+import { loadPlatformImage, platformImagesPlugin, missingImageDecoderPlugin } from './PlatformImageLoader.js';
+import { diffuseTransmissionPlugin } from './GLTFDiffuseTransmission.js';
+import { decodersOnDemand } from './GLTFDecoders.js';
 import { extractSceneMetadata } from './SceneMetadata.js';
-import { ISSUE_CODES, ISSUE_SEVERITY } from '../EngineIssues.js';
-import { getRenderProfile } from '../EngineDefaults.js';
+import { ISSUE_CODES } from '../EngineIssues.js';
+import { ENGINE_DEFAULTS } from '../EngineDefaults.js';
 
 // Define supported file formats
-const SUPPORTED_FORMATS = {
+// What the core reads itself; every other format is registered (registerFormat) or comes with an add-on.
+const CORE_FORMATS = {
 	'glb': { type: 'model', name: 'GLB (GLTF Binary)' }, 'gltf': { type: 'model', name: 'GLTF' },
-	'fbx': { type: 'model', name: 'FBX' }, 'obj': { type: 'model', name: 'OBJ' },
-	'stl': { type: 'model', name: 'STL' }, 'ply': { type: 'model', name: 'PLY (Polygon File Format)' },
-	'dae': { type: 'model', name: 'Collada' }, '3mf': { type: 'model', name: '3D Manufacturing Format' },
-	'usd': { type: 'model', name: 'USD (Universal Scene Description)' },
-	'usda': { type: 'model', name: 'USDA (USD ASCII)' },
-	'usdc': { type: 'model', name: 'USDC (USD Crate)' },
-	'usdz': { type: 'model', name: 'USDZ (USD Archive)' },
-	'hdr': { type: 'environment', name: 'HDR (High Dynamic Range)' }, 'exr': { type: 'environment', name: 'EXR (OpenEXR)' },
+	'hdr': { type: 'environment', name: 'HDR (High Dynamic Range)' },
 	'png': { type: 'image', name: 'PNG' }, 'jpg': { type: 'image', name: 'JPEG' },
 	'jpeg': { type: 'image', name: 'JPEG' }, 'webp': { type: 'image', name: 'WebP' },
-	'zip': { type: 'archive', name: 'ZIP Archive' },
-	'gz': { type: 'archive', name: 'Gzipped TAR Archive' },
-	'tgz': { type: 'archive', name: 'Gzipped TAR Archive' },
-	'tar': { type: 'archive', name: 'TAR Archive' }
 };
 
-// Loose USD layers inside a ZIP compose into one scene; these pick out the
-// layers and the image assets they reference.
-const USD_LAYER_RE = /\.(usd|usda|usdc)$/i;
-const USD_IMAGE_RE = /\.(png|jpg|jpeg|avif)$/i;
-const MTL_TEXTURE_TIMEOUT_MS = 30000;
-/**
- * Unpacked size past which a multi-part scene archive asks which parts to load rather than
- * taking all of them. Not a hard limit — picking every part is a valid answer.
- *
- * Measured on Moana: a 7.5 GB archive of 15 parts parses to 40M triangles and ~7.3 GB of CPU
- * memory, which loads on a freshly started browser and fails on one that has been up a while.
- * Anything near that is worth a question, because the failure past it kills the tab rather than
- * throwing. Override per load with `promptBytes`.
- */
-export const ARCHIVE_ELEMENT_PROMPT_BYTES = 4_000_000_000;
+// Formats an add-on reads, for the error that names it.
+const ARCHIVES = { addOn: 'rayzee/addons/archives', install: 'assetLoader.setArchiveImporter()' };
+const FORMATS = { addOn: 'rayzee/addons/formats', install: 'assetLoader.registerFormat()' };
+const ADDON_FORMATS = {
+	zip: ARCHIVES, gz: ARCHIVES, tgz: ARCHIVES, tar: ARCHIVES,
+	fbx: FORMATS, obj: FORMATS, stl: FORMATS, ply: FORMATS, dae: FORMATS, '3mf': FORMATS,
+	usd: FORMATS, usda: FORMATS, usdc: FORMATS, usdz: FORMATS, exr: FORMATS,
+};
+
 // A throwaway stand-in for a geometry the engine must not mutate: the split's mergeGroups()
 // reorders and disposes what it is given, but never writes the attributes.
 function standInForSplit( source ) {
@@ -99,7 +70,7 @@ function areaLightPowerFactor( node, width, height, userData ) {
  */
 export class AssetLoader extends EventDispatcher {
 
-	constructor( scene, camera, controls, { issues = null, profile = null } = {} ) {
+	constructor( scene, camera, controls, { issues = null, areaLightIntensityScale = null } = {} ) {
 
 		super();
 		this.scene = scene;
@@ -130,9 +101,15 @@ export class AssetLoader extends EventDispatcher {
 		this._downloads = null;
 		this._sourceKey = null;
 		this._appended = false;
+		/** @type {?import('./ArchiveImporter.js').ArchiveImporter} reads archives; see setArchiveImporter() */
+		this.archives = null;
+		/** @type {?{load: function(): Promise<Object>, formats: Object, pending: ?Promise}} see setArchiveImporterLoader() */
+		this._archiveLoader = null;
+		/** @type {Map<string, Object>} extension → a format registerFormat() added */
+		this._formats = new Map();
 
 		this._issues = issues;
-		this._profile = profile ?? getRenderProfile();
+		this._areaLightIntensityScale = areaLightIntensityScale ?? ( () => ENGINE_DEFAULTS.areaLightIntensityScale );
 
 		// A glTF whose external texture 404s still loads. Only place the engine sees the URL.
 		// ZIP paths build their own managers and are not covered.
@@ -210,7 +187,8 @@ export class AssetLoader extends EventDispatcher {
 
 	_keyed( kind, id ) {
 
-		return id ? `${kind}:${this._profile?.name ?? ''}:${id}` : null;
+		// The empty field held a profile name that was never set; kept so stored caches and sessions still match.
+		return id ? `${kind}::${id}` : null;
 
 	}
 
@@ -321,7 +299,7 @@ export class AssetLoader extends EventDispatcher {
 		this.sceneMetadata = null;
 		this._sourceKey = null;
 		this._appended = false;
-		this._pendingGraph = null;
+		this.archives?.release();
 
 		if ( ! this.targetModel ) return;
 
@@ -340,37 +318,101 @@ export class AssetLoader extends EventDispatcher {
 
 	}
 
+	/**
+	 * Installs the importer that reads scene archives and the pbrt scenes in them — `ArchiveImporter` from
+	 * rayzee/addons/archives. Without one, archives are not a supported format.
+	 * @param {?import('./ArchiveImporter.js').ArchiveImporter} importer
+	 */
+	setArchiveImporter( importer ) {
+
+		this.archives = importer;
+
+	}
+
+	/**
+	 * Installs the archive importer on first use: `load()` resolves to one, the first time an archive is read. `formats`
+	 * are the extensions it reads (its class's `FORMATS`), known before its code is loaded.
+	 * @param {function(): Promise<import('./ArchiveImporter.js').ArchiveImporter>} load
+	 * @param {Object<string, {type: string, name: string}>} formats
+	 */
+	setArchiveImporterLoader( load, formats ) {
+
+		this._archiveLoader = { load, formats, pending: null };
+
+	}
+
+	/** The archive importer, loading it first if it was installed with setArchiveImporterLoader(). @private */
+	async _archiveImporter() {
+
+		if ( ! this.archives && this._archiveLoader ) this.archives = await ( this._archiveLoader.pending ??= this._archiveLoader.load() );
+		return this.archives;
+
+	}
+
+	/** @private */
+	get _archiveFormats() {
+
+		return this.archives?.constructor.FORMATS ?? this._archiveLoader?.formats ?? null;
+
+	}
+
+	/**
+	 * Adds file formats beyond glTF and .hdr — those of rayzee/addons/formats, or a host's own. Each is
+	 * `{ name, label, type: 'model' | 'environment', extensions, parse | createLoader }` (see Processor/FileFormats.js).
+	 * @param {...Object} formats
+	 * @returns {this}
+	 */
+	registerFormat( ...formats ) {
+
+		for ( const format of formats ) for ( const extension of format.extensions ) this._formats.set( extension, format );
+		return this;
+
+	}
+
 	// File utilities
 	getFileFormat( filename ) {
 
 		const extension = filename.split( '.' ).pop().toLowerCase();
-		return SUPPORTED_FORMATS[ extension ] || null;
+		return CORE_FORMATS[ extension ] || this._formats.get( extension ) || this._archiveFormats?.[ extension ] || null;
 
 	}
 
-	readFileAsArrayBuffer( file ) {
+	/** The error for a file no installed reader takes, naming the add-on that would. */
+	formatError( filename ) {
+
+		const addOn = ADDON_FORMATS[ filename.split( '.' ).pop().toLowerCase() ];
+		return new Error( addOn
+			? `${filename}: this format is read by ${addOn.addOn} — install it with ${addOn.install}`
+			: `Unsupported file format: ${filename}` );
 
-		return new Promise( ( resolve, reject ) => {
+	}
 
-			const reader = new FileReader();
-			reader.onload = ( event ) => resolve( event.target.result );
-			reader.onerror = ( error ) => reject( error );
-			reader.readAsArrayBuffer( file );
+	/** @see ArchiveImporter#inspectArchive */
+	async inspectArchive( file ) {
 
-		} );
+		const archives = await this._archiveImporter();
+		if ( ! archives ) throw this.formatError( file.name ?? 'archive.zip' );
+		return await archives.inspectArchive( file );
 
 	}
 
-	readFileAsText( file ) {
+	/** @see ArchiveImporter#flushPendingGraph */
+	flushPendingGraph( buildMs ) {
 
-		return new Promise( ( resolve, reject ) => {
+		this.archives?.flushPendingGraph( buildMs );
 
-			const reader = new FileReader();
-			reader.onload = ( event ) => resolve( event.target.result );
-			reader.onerror = ( error ) => reject( error );
-			reader.readAsText( file );
+	}
 
-		} );
+	// Blob's own readers, not FileReader: Node has no FileReader.
+	readFileAsArrayBuffer( file ) {
+
+		return file.arrayBuffer();
+
+	}
+
+	readFileAsText( file ) {
+
+		return file.text();
 
 	}
 
@@ -379,7 +421,7 @@ export class AssetLoader extends EventDispatcher {
 
 		const filename = file.name;
 		const format = this.getFileFormat( filename );
-		if ( ! format ) throw new Error( `Unsupported file format: ${filename}` );
+		if ( ! format ) throw this.formatError( filename );
 
 		updateLoading( { isLoading: true, status: `Loading ${format.name}...`, progress: 2 } );
 		try {
@@ -390,7 +432,7 @@ export class AssetLoader extends EventDispatcher {
 				case 'model': result = await this.loadModelFromFile( file, filename ); break;
 				case 'environment':
 				case 'image': result = await this.loadEnvironmentFromFile( file, filename ); break;
-				case 'archive': result = await this.loadArchiveFromFile( file, filename, options ); break;
+				case 'archive': result = await ( await this._archiveImporter() ).loadArchiveFromFile( file, filename, options ); break;
 				default: throw new Error( `Unknown asset type: ${format.type}` );
 
 			}
@@ -416,7 +458,7 @@ export class AssetLoader extends EventDispatcher {
 	async loadAssetFromUrl( url, options = {} ) {
 
 		const { filename = nameFromUrl( url ), cacheKey = url, cachePolicy, ...loadOptions } = options;
-		if ( ! this.getFileFormat( filename ) ) throw new Error( `Unsupported file format: ${filename}` );
+		if ( ! this.getFileFormat( filename ) ) throw this.formatError( filename );
 
 		this._loadCancelled = false;
 		const cancelable = AssetLoader._isNetworkUrl( url );
@@ -476,23 +518,36 @@ export class AssetLoader extends EventDispatcher {
 	async _loadModelFileByExtension( file, filename ) {
 
 		const extension = filename.split( '.' ).pop().toLowerCase();
-		const arrayBuffer = await this.readFileAsArrayBuffer( file );
-
-		switch ( extension ) {
-
-			case 'glb':
-			case 'gltf': return await this.loadGLBFromArrayBuffer( arrayBuffer, filename );
-			case 'fbx': return await this.loadFBXFromArrayBuffer( arrayBuffer, filename );
-			case 'obj': return await this.loadOBJFromFile( file, filename );
-			case 'stl': return await this.loadSTLFromArrayBuffer( arrayBuffer, filename );
-			case 'ply': return await this.loadPLYFromArrayBuffer( arrayBuffer, filename );
-			case 'dae': return await this.loadColladaFromFile( file, filename );
-			case '3mf': return await this.load3MFFromArrayBuffer( arrayBuffer, filename );
-			case 'usd':
-			case 'usda':
-			case 'usdc':
-			case 'usdz': return await this.loadUSDFromArrayBuffer( arrayBuffer, filename );
-			default: throw new Error( `Support for ${extension} files is not yet implemented` );
+		if ( extension === 'glb' || extension === 'gltf' ) return await this.loadGLBFromArrayBuffer( await this.readFileAsArrayBuffer( file ), filename );
+
+		const format = this._formats.get( extension );
+		if ( format?.type !== 'model' ) throw this.formatError( filename );
+		return await this._loadModelWithFormat( format, file, filename );
+
+	}
+
+	async _loadModelWithFormat( format, file, filename ) {
+
+		try {
+
+			updateLoading( { isLoading: true, status: `Processing ${format.label} Data...`, progress: 5 } );
+			await new Promise( r => setTimeout( r, 0 ) );
+
+			const { model, result = model } = await format.parse( file, { filename, cache: this.loaderCache } );
+			this.releaseTargetModel();
+			this.targetModel = model;
+
+			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
+			await this.onModelLoad( this.targetModel );
+
+			this.dispatchEvent( { type: 'load', model, filename } );
+			return result;
+
+		} catch ( error ) {
+
+			console.error( `Error loading ${format.label}:`, error );
+			this.dispatchEvent( { type: 'error', message: error.message, filename } );
+			throw error;
 
 		}
 
@@ -612,7 +667,17 @@ export class AssetLoader extends EventDispatcher {
 
 	}
 
-	async loadEnvironmentByExtension( url, extension ) {
+	/**
+	 * @param {string} url
+	 * @param {string} extension
+	 * @param {{loader?: Object}} [options] - a three.js loader to read the file with, for a format nothing registered
+	 */
+	async loadEnvironmentByExtension( url, extension, { loader = null } = {} ) {
+
+		const format = this._formats.get( extension );
+		if ( ! loader && format?.type === 'environment' ) loader = this.loaderCache[ extension ] ??= await format.createLoader( this._loadingManager );
+		if ( ! loader && extension === 'hdr' ) loader = this.loaderCache.hdr ??= new HDRLoader( this._loadingManager ).setDataType( FloatType );
+		if ( ! loader && ADDON_FORMATS[ extension ] ) throw this.formatError( `environment.${extension}` );
 
 		const cancelable = AssetLoader._isNetworkUrl( url );
 		const status = "Downloading Environment...";
@@ -622,11 +687,8 @@ export class AssetLoader extends EventDispatcher {
 		let texture;
 		try {
 
-			if ( extension === 'hdr' || extension === 'exr' ) {
+			if ( loader ) {
 
-				const loader = extension === 'hdr'
-					? ( this.loaderCache.hdr || ( this.loaderCache.hdr = new HDRLoader( this._loadingManager ).setDataType( FloatType ) ) )
-					: ( this.loaderCache.exr || ( this.loaderCache.exr = new EXRLoader( this._loadingManager ).setDataType( FloatType ) ) );
 				texture = await loader.loadAsync( source.url, onProgress );
 
 			} else if ( getPlatform().decodeImage ) {
@@ -666,1753 +728,246 @@ export class AssetLoader extends EventDispatcher {
 
 	}
 
-	// Archive handling
-	/** First bytes of a file, without pulling the whole thing into memory. */
-	async _readHead( file, bytes = 512 ) {
+	// Returns a fresh loader each call — the DRACOLoader/KTX2Loader a file needs hold persistent
+	// worker pools. Callers must invoke _disposeGLTFLoader() to terminate them.
+	async createGLTFLoader() {
 
-		if ( file instanceof Uint8Array ) return file.subarray( 0, bytes );
-		if ( typeof file.slice === 'function' && typeof file.arrayBuffer === 'function' ) {
+		const loader = decodersOnDemand( new GLTFLoader( this._loadingManager ), this.renderer );
+		const onImageFailure = ( where, error ) => this._reportImageFailure( where, error );
+		if ( getPlatform().decodeImage ) loader.register( ( parser ) => platformImagesPlugin( parser, onImageFailure ) );
+		else if ( ! hasImageDecoder() ) loader.register( ( parser ) => missingImageDecoderPlugin( parser, onImageFailure ) );
+		loader.register( ( parser ) => diffuseTransmissionPlugin( parser ) );
 
-			return new Uint8Array( await file.slice( 0, bytes ).arrayBuffer() );
+		return loader;
 
-		}
+	}
 
-		return new Uint8Array( ( await this.readFileAsArrayBuffer( file ) ).slice( 0, bytes ) );
+	// GLTFLoader swallows the failure and loads the model untextured, so a strict host's throw is kept
+	// for the end of the load (_throwDeferred).
+	_reportImageFailure( where, error ) {
 
-	}
+		try {
 
-	/**
-	 * Enumerates a TAR/TAR.GZ archive without keeping any of it, so a caller can offer a
-	 * choice before committing memory. ZIP archives are random-access and report directly.
-	 * @returns {Promise<{kind:string, root:string|null, elements:Array, entryCount:number, totalBytes:number}>}
-	 */
-	async inspectArchive( file ) {
+			this._issues?.record(
+				ISSUE_CODES.TEXTURE_BUILD_FAILED,
+				`image ${where} could not be decoded (${error?.message ?? error}) — the surfaces using it render untextured`,
+				{ image: where, cause: String( error?.message ?? error ) }
+			);
 
-		const kind = detectArchiveKind( await this._readHead( file ) );
-		const scanning = p => updateLoading( {
-			isLoading: true, status: `Scanning archive… ${( p.bytes / 1e9 ).toFixed( 1 )} GB`, progress: 4
-		} );
+		} catch ( strictError ) {
+
+			this._deferredError ??= strictError;
 
-		let listing;
-		if ( kind === 'gzip' ) {
+		}
 
-			const unpacked = await this._unpackGzip( file, file.name );
-			if ( unpacked ) {
+	}
 
-				listing = unpacked.index.listing;
-				unpacked.release();
+	_throwDeferred() {
 
-			} else {
+		const error = this._deferredError;
+		this._deferredError = null;
+		if ( error ) throw error;
 
-				( { listing } = await readTarGz( file, { filter: () => false, onProgress: scanning } ) );
+	}
 
-			}
+	_disposeGLTFLoader( loader ) {
+
+		if ( ! loader ) return;
+		loader.dracoLoader?.dispose();
+		loader.ktx2Loader?.dispose();
 
-		} else if ( kind === 'tar' ) {
+	}
 
-			listing = ( await loadTarIndex( file, this.storage ) )?.listing ?? await indexTarHeaders( file, { onProgress: scanning } );
+	async loadExampleModels( index, modelFiles ) {
 
-		} else {
+		if ( ! modelFiles || ! modelFiles[ index ] ) {
 
-			listing = ( await readZipDirectory( file ) ).map( e => ( { path: e.name, size: e.size } ) );
+			throw new Error( `No model file at index ${index}` );
 
 		}
 
-		const { root, elements } = listArchiveElements( listing );
-		return {
-			kind: kind ?? 'zip', root, elements,
-			entryCount: listing.length,
-			totalBytes: listing.reduce( ( n, e ) => n + e.size, 0 )
-		};
+		const modelUrl = `${modelFiles[ index ].url}`;
+		return await this.loadModel( modelUrl );
 
 	}
 
 	/**
-	 * A .tar.gz unpacked to storage, or null to read it the old way (no storage, or no room).
-	 * @private
+	 * @param {string} modelUrl
+	 * @param {{cacheKey?: string, cachePolicy?: string}} [options] - key a download cache entry by
+	 *   something steadier than a signed, expiring URL
 	 */
-	async _unpackGzip( file, filename ) {
+	async loadModel( modelUrl, options = {} ) {
+
+		this._loadCancelled = false;
+		const loader = await this.createGLTFLoader();
+		const cancelable = AssetLoader._isNetworkUrl( modelUrl );
+		let source = null;
 
 		try {
 
-			return await unpackTarGz( file, {
-				storage: this.storage,
-				label: filename,
-				onProgress: bytes => updateLoading( {
-					isLoading: true, status: `Unpacking archive… ${( bytes / 1e9 ).toFixed( 1 )} GB`, progress: 4
-				} ),
-			} );
+			updateLoading( { isLoading: true, status: "Downloading Model...", progress: 2, canCancel: cancelable, loadedBytes: 0, totalBytes: 0 } );
+			source = await this._viaCache( modelUrl, "Downloading Model...", cancelable, options );
+			if ( source.cached ) loader.setResourcePath( LoaderUtils.extractUrlBase( modelUrl ) );
+			const data = await withHostWorker( () => loader.loadAsync( source.url, source.cached ? undefined : this._downloadProgress( "Downloading Model...", cancelable ) ) );
+			this._downloadComplete();
+			this._throwDeferred();
+
+			this.releaseTargetModel();
+			this._sourceKey = cancelable ? this._keyed( 'url', options.cacheKey ?? modelUrl ) : null;
+
+			this.targetModel = data.scene;
+			this.animations = data.animations || [];
+			this.sceneMetadata = extractSceneMetadata( data );
+			await this.onModelLoad( this.targetModel );
+			this.dispatchEvent( { type: 'load', model: data.scene, filename: modelUrl.split( '/' ).pop() } );
+			return data;
 
 		} catch ( error ) {
 
-			// A corrupt stream fails the same way in memory, where the error reads better.
-			console.warn( `Unpacking "${filename}" to storage failed, reading it in memory: ${error.message}` );
-			return null;
+			if ( this._isCancellation( error ) ) throw this._cancellationError();
+			console.error( "Error loading model:", error );
+			this.dispatchEvent( { type: 'error', message: error.message, filename: modelUrl } );
+			throw error;
 
-		}
+		} finally {
 
-	}
+			source?.release();
+			this._disposeGLTFLoader( loader );
 
-	/**
-	 * @param {File|Blob} file
-	 * @param {string} filename
-	 * @param {object} [options]
-	 * @param {string} [options.pbrtEntry] - which .pbrt to load when the archive holds several
-	 *   independent scenes; the issue log lists what else was available.
-	 * @param {string|string[]} [options.element] - path prefix of one subtree to load on its own,
-	 *   or several to load together, as reported by `inspectArchive()`. Everything above them
-	 *   (scene file, materials, textures) comes along; subtrees left out are skipped without ever
-	 *   being held in memory, and the Includes that point at them only warn.
-	 * @param {number} [options.byteBudget] - cap on retained bytes when no element is chosen.
-	 * @param {number} [options.promptBytes] - size past which a multi-part archive asks which
-	 *   parts to load instead of taking all of them.
-	 * @param {number} [options.maxTriangles] - stop past this many STORED triangles.
-	 * @param {number} [options.maxPlacements] - stop past this many instance placements.
-	 * @param {number} [options.mergeShapesAbove] - merge small non-instanced shapes past this count.
-	 * @param {number} [options.curveSteps] - samples per spline span when tessellating curves.
-	 * @param {number} [options.curveSides] - 1 ribbon, 2 crossed ribbons, >=3 closed tube.
-	 * @param {number} [options.curveTolerance] - how far a curve strip may stray from the curve, as a
-	 *   fraction of its half-width (default 0.05); 0 samples every span `curveSteps` times.
-	 * @param {boolean} [options.instanceIncludes] - place a file included again under the same
-	 *   material as another instance of its first reading (default true).
-	 */
-	async loadArchiveFromFile( file, filename, { pbrtEntry = null, element = null, byteBudget, promptBytes, ...pbrt } = {} ) {
+		}
 
-		try {
+	}
 
-			const kind = detectArchiveKind( await this._readHead( file ) );
-			const archiveId = this.storage ? identityKey( await fileIdentity( file ) ) : null;
-			const lazy = { element, promptBytes, pbrtEntry, pbrt, archiveId };
+	// ─────────────────────────────────────────────────────────────
+	// Append / remove primitives (dynamic object add/remove).
+	// These deliberately do NOT touch targetModel/animations and do NOT
+	// reframe the camera or dispatch load/modelProcessed — the caller
+	// (PathTracerApp) drives a reframe-free scene rebuild.
+	// ─────────────────────────────────────────────────────────────
 
-			// A seekable archive is indexed rather than read: entries are pulled out as the scene
-			// asks for them and never all held at once. That is the difference between a 7 GB archive
-			// being refused and loading. A .tar.gz becomes seekable by unpacking it to storage.
-			if ( kind === 'tar' ) return await this._loadSeekable( file, filename, lazy );
+	// Multi-material split + area-light placeholders, then parent into meshScene.
+	_processAndParent( model ) {
 
-			if ( kind === 'gzip' ) {
+		this.processModelObjects( model );
+		this.scene.add( model );
+		// Refresh world matrices for the whole subtree — the reframe-free rebuild
+		// extracts geometry immediately (rAF is gated off), so nothing else would
+		// update matrices first and any ancestor-node transform would be dropped.
+		model.updateMatrixWorld( true );
 
-				const unpacked = await this._unpackGzip( file, filename );
-				if ( unpacked ) {
+	}
 
-					try {
+	// Append a model from URL without releasing prior models or reframing.
+	// Reuses createGLTFLoader() so appended KTX2 textures stay RGBA DataArrayTexture.
+	async appendModel( url, options = {} ) {
 
-						return await this._loadSeekable( unpacked.file, filename, { ...lazy, index: unpacked.index } );
+		this._loadCancelled = false;
+		const loader = await this.createGLTFLoader();
+		const cancelable = AssetLoader._isNetworkUrl( url );
+		let source = null;
 
-					} finally {
+		try {
 
-						unpacked.release();
+			updateLoading( { isLoading: true, status: "Downloading Model...", progress: 2, canCancel: cancelable, loadedBytes: 0, totalBytes: 0 } );
+			source = await this._viaCache( url, "Downloading Model...", cancelable, options );
+			if ( source.cached ) loader.setResourcePath( LoaderUtils.extractUrlBase( url ) );
+			const data = await withHostWorker( () => loader.loadAsync( source.url, source.cached ? undefined : this._downloadProgress( "Downloading Model...", cancelable ) ) );
+			this._downloadComplete();
+			this._throwDeferred();
+			this._appended = true;
+			this._processAndParent( data.scene );
+			return { root: data.scene, animations: data.animations || [] };
 
-					}
+		} catch ( error ) {
 
-				}
+			if ( this._isCancellation( error ) ) throw this._cancellationError();
+			throw error;
 
-				const entries = await this._readStreamedArchive( file, filename, kind, element, byteBudget );
+		} finally {
 
-				// A pbrt scene archive takes priority — it owns its own geometry/texture refs.
-				if ( pickEntryPath( entries ) ) return await this.loadPBRTFromZip( entries, filename, pbrtEntry, pbrt );
-				const result = await this._loadNonPBRTArchive( entries, filename );
-				this._sourceKey = this._keyed( 'archive', archiveId );
-				return result;
+			source?.release();
+			this._disposeGLTFLoader( loader );
 
-			}
+		}
 
-			return await this._loadSeekable( file, filename, { ...lazy, zip: true } );
+	}
 
-		} catch ( error ) {
+	// Append a copy of a caller-owned Object3D without releasing prior models or reframing.
+	appendObject3D( object3d, name = 'object3d' ) {
 
-			if ( error?.code !== 'ARCHIVE_NEEDS_ELEMENT' ) console.error( 'Error loading archive:', error );
-			throw error;
+		this._appended = true;
 
-		}
+		const root = this._adoptExternalObject( object3d );
+		root.name = object3d.name || name;
+		this._processAndParent( root );
+		return { root };
 
 	}
 
-	async _loadNonPBRTArchive( entries, filename ) {
+	// Detach + dispose a model root. An adopted root's geometry/materials belong to the
+	// caller, so only the engine's own allocations go.
+	removeModelRoot( root ) {
 
-		const result = await this.processObjMtlPairsInZip( entries, filename );
-		if ( result ) return result;
-		return await this.findAndLoadModelFromZip( entries, filename );
+		if ( ! root ) return;
 
-	}
+		if ( root.userData.__rayzeeExternal ) {
 
-	/**
-	 * Loads a seekable archive — a .tar (or a .tar.gz unpacked to one) or a .zip — reading each
-	 * entry only when the scene asks for it.
-	 * @private
-	 */
-	async _loadSeekable( file, filename, { element, promptBytes, pbrtEntry, pbrt, index = null, zip = false, archiveId = null } ) {
+			disposeEngineOwnedResources( root );
+			root.parent?.remove( root );
 
-		const source = await this._openSeekableArchive( file, filename, element, promptBytes, { index, zip } );
-		source.archiveId = archiveId;
-		source.elements = ( Array.isArray( element ) ? element : [ element ] ).filter( Boolean );
-		if ( source.listing.some( e => e.path.toLowerCase().endsWith( '.pbrt' ) ) ) {
+		} else {
 
-			return await this.loadPBRTFromZip( {}, filename, pbrtEntry, pbrt, source );
+			disposeObjectFromMemory( root );
 
 		}
 
-		// Not a pbrt scene: fall back to materialising it, which those paths still expect.
-		for ( const e of source.listing ) if ( e.offset !== undefined ) source.entries[ e.path ] ??= await source.read( e.path );
-		const result = await this._loadNonPBRTArchive( source.entries, filename );
-		this._sourceKey = this._keyed( 'archive', archiveId );
-		return result;
-
 	}
 
-	/**
-	 * The parsed scene stored for this archive and these options, decoded — its textures read back
-	 * out of the archive — or null.
-	 * @private
-	 */
-	async _loadStoredGraph( key, source, { imageFromBytes, envFromBytes } ) {
+	async loadGLBFromArrayBuffer( arrayBuffer, filename = 'model.glb' ) {
 
-		const area = this.storage?.area( ENGINE_AREAS.SCENES );
-		const entry = area ? await area.open( key ) : null;
-		if ( ! entry ) return null;
+		const loader = await this.createGLTFLoader();
 
-		const start = performance.now();
-		let failure = null;
 		try {
 
-			updateLoading( { isLoading: true, status: 'Opening the stored scene...', progress: 6 } );
-			const manifest = await entry.json( 'graph.json' );
-			const data = await entry.file( 'data.bin' );
-			const vfs = new VirtualFS( {}, source );
-			const decoded = await decodeSceneGraph( manifest, data, {
-				loadTexture: async ( path, loader ) => {
+			updateLoading( { isLoading: true, status: "Processing GLB Data...", progress: 5 } );
+			await new Promise( r => setTimeout( r, 0 ) );
 
-					const bytes = await vfs.readPath( path );
-					if ( ! bytes ) return null;
-					return loader === 'environment' ? envFromBytes( bytes, path ) : imageFromBytes( bytes, path );
+			const data = await withHostWorker( () => loader.parseAsync( arrayBuffer, '' ) );
+			this._throwDeferred();
 
-				},
-			} );
+			this.releaseTargetModel();
+
+			this.targetModel = data.scene;
+			this.animations = data.animations || [];
+			this.sceneMetadata = extractSceneMetadata( data );
+			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
+			await this.onModelLoad( this.targetModel );
 
-			return {
-				...decoded.stats,
-				group: decoded.root,
-				environment: decoded.environment ? { texture: decoded.environment } : null,
-				animations: decoded.animations,
-				report: null,
-				parseMs: 0,
-				buildMs: performance.now() - start,
-				fromStorage: true,
-			};
+			this.dispatchEvent( { type: 'load', model: data.scene, filename } );
+			return data;
 
 		} catch ( error ) {
 
-			failure = error;
-			return null;
+			console.error( 'Error loading GLB:', error );
+			this.dispatchEvent( { type: 'error', message: error.message, filename } );
+			throw error;
 
 		} finally {
 
-			entry.release();
-			if ( failure ) {
-
-				console.warn( `The stored scene could not be used, parsing the archive instead: ${failure.message}` );
-				this._issues?.warn( ISSUE_CODES.STORAGE_ENTRY_CORRUPT, `stored scene unusable: ${failure.message}`, { key } );
-				area.remove( key ).catch( () => {} );
-
-			}
+			this._disposeGLTFLoader( loader );
 
 		}
 
 	}
 
-	/**
-	 * Stores a freshly parsed scene for the next open. Encoded here, before onModelLoad or the
-	 * build touch it; written in the background.
-	 * @private
-	 */
-	_storeGraph( key, built, label ) {
-
-		const area = this.storage?.area( ENGINE_AREAS.SCENES );
-		if ( ! area ) return;
+	async loadObject3D( object3d, name = 'object3d' ) {
 
-		let encoded;
-		try {
+		this.releaseTargetModel();
 
-			encoded = encodeSceneGraph( built.group, {
-				environment: built.environment?.texture ?? null,
-				animations: built.animations ?? [],
-				stats: {
-					meshCount: built.meshCount, entryPath: built.entryPath, candidates: built.candidates, frames: built.frames,
-					warnings: built.warnings, triangleCount: built.triangleCount, placementCount: built.placementCount,
-					mergedShapes: built.mergedShapes, skippedForBudget: built.skippedForBudget, droppedNoTemplate: built.droppedNoTemplate,
-				},
-			} );
+		const model = this._adoptExternalObject( object3d );
+		model.name = object3d.name || name;
 
-		} catch ( error ) {
-
-			if ( error instanceof SceneGraphUnsupported ) console.info( `Scene not stored for next time: ${error.message}` );
-			else console.warn( 'Scene not stored for next time:', error );
-			return;
-
-		}
-
-		const pending = { key, encoded, label, parseMs: ( built.parseMs ?? 0 ) + ( built.buildMs ?? 0 ), triangles: built.triangleCount ?? null };
-
-		// A parse slow enough on its own is written now, during the build. Held until the build
-		// ends, it kept every array the build replaces alive with it — the float normals and the
-		// instance matrices, ~1 GB on the whole Moana subset, at the build's peak.
-		if ( worthStoring( pending.parseMs, encoded.byteLength ) ) this._writeGraph( area, pending );
-		else this._pendingGraph = pending;
-
-	}
-
-	/**
-	 * Writes the scene encoded at parse time once the build is done, when the whole cold load —
-	 * parse plus build — was slow enough to be worth it (decision D6).
-	 * @param {number} buildMs - the SceneProcessor build that followed the parse
-	 */
-	flushPendingGraph( buildMs ) {
-
-		const pending = this._pendingGraph;
-		this._pendingGraph = null;
-		const area = this.storage?.area( ENGINE_AREAS.SCENES );
-		if ( ! pending || ! area || ! worthStoring( pending.parseMs + buildMs, pending.encoded.byteLength ) ) return;
-		this._writeGraph( area, pending );
-
-	}
-
-	/** Writes an encoded graph in the background, letting each array go once it is on disk. @private */
-	_writeGraph( area, pending ) {
-
-		( async () => {
-
-			const writer = await area.create( pending.key, { label: `${pending.label} (scene)`, expectedBytes: pending.encoded.byteLength } );
-			if ( ! writer ) return;
-			try {
-
-				await writeSceneGraph( writer, pending.encoded, { release: true } );
-				await writer.commit( { triangles: pending.triangles } );
-
-			} catch ( error ) {
-
-				await writer.abort();
-				console.warn( 'Storing the scene failed:', error );
-
-			}
-
-		} )().catch( error => console.warn( 'Storing the scene failed:', error ) );
-
-	}
-
-	/**
-	 * Index a seekable archive without retaining it. Entries are read back from the File on
-	 * demand, so residency is the open include chain rather than the whole archive.
-	 *
-	 * Indexing is cheap and the whole archive is never held, but *parsing* all of it is not:
-	 * the scene that comes out is what runs the tab out of memory. So a large multi-part archive
-	 * stops here and asks which parts to load, the same as the streamed path does. The index is
-	 * already built at that point, so the question costs nothing.
-	 * @private
-	 */
-	async _openSeekableArchive( file, filename, element, promptBytes, { index = null, zip = false } = {} ) {
-
-		const chosen = Array.isArray( element ) ? element.filter( Boolean ) : ( element ? [ element ] : [] );
-		const filter = chosen.length ? elementFilter( chosen ) : null;
-
-		let source;
-		if ( zip ) {
-
-			source = await openZip( file, { filter } );
-
-		} else {
-
-			const saved = index ?? await loadTarIndex( file, this.storage );
-			source = await openTar( file, {
-				index: saved,
-				headersOnly: true,
-				filter,
-				onProgress: p => updateLoading( {
-					isLoading: true, status: `Indexing archive… ${( p.bytes / 1e9 ).toFixed( 1 )} GB`, progress: 4
-				} ),
-			} );
-			if ( ! saved ) saveTarIndex( file, this.storage, source.index ).catch( () => {} );
-
-		}
-
-		const totalBytes = source.listing.reduce( ( n, e ) => n + e.size, 0 );
-
-		if ( chosen.length === 0 ) this._requireElementChoice( filename, source.listing, totalBytes, promptBytes );
-
-		console.info(
-			`Archive "${filename}": indexed ${source.indexed} entries, ` +
-			`${( totalBytes / 1e9 ).toFixed( 1 )} GB, none resident` +
-			( chosen.length ? `, ${chosen.length} part${chosen.length > 1 ? 's' : ''} selected.` : '.' )
-		);
-
-		return source;
-
-	}
-
-	/**
-	 * Stop and ask which parts to load, when the archive is big enough that the answer matters
-	 * and it actually has parts to choose between. Not a capability limit — selecting every part
-	 * is a valid answer and loads the whole scene.
-	 * @private
-	 */
-	_requireElementChoice( filename, listing, totalBytes, promptBytes = ARCHIVE_ELEMENT_PROMPT_BYTES ) {
-
-		if ( totalBytes < promptBytes ) return;
-
-		const { root, elements } = listArchiveElements( listing );
-		if ( elements.length < 2 ) return;
-
-		const error = new Error(
-			`"${filename}" holds ${( totalBytes / 1e9 ).toFixed( 1 )} GB across ${elements.length} parts. ` +
-			'Choose which to load — loading all of them at once may exhaust memory.'
-		);
-		error.code = 'ARCHIVE_NEEDS_ELEMENT';
-		error.root = root;
-		error.elements = elements;
-		error.totalBytes = totalBytes;
-
-		// Logged as a warning on purpose: recording an ERROR makes a strict host throw an
-		// EngineIssueError from inside record(), and the caller never learns which parts it
-		// could have chosen. The typed throw below is the refusal, and it carries the list.
-		this._issues?.record(
-			ISSUE_CODES.ASSET_ARCHIVE_TOO_LARGE,
-			`archive holds ${( totalBytes / 1e9 ).toFixed( 1 )} GB across ${elements.length} parts; choose which to load`,
-			{ root, elements: elements.map( e => e.prefix ), totalBytes },
-			ISSUE_SEVERITY.WARNING
-		);
-
-		throw error;
-
-	}
-
-	async _readStreamedArchive( file, filename, kind, element, byteBudget ) {
-
-		const chosen = Array.isArray( element ) ? element.filter( Boolean ) : ( element ? [ element ] : [] );
-		const { entries, listing, retainedBytes, truncated } = await readTarGz( file, {
-			filter: chosen.length ? elementFilter( chosen ) : null,
-			...( byteBudget === undefined ? {} : { byteBudget } ),
-			onProgress: p => updateLoading( {
-				isLoading: true,
-				status: `Reading archive… ${( p.bytes / 1e9 ).toFixed( 1 )} GB`,
-				progress: 4
-			} )
-		} );
-
-		// Choosing every part is a valid answer, so a selection is not refused again for being
-		// large: the read budget exists to stop an unasked-for whole-archive load. Past this
-		// point the scene's own memory preflight is what refuses, with a figure to act on.
-		if ( truncated && chosen.length === 0 ) {
-
-			const { root, elements } = listArchiveElements( listing );
-			const total = listing.reduce( ( n, e ) => n + e.size, 0 );
-			const error = new Error(
-				`"${filename}" unpacks to ${( total / 1e9 ).toFixed( 1 )} GB, past the load budget. ` +
-				`Load one of its ${elements.length} parts instead.`
-			);
-			error.code = 'ARCHIVE_NEEDS_ELEMENT';
-			error.root = root;
-			error.elements = elements;
-			error.totalBytes = total;
-			// Warning, not error: a strict host's throw from record() would replace the typed
-			// error below and take the part list with it.
-			this._issues?.record(
-				ISSUE_CODES.ASSET_ARCHIVE_TOO_LARGE,
-				`archive unpacks to ${( total / 1e9 ).toFixed( 1 )} GB; choose one of ${elements.length} parts`,
-				{ root, elements: elements.map( e => e.prefix ), totalBytes: total },
-				ISSUE_SEVERITY.WARNING
-			);
-			throw error;
-
-		}
-
-		if ( truncated ) {
-
-			const keep = elementFilter( chosen );
-			const missing = listing.filter( e => keep( e.path, e.size ) && ! entries[ e.path ] ).length;
-			this._issues?.record(
-				ISSUE_CODES.ASSET_ARCHIVE_TOO_LARGE,
-				`${missing} files of the chosen parts were left out: they did not fit the ${( ( byteBudget ?? 1.5e9 ) / 1e9 ).toFixed( 1 )} GB in-memory read budget`,
-				{ elements: chosen, missing, retainedBytes },
-				ISSUE_SEVERITY.WARNING
-			);
-
-		}
-
-		if ( chosen.length ) {
-
-			console.info(
-				`Archive "${filename}": loaded ${chosen.map( c => `"${c}"` ).join( ', ' )} — ` +
-				`${Object.keys( entries ).length} of ${listing.length} files, ${( retainedBytes / 1048576 ).toFixed( 1 )} MB.`
-			);
-
-		}
-
-		return entries;
-
-	}
-
-	/**
-	 * Loads a pbrt-v4 scene from an unzipped archive. Parses the entry .pbrt
-	 * (following Include/Import), builds a THREE.Group, sets the infinite light
-	 * as the scene environment, and runs the standard onModelLoad pipeline.
-	 * @param {Object<string, Uint8Array>} zip - unzipped entries (path → bytes); consumed, entry by entry
-	 * @param {string} filename - original archive name (for display/events)
-	 */
-	async loadPBRTFromZip( zip, filename, entryPath = null, options = {}, source = null ) {
-
-		updateLoading( { isLoading: true, status: 'Parsing PBRT scene...', progress: 5 } );
-
-		// Geometry decoder — reuse the cached PLYLoader (pbrt leans on .ply meshes).
-		if ( ! this.loaderCache.ply ) {
-
-			const { PLYLoader } = await import( 'three/examples/jsm/loaders/PLYLoader.js' );
-			this.loaderCache.ply = new PLYLoader();
-
-		}
-
-		const plyParser = ( buf ) => this.loaderCache.ply.parse( buf );
-
-		// Texture maps — decode by extension (pbrt uses .png/.jpg but also .exr/.hdr/.tga). Tagged
-		// with their archive path so a stored scene can read them back instead of keeping pixels.
-		const imageFromBytes = async ( bytes, fname ) => {
-
-			const texture = await this._pbrtTextureFromBytes( bytes, fname );
-			if ( texture ) texture.userData[ ARCHIVE_PATH ] = fname;
-			return texture;
-
-		};
-
-		// Infinite-light maps → HDR/EXR/LDR via the shared environment decoder.
-		const envFromBytes = async ( bytes, fname ) => {
-
-			const ext = fname.split( '.' ).pop().toLowerCase();
-			const blob = new Blob( [ bytes ] );
-			const url = URL.createObjectURL( blob );
-			try {
-
-				const texture = await this.loadEnvironmentByExtension( url, ext );
-				setEnvironmentSource( texture, `bytes:${await sampleHash( blob )}` );
-				texture.userData[ ARCHIVE_PATH ] = fname;
-				texture.userData[ ARCHIVE_LOADER ] = 'environment';
-				return texture;
-
-			} finally {
-
-				URL.revokeObjectURL( url );
-
-			}
-
-		};
-
-		const pbrtStart = performance.now();
-		const shape = {
-			animation: options.animation, maxTriangles: options.maxTriangles, maxPlacements: options.maxPlacements,
-			mergeShapesAbove: options.mergeShapesAbove, curveSteps: options.curveSteps, curveSides: options.curveSides,
-			curveTolerance: options.curveTolerance, instanceIncludes: options.instanceIncludes,
-		};
-		const graphKey = source?.archiveId
-			? this._keyed( `pbrt:${SCENE_GRAPH_FORMAT}.${PBRT_BUILD_REVISION}:${VERSION}`, `${source.archiveId}|${entryPath ?? ''}|${[ ...( source.elements ?? [] ) ].sort().join( ',' )}|${JSON.stringify( shape )}` )
-			: null;
-
-		const stored = graphKey ? await this._loadStoredGraph( graphKey, source, { imageFromBytes, envFromBytes } ) : null;
-		const built = stored ?? await loadPBRTScene( { vfs: zip, source, entryPath, plyParser, imageFromBytes, envFromBytes, ...shape } );
-
-		const { group, environment, animations, report, warnings, meshCount, entryPath: loadedEntry, candidates,
-			frames, parseMs, buildMs, triangleCount, placementCount, mergedShapes, skippedForBudget,
-			droppedNoTemplate } = built;
-		if ( stored ) console.info( `PBRT scene "${loadedEntry}" opened from storage in ${( buildMs / 1000 ).toFixed( 1 )} s, skipping the parse` );
-
-		// Phase breakdown for scaling work; the engine's own build timings live in
-		// SceneProcessor.performanceMetrics.
-		this.lastPBRTStats = {
-			parseMs, buildMs, loaderMs: performance.now() - pbrtStart,
-			triangleCount, placementCount, mergedShapes, skippedForBudget, droppedNoTemplate, meshCount,
-			frames: frames?.length ?? 1
-		};
-
-		// An archive can hold several independent scenes (bistro ships three views). Only one is
-		// loaded, so name it and the alternatives rather than leave the user comparing against a
-		// reference of a different scene. A frame sequence loads whole, as its animation.
-		const loaded = new Set( frames ?? [ loadedEntry ] );
-		const others = candidates.filter( p => ! loaded.has( p ) );
-		if ( others.length > 0 ) {
-
-			console.warn( `PBRT archive holds ${candidates.length} scenes; loaded "${loadedEntry}". Others: ${others.join( ', ' )}` );
-			this._issues?.record(
-				ISSUE_CODES.ASSET_AMBIGUOUS_ENTRY,
-				`archive holds ${candidates.length} pbrt scenes; loaded "${loadedEntry}"`,
-				{ loaded: loadedEntry, alternatives: others },
-				ISSUE_SEVERITY.WARNING
-			);
-
-		}
-
-		// Diagnostics — surface what each mesh resolved to (helps debug black/wrong materials).
-		if ( report && report.length && typeof console.table === 'function' ) {
-
-			const shown = report.length < meshCount ? ` (first ${report.length} of ${meshCount})` : '';
-			console.groupCollapsed( `PBRT loader: ${meshCount} mesh(es) from "${loadedEntry}"${shown}` );
-			console.table( report );
-			console.groupEnd();
-
-		}
-
-		if ( warnings && warnings.length ) {
-
-			console.warn( `PBRT loader: ${warnings.length} warning(s) parsing "${loadedEntry}"` );
-			warnings.forEach( w => console.warn( '  •', w ) );
-
-		}
-
-		// Infinite light → scene environment (CDF is built later in loadSceneData).
-		if ( environment?.texture ) {
-
-			environment.texture.generateMipmaps = true;
-			this.applyEnvironmentToScene( environment.texture );
-
-		}
-
-		group.name = loadedEntry || filename;
-		this.releaseTargetModel();
-		this._sourceKey = graphKey;
-		// Before onModelLoad and the build touch the new group.
-		if ( graphKey && ! stored ) this._storeGraph( graphKey, built, filename );
-		this.targetModel = group;
-		this.animations = animations ?? [];
-
-		// The light's own orientation and `scale` are already baked into the texture, so the
-		// scene is only correct at rotation 0 / intensity 1 — pinned, whatever the host's defaults.
-		if ( environment?.texture ) this.sceneMetadata = { environment: { rotation: 0, intensity: 1 } };
-
-		updateLoading( { isLoading: true, status: 'Processing PBRT geometry...', progress: 10 } );
-		await this.onModelLoad( this.targetModel );
-
-		this.dispatchEvent( { type: 'load', model: group, filename: `${loadedEntry} (from ZIP)` } );
-		return group;
-
-	}
-
-	/**
-	 * Decodes a pbrt texture map from raw bytes, picking a decoder by extension.
-	 * ImageBitmap can't handle EXR/HDR/TGA, which pbrt scenes use freely.
-	 * @param {Uint8Array} bytes
-	 * @param {string} fname
-	 * @returns {Promise<import('three').Texture>}
-	 */
-	async _pbrtTextureFromBytes( bytes, fname ) {
-
-		const ext = fname.split( '.' ).pop().toLowerCase();
-		let tex;
-
-		if ( ext === 'exr' || ext === 'hdr' ) {
-
-			const loader = ext === 'hdr'
-				? ( this.loaderCache.hdr || ( this.loaderCache.hdr = new HDRLoader().setDataType( FloatType ) ) )
-				: ( this.loaderCache.exr || ( this.loaderCache.exr = new EXRLoader().setDataType( FloatType ) ) );
-			tex = await this._loadViaObjectURL( loader, bytes );
-			// HDR/EXR maps are linear — leave colorSpace as the loader set it.
-
-		} else if ( ext === 'tga' ) {
-
-			if ( ! this.loaderCache.tga ) {
-
-				const { TGALoader } = await import( 'three/examples/jsm/loaders/TGALoader.js' );
-				this.loaderCache.tga = new TGALoader();
-
-			}
-
-			tex = await this._loadViaObjectURL( this.loaderCache.tga, bytes );
-			tex.colorSpace = SRGBColorSpace;
-
-		} else {
-
-			// png / jpg / webp / gif / bmp
-			const bitmap = await createImageBitmap( new Blob( [ bytes ] ) );
-			tex = new Texture( bitmap );
-			tex.colorSpace = SRGBColorSpace;
-
-		}
-
-		tex.wrapS = tex.wrapT = RepeatWrapping;
-		tex.needsUpdate = true;
-		return tex;
-
-	}
-
-	/** Decode bytes through a three loader's loadAsync via a transient object URL. */
-	async _loadViaObjectURL( loader, bytes ) {
-
-		const url = URL.createObjectURL( new Blob( [ bytes ] ) );
-		try {
-
-			return await loader.loadAsync( url );
-
-		} finally {
-
-			URL.revokeObjectURL( url );
-
-		}
-
-	}
-
-	async processObjMtlPairsInZip( zip, filename ) {
-
-		const objFiles = [];
-		const mtlFiles = [];
-
-		for ( const path in zip ) {
-
-			const lowerPath = path.toLowerCase();
-			if ( lowerPath.endsWith( '.obj' ) ) objFiles.push( { path, content: zip[ path ] } );
-			else if ( lowerPath.endsWith( '.mtl' ) ) mtlFiles.push( { path, content: zip[ path ] } );
-
-		}
-
-		if ( objFiles.length > 0 && mtlFiles.length > 0 ) {
-
-			console.log( `Found ${objFiles.length} OBJ files and ${mtlFiles.length} MTL files in ZIP` );
-			const matches = this.findMatchingObjMtlPairs( objFiles, mtlFiles );
-
-			if ( matches.length > 0 ) {
-
-				console.log( `Found ${matches.length} matching OBJ+MTL pairs` );
-				return await this.loadOBJMTLPairFromZip( matches[ 0 ].obj, matches[ 0 ].mtl, zip, filename );
-
-			}
-
-			if ( matches.length === 0 ) {
-
-				console.log( 'No matching pairs by name, using first OBJ and MTL files' );
-				return await this.loadOBJMTLPairFromZip( objFiles[ 0 ], mtlFiles[ 0 ], zip, filename );
-
-			}
-
-		}
-
-		return null;
-
-	}
-
-	findMatchingObjMtlPairs( objFiles, mtlFiles ) {
-
-		const matches = [];
-		for ( const objFile of objFiles ) {
-
-			const objBaseName = objFile.path.split( '/' ).pop().replace( /\.obj$/i, '' ).toLowerCase();
-
-			for ( const mtlFile of mtlFiles ) {
-
-				const mtlBaseName = mtlFile.path.split( '/' ).pop().replace( /\.mtl$/i, '' ).toLowerCase();
-				if ( objBaseName === mtlBaseName || objBaseName.includes( mtlBaseName ) || mtlBaseName.includes( objBaseName ) ) {
-
-					matches.push( { obj: objFile, mtl: mtlFile } );
-					break;
-
-				}
-
-			}
-
-		}
-
-		return matches;
-
-	}
-
-	async findAndLoadModelFromZip( zip ) {
-
-		const mainModelFiles = [
-			'scene.gltf', 'scene.glb', 'model.gltf', 'model.glb',
-			'main.gltf', 'main.glb', 'asset.gltf', 'asset.glb'
-		];
-
-		for ( const mainFile of mainModelFiles ) {
-
-			if ( zip[ mainFile ] ) {
-
-				console.log( `Found main model file: ${mainFile}` );
-				const extension = mainFile.split( '.' ).pop().toLowerCase();
-				return await this.loadModelFromZipEntry( zip[ mainFile ], mainFile, extension, zip );
-
-			}
-
-		}
-
-		for ( const path in zip ) {
-
-			const extension = path.split( '.' ).pop().toLowerCase();
-			if ( SUPPORTED_FORMATS[ extension ] && SUPPORTED_FORMATS[ extension ].type === 'model' ) {
-
-				// A loose layer is only one slice of a USD scene — hand the whole
-				// archive over so its references and payloads can resolve.
-				if ( USD_LAYER_RE.test( path ) ) return await this.loadUSDHierarchyFromZip( zip );
-
-				console.log( `Loading model file from ZIP: ${path}` );
-				return await this.loadModelFromZipEntry( zip[ path ], path, extension, zip );
-
-			}
-
-		}
-
-		throw new Error( 'No supported model files found in the ZIP archive' );
-
-	}
-
-	// USDLoader only builds a cross-layer asset map on its USDZ branch, so repack
-	// the archive as USDZ — root layer first, per AOUSD core spec 16.4.1.2 — and
-	// let the loader resolve the references/payloads itself.
-	async loadUSDHierarchyFromZip( zip ) {
-
-		const layers = Object.keys( zip ).filter( name => USD_LAYER_RE.test( name ) );
-		if ( layers.length === 0 ) throw new Error( 'No USD layers found in the ZIP archive' );
-
-		const root = AssetLoader._pickUSDRootLayer( layers );
-		console.log( `Loading USD scene from ZIP: ${root} (${layers.length} layers)` );
-
-		const packed = { [ root ]: [ zip[ root ], { level: 0 } ] };
-		for ( const name of Object.keys( zip ) ) {
-
-			if ( name === root ) continue;
-			if ( USD_LAYER_RE.test( name ) || USD_IMAGE_RE.test( name ) ) packed[ name ] = [ zip[ name ], { level: 0 } ];
-
-		}
-
-		return await this.loadUSDFromArrayBuffer( zipSync( packed ), root );
-
-	}
-
-	// Shallowest layer wins; among ties prefer the <dir>/<dir>.usd convention so a
-	// set's entry point beats its sibling variants.
-	static _pickUSDRootLayer( layers ) {
-
-		const depth = name => name.split( '/' ).length;
-		const minDepth = Math.min( ...layers.map( depth ) );
-		const candidates = layers.filter( name => depth( name ) === minDepth );
-
-		const conventional = candidates.find( name => {
-
-			const parts = name.split( '/' );
-			return parts.length > 1 && parts[ parts.length - 1 ].replace( USD_LAYER_RE, '' ) === parts[ parts.length - 2 ];
-
-		} );
-
-		return conventional || candidates[ 0 ];
-
-	}
-
-	async loadModelFromZipEntry( fileContent, filePath, extension, zipContents ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: `Processing ${extension.toUpperCase()} from ZIP...`, progress: 5 } );
-			const blob = new Blob( [ fileContent.buffer ], { type: 'application/octet-stream' } );
-			const blobUrl = URL.createObjectURL( blob );
-			let result;
-
-			switch ( extension ) {
-
-				case 'glb':
-				case 'gltf':
-					result = await this.handleGltfFromZip( extension, fileContent, filePath, zipContents );
-					break;
-				case 'fbx':
-					result = await this.loadFBXFromArrayBuffer( fileContent.buffer, filePath );
-					break;
-				case 'obj':
-					result = await this.handleObjFromZip( fileContent, filePath, zipContents );
-					break;
-				case 'stl':
-					result = await this.loadSTLFromArrayBuffer( fileContent.buffer, filePath );
-					break;
-				case 'ply':
-					result = await this.loadPLYFromArrayBuffer( fileContent.buffer, filePath );
-					break;
-				case 'dae':
-					{
-
-						const daeContent = strFromU8( fileContent );
-						const daeFile = new File( [ new Blob( [ daeContent ] ) ], filePath );
-						result = await this.loadColladaFromFile( daeFile, filePath );
-
-					}
-
-					break;
-				case '3mf':
-					result = await this.load3MFFromArrayBuffer( fileContent.buffer, filePath );
-					break;
-				case 'usd':
-				case 'usda':
-				case 'usdc':
-				case 'usdz':
-					result = await this.loadUSDFromArrayBuffer( fileContent, filePath );
-					break;
-				default:
-					throw new Error( `Support for ${extension} files is not yet implemented` );
-
-			}
-
-			URL.revokeObjectURL( blobUrl );
-			this.dispatchEvent( {
-				type: 'load',
-				model: this.targetModel,
-				filename: `${filePath} (from ZIP)`
-			} );
-			return result;
-
-		} catch ( error ) {
-
-			console.error( `Error loading ${extension} from ZIP:`, error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename: filePath } );
-			throw error;
-
-		}
-
-	}
-
-	async handleGltfFromZip( extension, fileContent, filePath, zipContents ) {
-
-		if ( extension === 'gltf' ) {
-
-			const gltfContent = strFromU8( fileContent );
-			const manager = new LoadingManager();
-			const gltfDir = filePath.split( '/' ).slice( 0, - 1 ).join( '/' );
-
-			manager.setURLModifier( url => this.resolveZipResource( url, gltfDir, zipContents ) );
-			const loader = await this.createGLTFLoader();
-			loader.manager = manager;
-
-			try {
-
-				return await new Promise( ( resolve, reject ) => {
-
-					loader.parse( gltfContent, '',
-						gltf => {
-
-							try {
-
-								this._throwDeferred();
-
-							} catch ( error ) {
-
-								reject( error );
-								return;
-
-							}
-
-							this.releaseTargetModel();
-							this.targetModel = gltf.scene;
-							this.sceneMetadata = extractSceneMetadata( gltf );
-							this.onModelLoad( this.targetModel ).then( () => resolve( gltf ) );
-
-						},
-						error => reject( error )
-					);
-
-				} );
-
-			} finally {
-
-				this._disposeGLTFLoader( loader );
-
-			}
-
-		} else {
-
-			return await this.loadGLBFromArrayBuffer( fileContent.buffer, filePath );
-
-		}
-
-	}
-
-	async handleObjFromZip( fileContent, filePath, zipContents ) {
-
-		const objContent = strFromU8( fileContent );
-		const mtlMatch = objContent.match( /mtllib\s+([^\s]+)/ );
-		let materials = null;
-
-		if ( mtlMatch && mtlMatch[ 1 ] ) {
-
-			materials = await this.loadMtlFromZip( mtlMatch[ 1 ], filePath, zipContents );
-
-		}
-
-		const { OBJLoader } = await import( 'three/examples/jsm/loaders/OBJLoader.js' );
-		const objLoader = new OBJLoader();
-		if ( materials ) objLoader.setMaterials( materials );
-
-		const object = objLoader.parse( objContent );
-		object.name = filePath;
-
-		this.releaseTargetModel();
-		this.targetModel = object;
-		await this.onModelLoad( this.targetModel );
-		return object;
-
-	}
-
-	// MTLLoader returns Texture objects whose `.image` only lands on a later tick, and
-	// SceneProcessor._bucketTextures drops any texture without one — so handing the model
-	// over before the maps decode renders the whole scene untextured. Replaces preload().
-	async preloadMtlTextures( materials ) {
-
-		const pending = [];
-		const loadTexture = materials.loadTexture.bind( materials );
-
-		materials.loadTexture = ( url, mapping, onLoad, onProgress, onError ) => {
-
-			let settle;
-			pending.push( new Promise( resolve => ( settle = resolve ) ) );
-			return loadTexture( url, mapping,
-				texture => {
-
-					settle();
-					onLoad?.( texture );
-
-				},
-				onProgress,
-				error => {
-
-					settle();
-					onError?.( error );
-
-				}
-			);
-
-		};
-
-		materials.preload();
-		if ( pending.length === 0 ) return materials;
-
-		let timer;
-		const decoded = await Promise.race( [
-			Promise.all( pending ).then( () => true ),
-			new Promise( resolve => ( timer = setTimeout( () => resolve( false ), MTL_TEXTURE_TIMEOUT_MS ) ) )
-		] );
-		clearTimeout( timer );
-
-		if ( ! decoded ) this._issues?.record(
-			ISSUE_CODES.TEXTURE_BUILD_FAILED,
-			`MTL textures did not decode within ${MTL_TEXTURE_TIMEOUT_MS}ms; affected materials render untextured`,
-			{ pending: pending.length }
-		);
-
-		return materials;
-
-	}
-
-	async loadMtlFromZip( mtlFilename, objPath, zipContents ) {
-
-		const objDir = objPath.split( '/' ).slice( 0, - 1 ).join( '/' );
-		const possibleMtlPaths = [
-			mtlFilename,
-			`${objDir}/${mtlFilename}`,
-			mtlFilename.split( '/' ).pop()
-		];
-
-		for ( const path of possibleMtlPaths ) {
-
-			if ( zipContents[ path ] ) {
-
-				const { MTLLoader } = await import( 'three/examples/jsm/loaders/MTLLoader.js' );
-				const mtlContent = strFromU8( zipContents[ path ] );
-				const manager = new LoadingManager();
-				manager.setURLModifier( url => this.resolveZipResource( url, objDir, zipContents ) );
-				const mtlLoader = new MTLLoader( manager );
-				const materials = mtlLoader.parse( mtlContent, objDir );
-				await this.preloadMtlTextures( materials );
-				return materials;
-
-			}
-
-		}
-
-		return null;
-
-	}
-
-	resolveZipResource( url, baseDir, zipContents ) {
-
-		const normalizedUrl = url.replace( /^\.\/|^\//, '' );
-		const possiblePaths = [
-			normalizedUrl,
-			`${baseDir}/${normalizedUrl}`,
-			normalizedUrl.split( '/' ).pop()
-		];
-
-		for ( const path of possiblePaths ) {
-
-			if ( zipContents[ path ] ) {
-
-				const fileBlob = new Blob( [ zipContents[ path ].buffer ], { type: 'application/octet-stream' } );
-				return URL.createObjectURL( fileBlob );
-
-			}
-
-		}
-
-		console.warn( `Resource not found in ZIP: ${url}` );
-		return url;
-
-	}
-
-	async loadOBJMTLPairFromZip( objFile, mtlFile, zip, filename ) {
-
-		const { MTLLoader } = await import( 'three/examples/jsm/loaders/MTLLoader.js' );
-		const { OBJLoader } = await import( 'three/examples/jsm/loaders/OBJLoader.js' );
-		const createdUrls = [];
-		const manager = new LoadingManager();
-		const objDir = objFile.path.split( '/' ).slice( 0, - 1 ).join( '/' );
-		const mtlDir = mtlFile.path.split( '/' ).slice( 0, - 1 ).join( '/' );
-
-		manager.setURLModifier( url => this.resolveTextureInZip( url, objDir, mtlDir, mtlFile, zip, createdUrls ) );
-		const mtlContent = this.prepareFixedMtlContent( mtlFile );
-		const materials = new MTLLoader( manager ).parse( mtlContent, mtlDir );
-		await this.preloadMtlTextures( materials );
-
-		const objLoader = new OBJLoader( manager );
-		objLoader.setMaterials( materials );
-		const objContent = strFromU8( objFile.content );
-		const object = objLoader.parse( objContent );
-
-		this.releaseTargetModel();
-		this.targetModel = object;
-		await this.onModelLoad( this.targetModel );
-
-		createdUrls.forEach( url => URL.revokeObjectURL( url ) );
-		this.dispatchEvent( {
-			type: 'load',
-			model: object,
-			filename: `${objFile.path} (from ${filename})`
-		} );
-
-		return object;
-
-	}
-
-	prepareFixedMtlContent( mtlFile ) {
-
-		const mtlContent = strFromU8( mtlFile.content );
-		return mtlContent
-			.replace( new RegExp( `${mtlFile.path.split( '/' ).pop()}\\s+`, 'g' ), ' ' )
-			.replace( /([a-zA-Z_]+)([\\/])/g, '$1 $2' );
-
-	}
-
-	resolveTextureInZip( url, objDir, mtlDir, mtlFile, zip, createdUrls ) {
-
-		const cleanUrl = url.split( '?' )[ 0 ].split( '#' )[ 0 ];
-		let normalizedUrl = cleanUrl.replace( /^\.\/|^\//, '' );
-
-		const mtlFilename = mtlFile.path.split( '/' ).pop();
-		if ( normalizedUrl.startsWith( mtlFilename ) ) {
-
-			normalizedUrl = normalizedUrl.substring( mtlFilename.length ).replace( /^\.\/|^\/|^\./, '' );
-
-		}
-
-		const possibleLocations = [
-			normalizedUrl,
-			`${objDir}/${normalizedUrl}`,
-			`${mtlDir}/${normalizedUrl}`,
-			`textures/${normalizedUrl}`,
-			`texture/${normalizedUrl}`,
-			`materials/${normalizedUrl}`,
-			normalizedUrl.split( '/' ).pop()
-		];
-
-		for ( const location of possibleLocations ) {
-
-			if ( zip[ location ] ) {
-
-				const blob = new Blob( [ zip[ location ].buffer ], { type: 'application/octet-stream' } );
-				const blobUrl = URL.createObjectURL( blob );
-				createdUrls.push( blobUrl );
-				return blobUrl;
-
-			}
-
-		}
-
-		return this.findTextureWithFuzzyMatch( normalizedUrl, zip, createdUrls ) || url;
-
-	}
-
-	findTextureWithFuzzyMatch( normalizedUrl, zip, createdUrls ) {
-
-		const textureFilename = normalizedUrl.split( '/' ).pop();
-
-		for ( const zipPath in zip ) {
-
-			if ( zipPath.endsWith( textureFilename ) ) {
-
-				const blob = new Blob( [ zip[ zipPath ].buffer ], { type: 'application/octet-stream' } );
-				const blobUrl = URL.createObjectURL( blob );
-				createdUrls.push( blobUrl );
-				return blobUrl;
-
-			}
-
-		}
-
-		if ( textureFilename && textureFilename.length > 5 ) {
-
-			for ( const zipPath in zip ) {
-
-				const zipFilename = zipPath.split( '/' ).pop();
-				if ( zipFilename.includes( textureFilename ) || textureFilename.includes( zipFilename ) ) {
-
-					const blob = new Blob( [ zip[ zipPath ].buffer ], { type: 'application/octet-stream' } );
-					const blobUrl = URL.createObjectURL( blob );
-					createdUrls.push( blobUrl );
-					return blobUrl;
-
-				}
-
-			}
-
-		}
-
-		return null;
-
-	}
-
-	// Returns a fresh loader each call — DRACOLoader/KTX2Loader hold persistent
-	// worker pools. Callers must invoke _disposeGLTFLoader() to terminate them.
-	async createGLTFLoader() {
-
-		const { dracoDecoderPath, ktx2TranscoderPath } = getAssetConfig();
-
-		const dracoLoader = new DRACOLoader();
-		dracoLoader.setDecoderConfig( { type: 'js' } );
-		dracoLoader.setDecoderPath( dracoDecoderPath );
-
-		const ktx2Loader = new KTX2Loader();
-		ktx2Loader.setTranscoderPath( ktx2TranscoderPath );
-
-		if ( this.renderer ) {
-
-			ktx2Loader.detectSupport( this.renderer );
-
-			// Force RGBA output for Basis Universal textures. GPU-compressed
-			// texture arrays (CompressedArrayTexture) are blocked by a Three.js
-			// TSL limitation: the node compiler maintains global state that
-			// survives dispose(), so swapping texture array formats between
-			// DataArrayTexture and CompressedArrayTexture at runtime causes
-			// WGSL compilation failures (unresolved uniform bindings).
-			ktx2Loader.workerConfig = {
-				astcSupported: false, etc1Supported: false, etc2Supported: false,
-				dxtSupported: false, bptcSupported: false, pvrtcSupported: false,
-			};
-
-		}
-
-		const loader = new GLTFLoader( this._loadingManager );
-		loader.setDRACOLoader( dracoLoader );
-		loader.setKTX2Loader( ktx2Loader );
-		loader.setMeshoptDecoder( MeshoptDecoder );
-		if ( getPlatform().decodeImage ) loader.register( ( parser ) => platformImagesPlugin( parser, ( where, error ) => this._reportImageFailure( where, error ) ) );
-
-		return loader;
-
-	}
-
-	// GLTFLoader swallows the failure and loads the model untextured, so a strict host's throw is kept
-	// for the end of the load (_throwDeferred).
-	_reportImageFailure( where, error ) {
-
-		try {
-
-			this._issues?.record(
-				ISSUE_CODES.TEXTURE_BUILD_FAILED,
-				`image ${where} could not be decoded — the surfaces using it render untextured`,
-				{ image: where, cause: String( error?.message ?? error ) }
-			);
-
-		} catch ( strictError ) {
-
-			this._deferredError ??= strictError;
-
-		}
-
-	}
-
-	_throwDeferred() {
-
-		const error = this._deferredError;
-		this._deferredError = null;
-		if ( error ) throw error;
-
-	}
-
-	_disposeGLTFLoader( loader ) {
-
-		if ( ! loader ) return;
-		loader.dracoLoader?.dispose();
-		loader.ktx2Loader?.dispose();
-
-	}
-
-	async loadExampleModels( index, modelFiles ) {
-
-		if ( ! modelFiles || ! modelFiles[ index ] ) {
-
-			throw new Error( `No model file at index ${index}` );
-
-		}
-
-		const modelUrl = `${modelFiles[ index ].url}`;
-		return await this.loadModel( modelUrl );
-
-	}
-
-	/**
-	 * @param {string} modelUrl
-	 * @param {{cacheKey?: string, cachePolicy?: string}} [options] - key a download cache entry by
-	 *   something steadier than a signed, expiring URL
-	 */
-	async loadModel( modelUrl, options = {} ) {
-
-		this._loadCancelled = false;
-		const loader = await this.createGLTFLoader();
-		const cancelable = AssetLoader._isNetworkUrl( modelUrl );
-		let source = null;
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Downloading Model...", progress: 2, canCancel: cancelable, loadedBytes: 0, totalBytes: 0 } );
-			source = await this._viaCache( modelUrl, "Downloading Model...", cancelable, options );
-			if ( source.cached ) loader.setResourcePath( LoaderUtils.extractUrlBase( modelUrl ) );
-			const data = await loader.loadAsync( source.url, source.cached ? undefined : this._downloadProgress( "Downloading Model...", cancelable ) );
-			this._downloadComplete();
-			this._throwDeferred();
-
-			this.releaseTargetModel();
-			this._sourceKey = cancelable ? this._keyed( 'url', options.cacheKey ?? modelUrl ) : null;
-
-			this.targetModel = data.scene;
-			this.animations = data.animations || [];
-			this.sceneMetadata = extractSceneMetadata( data );
-			await this.onModelLoad( this.targetModel );
-			this.dispatchEvent( { type: 'load', model: data.scene, filename: modelUrl.split( '/' ).pop() } );
-			return data;
-
-		} catch ( error ) {
-
-			if ( this._isCancellation( error ) ) throw this._cancellationError();
-			console.error( "Error loading model:", error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename: modelUrl } );
-			throw error;
-
-		} finally {
-
-			source?.release();
-			this._disposeGLTFLoader( loader );
-
-		}
-
-	}
-
-	// ─────────────────────────────────────────────────────────────
-	// Append / remove primitives (dynamic object add/remove).
-	// These deliberately do NOT touch targetModel/animations and do NOT
-	// reframe the camera or dispatch load/modelProcessed — the caller
-	// (PathTracerApp) drives a reframe-free scene rebuild.
-	// ─────────────────────────────────────────────────────────────
-
-	// Multi-material split + area-light placeholders, then parent into meshScene.
-	_processAndParent( model ) {
-
-		this.processModelObjects( model );
-		this.scene.add( model );
-		// Refresh world matrices for the whole subtree — the reframe-free rebuild
-		// extracts geometry immediately (rAF is gated off), so nothing else would
-		// update matrices first and any ancestor-node transform would be dropped.
-		model.updateMatrixWorld( true );
-
-	}
-
-	// Append a model from URL without releasing prior models or reframing.
-	// Reuses createGLTFLoader() so appended KTX2 textures stay RGBA DataArrayTexture.
-	async appendModel( url, options = {} ) {
-
-		this._loadCancelled = false;
-		const loader = await this.createGLTFLoader();
-		const cancelable = AssetLoader._isNetworkUrl( url );
-		let source = null;
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Downloading Model...", progress: 2, canCancel: cancelable, loadedBytes: 0, totalBytes: 0 } );
-			source = await this._viaCache( url, "Downloading Model...", cancelable, options );
-			if ( source.cached ) loader.setResourcePath( LoaderUtils.extractUrlBase( url ) );
-			const data = await loader.loadAsync( source.url, source.cached ? undefined : this._downloadProgress( "Downloading Model...", cancelable ) );
-			this._downloadComplete();
-			this._throwDeferred();
-			this._appended = true;
-			this._processAndParent( data.scene );
-			return { root: data.scene, animations: data.animations || [] };
-
-		} catch ( error ) {
-
-			if ( this._isCancellation( error ) ) throw this._cancellationError();
-			throw error;
-
-		} finally {
-
-			source?.release();
-			this._disposeGLTFLoader( loader );
-
-		}
-
-	}
-
-	// Append a copy of a caller-owned Object3D without releasing prior models or reframing.
-	appendObject3D( object3d, name = 'object3d' ) {
-
-		this._appended = true;
-
-		const root = this._adoptExternalObject( object3d );
-		root.name = object3d.name || name;
-		this._processAndParent( root );
-		return { root };
-
-	}
-
-	// Detach + dispose a model root. An adopted root's geometry/materials belong to the
-	// caller, so only the engine's own allocations go.
-	removeModelRoot( root ) {
-
-		if ( ! root ) return;
-
-		if ( root.userData.__rayzeeExternal ) {
-
-			disposeEngineOwnedResources( root );
-			root.parent?.remove( root );
-
-		} else {
-
-			disposeObjectFromMemory( root );
-
-		}
-
-	}
-
-	async loadGLBFromArrayBuffer( arrayBuffer, filename = 'model.glb' ) {
-
-		const loader = await this.createGLTFLoader();
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing GLB Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			const data = await loader.parseAsync( arrayBuffer, '' );
-			this._throwDeferred();
-
-			this.releaseTargetModel();
-
-			this.targetModel = data.scene;
-			this.animations = data.animations || [];
-			this.sceneMetadata = extractSceneMetadata( data );
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: data.scene, filename } );
-			return data;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading GLB:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		} finally {
-
-			this._disposeGLTFLoader( loader );
-
-		}
-
-	}
-
-	async loadFBXFromArrayBuffer( arrayBuffer, filename = 'model.fbx' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing FBX Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.fbx ) {
-
-				const { FBXLoader } = await import( 'three/examples/jsm/loaders/FBXLoader.js' );
-				this.loaderCache.fbx = new FBXLoader();
-
-			}
-
-			const object = this.loaderCache.fbx.parse( arrayBuffer );
-			this.releaseTargetModel();
-			this.targetModel = object;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: object, filename } );
-			return object;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading FBX:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async loadOBJFromFile( file, filename = 'model.obj' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing OBJ Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.obj ) {
-
-				const { OBJLoader } = await import( 'three/examples/jsm/loaders/OBJLoader.js' );
-				this.loaderCache.obj = new OBJLoader();
-
-			}
-
-			const contents = await this.readFileAsText( file );
-			const object = this.loaderCache.obj.parse( contents );
-			object.name = filename;
-
-			this.releaseTargetModel();
-			this.targetModel = object;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: object, filename } );
-			return object;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading OBJ:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async loadSTLFromArrayBuffer( arrayBuffer, filename = 'model.stl' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing STL Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.stl ) {
-
-				const { STLLoader } = await import( 'three/examples/jsm/loaders/STLLoader.js' );
-				this.loaderCache.stl = new STLLoader();
-
-			}
-
-			const geometry = this.loaderCache.stl.parse( arrayBuffer );
-			const material = new MeshStandardMaterial();
-			const mesh = new Mesh( geometry, material );
-			mesh.name = filename;
-
-			this.releaseTargetModel();
-			this.targetModel = mesh;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: mesh, filename } );
-			return mesh;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading STL:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async loadPLYFromArrayBuffer( arrayBuffer, filename = 'model.ply' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing PLY Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.ply ) {
-
-				const { PLYLoader } = await import( 'three/examples/jsm/loaders/PLYLoader.js' );
-				this.loaderCache.ply = new PLYLoader();
-
-			}
-
-			const geometry = this.loaderCache.ply.parse( arrayBuffer );
-			let object;
-
-			if ( geometry.index !== null ) {
-
-				const material = new MeshStandardMaterial();
-				object = new Mesh( geometry, material );
-
-			} else {
-
-				const material = new PointsMaterial( { size: 0.01 } );
-				material.vertexColors = geometry.hasAttribute( 'color' );
-				object = new Points( geometry, material );
-
-			}
-
-			object.name = filename;
-			this.releaseTargetModel();
-			this.targetModel = object;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: object, filename } );
-			return object;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading PLY:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async loadColladaFromFile( file, filename = 'model.dae' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing Collada Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.collada ) {
-
-				const { ColladaLoader } = await import( 'three/examples/jsm/loaders/ColladaLoader.js' );
-				this.loaderCache.collada = new ColladaLoader();
-
-			}
-
-			const contents = await this.readFileAsText( file );
-			const collada = this.loaderCache.collada.parse( contents );
-			collada.scene.name = filename;
-
-			this.releaseTargetModel();
-			this.targetModel = collada.scene;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: collada.scene, filename } );
-			return collada;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading Collada:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async load3MFFromArrayBuffer( arrayBuffer, filename = 'model.3mf' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing 3MF Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.threemf ) {
-
-				const { ThreeMFLoader } = await import( 'three/examples/jsm/loaders/3MFLoader.js' );
-				this.loaderCache.threemf = new ThreeMFLoader();
-
-			}
-
-			const object = this.loaderCache.threemf.parse( arrayBuffer );
-
-			this.releaseTargetModel();
-			this.targetModel = object;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: object, filename } );
-			return object;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading 3MF:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async loadUSDFromArrayBuffer( data, filename = 'model.usd' ) {
-
-		try {
-
-			updateLoading( { isLoading: true, status: "Processing USD Data...", progress: 5 } );
-			await new Promise( r => setTimeout( r, 0 ) );
-
-			if ( ! this.loaderCache.usd ) {
-
-				const { USDLoader } = await import( 'three/examples/jsm/loaders/USDLoader.js' );
-				this.loaderCache.usd = new USDLoader();
-
-			}
-
-			// parse() returns the group synchronously but resolves textures async;
-			// setupPathTracing snapshots materials, so maps must land before it runs.
-			const object = await new Promise( ( resolve, reject ) => {
-
-				this.loaderCache.usd.parse( data, '', resolve, reject );
-
-			} );
-
-			object.name = filename;
-
-			this.releaseTargetModel();
-			this.targetModel = object;
-
-			updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
-			await this.onModelLoad( this.targetModel );
-
-			this.dispatchEvent( { type: 'load', model: object, filename } );
-			return object;
-
-		} catch ( error ) {
-
-			console.error( 'Error loading USD:', error );
-			this.dispatchEvent( { type: 'error', message: error.message, filename } );
-			throw error;
-
-		}
-
-	}
-
-	async loadObject3D( object3d, name = 'object3d' ) {
-
-		this.releaseTargetModel();
-
-		const model = this._adoptExternalObject( object3d );
-		model.name = object3d.name || name;
-
-		this.targetModel = model;
+		this.targetModel = model;
 
 		updateLoading( { isLoading: true, status: "Processing Data...", progress: 10 } );
 		await this.onModelLoad( this.targetModel );
@@ -2438,7 +993,7 @@ export class AssetLoader extends EventDispatcher {
 		const center = box.getCenter( new Vector3() );
 		const size = box.getSize( new Vector3() );
 
-		this.controls.target.copy( center );
+		this.controls?.target.copy( center );
 
 		const maxDim = Math.max( size.x, size.y, size.z );
 		const fov = this.camera.fov * ( Math.PI / 180 );
@@ -2458,9 +1013,14 @@ export class AssetLoader extends EventDispatcher {
 		this.camera.near = maxDim / 100;
 		this.camera.far = maxDim * 100;
 		this.camera.updateProjectionMatrix();
-		this.controls.maxDistance = cameraDistance * 10;
-		this.controls.saveState();
-		this.controls.update();
+		if ( this.controls ) {
+
+			this.controls.maxDistance = cameraDistance * 10;
+			this.controls.saveState();
+			this.controls.update();
+
+		}
+
 		buildTimer.end( 'Camera setup' );
 
 		// Adjust floor plane
@@ -2616,7 +1176,7 @@ export class AssetLoader extends EventDispatcher {
 					const power = userData.intensity * areaLightPowerFactor( object, userData.width, userData.height, userData );
 					const light = new RectAreaLight(
 						new Color( ...userData.color ),
-						power * this._profile.areaLightIntensityScale,
+						power * this._areaLightIntensityScale(),
 						userData.width,
 						userData.height
 					);
@@ -2728,10 +1288,12 @@ export class AssetLoader extends EventDispatcher {
 
 	getSupportedFormats( type = null ) {
 
+		const formats = { ...CORE_FORMATS, ...this._archiveFormats };
+		for ( const [ extension, { type, name } ] of this._formats ) formats[ extension ] = { type, name };
 		if ( type ) {
 
 			const filtered = {};
-			for ( const [ ext, info ] of Object.entries( SUPPORTED_FORMATS ) ) {
+			for ( const [ ext, info ] of Object.entries( formats ) ) {
 
 				if ( info.type === type ) filtered[ ext ] = info;
 
@@ -2741,7 +1303,7 @@ export class AssetLoader extends EventDispatcher {
 
 		}
 
-		return SUPPORTED_FORMATS;
+		return formats;
 
 	}
 
@@ -2772,7 +1334,9 @@ export class AssetLoader extends EventDispatcher {
 		this._urlAbort = null;
 		this.storage = null;
 		this._downloads = null;
-		this._pendingGraph = null;
+		this.archives?.release();
+		this.archives = null;
+		this._archiveLoader = null;
 
 		this.releaseTargetModel();