rayzee 7.9.2 → 7.10.0

package/README.md

@@ -1,7 +1,7 @@
 # Rayzee Engine
 
 [![npm](https://img.shields.io/npm/v/rayzee?label=npm)](https://www.npmjs.com/package/rayzee)
-[![minzipped size](https://img.shields.io/badge/minzipped-163.8%20KB-blue)](https://www.npmjs.com/package/rayzee)
+[![minzipped size](https://img.shields.io/badge/minzipped-164.9%20KB-blue)](https://www.npmjs.com/package/rayzee)
 [![downloads](https://img.shields.io/npm/dw/rayzee?label=downloads)](https://www.npmjs.com/package/rayzee)
 [![jsDelivr](https://img.shields.io/jsdelivr/npm/hm/rayzee?label=jsDelivr)](https://www.jsdelivr.com/package/npm/rayzee)
 

package/dist/rayzee.es.js

@@ -9541,7 +9541,7 @@ var Lu = class extends $s {
 		super.setSize(e, t), this._rebuildKernelsIfResized(n, r);
 	}
 	_maybeReadbackCounters() {
-		if (this.cameraChanged) {
+		if (this.cameraChanged || this.cameraOptimizer?.isInInteractionMode()) {
 			this._readbackFrameCounter = this._readbackEveryNFrames;
 			return;
 		}
@@ -12812,12 +12812,47 @@ var Wd = {
 		type: "archive",
 		name: "ZIP Archive"
 	}
-}, Gd = class extends q {
+}, Gd = class e extends q {
 	constructor(e, t, n) {
-		super(), this.scene = e, this.camera = t, this.controls = n, this.targetModel = null, this._externalModel = null, this.floorPlane = null, this.sceneScale = 1, this.loaderCache = {}, this.uploadedFileInfo = null, this.animations = [], this.renderer = null;
+		super(), this.scene = e, this.camera = t, this.controls = n, this.targetModel = null, this._externalModel = null, this.floorPlane = null, this.sceneScale = 1, this.loaderCache = {}, this.uploadedFileInfo = null, this.animations = [], this.renderer = null, this._loadingManager = new ht(), this._loadCancelled = !1;
+	}
+	cancelActiveLoad() {
+		this._loadCancelled = !0, this._loadingManager.abort();
+	}
+	_isCancellation(e) {
+		return this._loadCancelled || e?.name === "AbortError" || e?.code === "LOAD_CANCELLED";
+	}
+	_cancellationError() {
+		let e = /* @__PURE__ */ Error("Load cancelled");
+		return e.code = "LOAD_CANCELLED", e;
+	}
+	_downloadProgress(e, t) {
+		return (n) => {
+			let r = n?.loaded || 0, i = n?.lengthComputable && n.total || 0;
+			ar({
+				isLoading: !0,
+				status: e,
+				loadedBytes: r,
+				totalBytes: i,
+				canCancel: !!t,
+				progress: i ? Math.min(60, 2 + Math.round(r / i * 58)) : 2
+			});
+		};
+	}
+	_downloadComplete(e = "Processing Data...", t = 62) {
+		ar({
+			status: e,
+			progress: t,
+			canCancel: !1,
+			loadedBytes: null,
+			totalBytes: null
+		});
+	}
+	static _isNetworkUrl(e) {
+		return typeof e == "string" && /^https?:/i.test(e);
 	}
 	releaseTargetModel() {
-		this.targetModel && (this.targetModel === this._externalModel ? this.targetModel.parent?.remove(this.targetModel) : dr(this.targetModel), this.targetModel = null, this._externalModel = null);
+		this.targetModel && (this.targetModel === this._externalModel ? this.targetModel.parent?.remove(this.targetModel) : dr(this.targetModel), this.targetModel = null, this._externalModel = null, this.animations = []);
 	}
 	setRenderer(e) {
 		this.renderer = e;
@@ -12903,6 +12938,7 @@ var Wd = {
 		}
 	}
 	async loadEnvironment(e) {
+		this._loadCancelled = !1;
 		try {
 			this.dispatchEvent({
 				type: "beforeEnvironmentLoad",
@@ -12919,11 +12955,11 @@ var Wd = {
 				texture: t
 			}), t;
 		} catch (t) {
-			throw console.error("Error loading environment:", t), this.dispatchEvent({
+			throw this._isCancellation(t) ? this._cancellationError() : (console.error("Error loading environment:", t), this.dispatchEvent({
 				type: "error",
 				message: t.message,
 				filename: e
-			}), t;
+			}), t);
 		}
 	}
 	async loadEnvironmentFromBlob(e) {
@@ -12947,9 +12983,9 @@ var Wd = {
 		}
 		return !n && this.uploadedFileInfo && (n = this.uploadedFileInfo.name.split(".").pop().toLowerCase()), n;
 	}
-	async loadEnvironmentByExtension(e, t) {
-		let n;
-		return t === "hdr" || t === "exr" ? n = await (t === "hdr" ? this.loaderCache.hdr || (this.loaderCache.hdr = new cn().setDataType(ct)) : this.loaderCache.exr || (this.loaderCache.exr = new dn().setDataType(ct))).loadAsync(e) : (this.loaderCache.texture || (this.loaderCache.texture = new Zt()), n = await this.loaderCache.texture.loadAsync(e), n.colorSpace = Wt), n.mapping = ot, n.minFilter = J, n.magFilter = J, n;
+	async loadEnvironmentByExtension(t, n) {
+		let r = e._isNetworkUrl(t), i = this._downloadProgress("Downloading Environment...", r), a;
+		return n === "hdr" || n === "exr" ? a = await (n === "hdr" ? this.loaderCache.hdr || (this.loaderCache.hdr = new cn(this._loadingManager).setDataType(ct)) : this.loaderCache.exr || (this.loaderCache.exr = new dn(this._loadingManager).setDataType(ct))).loadAsync(t, i) : (this.loaderCache.texture || (this.loaderCache.texture = new Zt(this._loadingManager)), a = await this.loaderCache.texture.loadAsync(t, i), a.colorSpace = Wt), this._downloadComplete("Processing Environment...", 62), a.mapping = ot, a.minFilter = J, a.magFilter = J, a;
 	}
 	applyEnvironmentToScene(e) {
 		this.scene.background = e, this.scene.environment = e;
@@ -13239,7 +13275,7 @@ var Wd = {
 			bptcSupported: !1,
 			pvrtcSupported: !1
 		});
-		let i = new sn();
+		let i = new sn(this._loadingManager);
 		return i.setDRACOLoader(n), i.setKTX2Loader(r), i.setMeshoptDecoder(pn), i;
 	}
 	_disposeGLTFLoader(e) {
@@ -13250,32 +13286,66 @@ var Wd = {
 		let n = `${t[e].url}`;
 		return await this.loadModel(n);
 	}
-	async loadModel(e) {
-		let t = await this.createGLTFLoader();
+	async loadModel(t) {
+		this._loadCancelled = !1;
+		let n = await this.createGLTFLoader(), r = e._isNetworkUrl(t);
 		try {
 			ar({
-				status: "Loading Model...",
-				progress: 2
+				isLoading: !0,
+				status: "Downloading Model...",
+				progress: 2,
+				canCancel: r,
+				loadedBytes: 0,
+				totalBytes: 0
 			});
-			let n = await t.loadAsync(e);
-			return ar({
-				status: "Processing Data...",
-				progress: 10
-			}), this.releaseTargetModel(), this.targetModel = n.scene, this.animations = n.animations || [], await this.onModelLoad(this.targetModel), this.dispatchEvent({
+			let e = await n.loadAsync(t, this._downloadProgress("Downloading Model...", r));
+			return this._downloadComplete(), this.releaseTargetModel(), this.targetModel = e.scene, this.animations = e.animations || [], await this.onModelLoad(this.targetModel), this.dispatchEvent({
 				type: "load",
-				model: n.scene,
-				filename: e.split("/").pop()
-			}), n;
-		} catch (t) {
-			throw console.error("Error loading model:", t), this.dispatchEvent({
+				model: e.scene,
+				filename: t.split("/").pop()
+			}), e;
+		} catch (e) {
+			throw this._isCancellation(e) ? this._cancellationError() : (console.error("Error loading model:", e), this.dispatchEvent({
 				type: "error",
-				message: t.message,
-				filename: e
-			}), t;
+				message: e.message,
+				filename: t
+			}), e);
+		} finally {
+			this._disposeGLTFLoader(n);
+		}
+	}
+	_processAndParent(e) {
+		this.processModelObjects(e), this.scene.add(e), e.updateMatrixWorld(!0);
+	}
+	async appendModel(t) {
+		this._loadCancelled = !1;
+		let n = await this.createGLTFLoader(), r = e._isNetworkUrl(t);
+		try {
+			ar({
+				isLoading: !0,
+				status: "Downloading Model...",
+				progress: 2,
+				canCancel: r,
+				loadedBytes: 0,
+				totalBytes: 0
+			});
+			let e = await n.loadAsync(t, this._downloadProgress("Downloading Model...", r));
+			return this._downloadComplete(), this._processAndParent(e.scene), {
+				root: e.scene,
+				animations: e.animations || []
+			};
+		} catch (e) {
+			throw this._isCancellation(e) ? this._cancellationError() : e;
 		} finally {
-			this._disposeGLTFLoader(t);
+			this._disposeGLTFLoader(n);
 		}
 	}
+	appendObject3D(e, t = "object3d") {
+		return e.name = e.name || t, this._processAndParent(e), { root: e };
+	}
+	removeModelRoot(e, { external: t = !1 } = {}) {
+		e && (t ? e.parent?.remove(e) : dr(e));
+	}
 	async loadGLBFromArrayBuffer(e, t = "model.glb") {
 		let n = await this.createGLTFLoader();
 		try {
@@ -15614,7 +15684,7 @@ var If = {
 				indices: i
 			}), this._skinnedCache.push(new Float32Array(o * 3)), this._normalCache.push(new Float32Array(o * 3)), t += a;
 		}
-		this._posBuffer = new Float32Array(t * 9), this._normalBuffer = new Float32Array(t * 9);
+		this._posBuffer = new Float32Array(t * 9), this._normalBuffer = new Float32Array(t * 9), this._baselineComputed = !1;
 	}
 	attach(e) {
 		this._attached !== e && (this._controls.attach(e), this._attached = e);
@@ -15860,6 +15930,9 @@ var If = {
 			index: e
 		});
 	}
+	cancelLoad() {
+		this._loadingInProgress && this.assetLoader?.cancelActiveLoad();
+	}
 	async setMaxTextureSize(e, { reprocess: t = !0 } = {}) {
 		let n = this._maxTextureSize;
 		if (this._maxTextureSize = this._sdf?.setMaxTextureSize(e) ?? e, typeof this.stages?.pathTracer?.sdfs?.setMaxTextureSize == "function" && this.stages.pathTracer.sdfs.setMaxTextureSize(this._maxTextureSize), t && this._maxTextureSize !== n && this._sdf?.triangleData && !this._loadingInProgress) {
@@ -15878,7 +15951,7 @@ var If = {
 		if (this._loadingInProgress) throw Error("PathTracerApp: another load is already in progress");
 		this._loadingInProgress = !0;
 		try {
-			await e(), this._syncControlsAfterLoad(), await this.loadSceneData(), this.pipeline?.eventBus.emit("autoexposure:resetHistory"), this.reset(), this.cameraManager.currentCameraIndex = 0, this.dispatchEvent(t), this.dispatchEvent({
+			await e(), this._clearAppendedModels(), this._syncControlsAfterLoad(), await this.loadSceneData(), this.pipeline?.eventBus.emit("autoexposure:resetHistory"), this.reset(), this.cameraManager.currentCameraIndex = 0, this.dispatchEvent(t), this.dispatchEvent({
 				type: "CamerasUpdated",
 				cameras: this.cameraManager.cameras,
 				cameraNames: this.cameraManager.getCameraNames()
@@ -15888,7 +15961,7 @@ var If = {
 		}
 	}
 	async loadSceneData() {
-		this.interactionManager?.deselect(), this.animationManager.dispose(), this._animRefitInFlight = !1;
+		this._preserveSelectionOnRebuild || this.interactionManager?.deselect(), this.animationManager.dispose(), this._animRefitInFlight = !1, this._tagPrimarySceneObject();
 		let e = new zs("loadSceneData"), t = this.meshScene.environment, n = null;
 		if (t?.image?.data && (e.start("Environment CDF build (worker)"), this.stages.pathTracer.scene.environment = t, n = this.stages.pathTracer.environment.buildEnvironmentCDF().then(() => e.end("Environment CDF build (worker)"))), e.start("BVH build (SceneProcessor)"), this._sdf.setMaxTextureSize(this._maxTextureSize), await this._sdf.buildBVH(this.meshScene), e.end("BVH build (SceneProcessor)"), ar({
 			status: "Transferring data to GPU...",
@@ -15910,6 +15983,67 @@ var If = {
 		let r = this.getSceneMinY();
 		return this.settings.set("groundProjectionLevel", r, { reset: !1 }), this.settings.set("groundCatcherHeight", r, { reset: !1 }), e.start("Apply settings"), this.settings.applyAll(), this.stages.compositor.setTransparentBackground(this.settings.get("transparentBackground")), e.end("Apply settings"), e.print(), ir(), this._initAnimationAndTransforms(), this.dispatchEvent({ type: "SceneRebuild" }), !0;
 	}
+	_tagPrimarySceneObject() {
+		let e = this.assetLoader?.targetModel;
+		e && (e.userData.__rayzeeSceneObject = !0, e.userData.__rayzeeExternal = e === this.assetLoader._externalModel);
+	}
+	_clearAppendedModels() {
+		let e = this.meshScene;
+		if (!e) return;
+		let t = this.assetLoader?.floorPlane, n = this.assetLoader?.targetModel;
+		for (let r of [...e.children]) r === t || r === n || r.userData?.__rayzeeSceneObject && this.assetLoader.removeModelRoot(r, { external: !!r.userData.__rayzeeExternal });
+	}
+	async _finishRebuildNoReframe(e) {
+		await this.loadSceneData(), this.pipeline?.eventBus.emit("autoexposure:resetHistory"), this.reset(), e && this.dispatchEvent(e);
+	}
+	async addModel(e, { name: t } = {}) {
+		if (this._loadingInProgress) throw Error("PathTracerApp.addModel: another load is already in progress");
+		this._loadingInProgress = !0, this._preserveSelectionOnRebuild = !0;
+		try {
+			let { root: n } = await this.assetLoader.appendModel(e);
+			return n.userData.__rayzeeSceneObject = !0, n.userData.__rayzeeExternal = !1, t && (n.userData.__rayzeeName = t), await this._finishRebuildNoReframe({
+				type: "ModelAdded",
+				url: e,
+				id: n.uuid
+			}), n.uuid;
+		} finally {
+			this._preserveSelectionOnRebuild = !1, this._loadingInProgress = !1;
+		}
+	}
+	async addModelFromObject3D(e, { name: t } = {}) {
+		if (this._loadingInProgress) throw Error("PathTracerApp.addModelFromObject3D: another load is already in progress");
+		this._loadingInProgress = !0, this._preserveSelectionOnRebuild = !0;
+		try {
+			let { root: n } = this.assetLoader.appendObject3D(e, t || "object3d");
+			return n.userData.__rayzeeSceneObject = !0, n.userData.__rayzeeExternal = !0, t && (n.userData.__rayzeeName = t), await this._finishRebuildNoReframe({
+				type: "ModelAdded",
+				id: n.uuid
+			}), n.uuid;
+		} finally {
+			this._preserveSelectionOnRebuild = !1, this._loadingInProgress = !1;
+		}
+	}
+	async removeSceneObject(e) {
+		let t = this.meshScene;
+		if (!t) return !1;
+		let n = this.assetLoader?.floorPlane;
+		if (n && n.uuid === e) return !1;
+		let r = t.children.find((t) => t.uuid === e && t.userData?.__rayzeeSceneObject);
+		if (!r) return !1;
+		if (this._loadingInProgress) throw Error("PathTracerApp.removeSceneObject: another load is already in progress");
+		this._loadingInProgress = !0;
+		try {
+			return this.interactionManager?.deselect(), this.transformManager?.detach?.(), r === this.assetLoader.targetModel ? this.assetLoader.releaseTargetModel() : this.assetLoader.removeModelRoot(r, { external: !!r.userData.__rayzeeExternal }), await this._finishRebuildNoReframe({
+				type: "SceneObjectRemoved",
+				id: e
+			}), !0;
+		} finally {
+			this._loadingInProgress = !1;
+		}
+	}
+	setSceneObjectVisibility(e, t) {
+		return this.setMeshVisibilityByUuid(e, t);
+	}
 	async refitBVH(e, t) {
 		let n = await this._sdf.refitBVH(e, t);
 		return this.stages.pathTracer.updateTriangleData(this._sdf.triangleData), this.stages.pathTracer.updateBVHData(this._sdf.bvhData), this.reset(), n;
@@ -16143,7 +16277,7 @@ var If = {
 			reconcileCompletion: () => this._reconcileCompletion()
 		}), this.renderer.toneMappingExposure = this.settings.get("exposure") ?? 1, this.onResize(), this.resizeHandler = () => this.onResize(), this._autoResize && this._addTrackedListener(window, "resize", this.resizeHandler), this._onAssetLoaded = async (e) => {
 			if (!this._loadingInProgress) {
-				if (e.model) await this.loadSceneData();
+				if (e.model) this._clearAppendedModels(), await this.loadSceneData();
 				else if (e.texture) {
 					let e = this.meshScene.environment;
 					e && this.stages.pathTracer && await this.stages.pathTracer.environment.setEnvironmentMap(e), ir();