rayzee 7.15.2 → 7.16.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-170.1%20KB-blue)](https://www.npmjs.com/package/rayzee)
+[![minzipped size](https://img.shields.io/badge/minzipped-170.7%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

@@ -14283,21 +14283,21 @@ var rf = {
 			prev: i
 		}));
 	}
-	setMany(e, { silent: t } = {}) {
-		let n = !1;
-		for (let [r, i] of Object.entries(e)) {
-			let e = this._values.get(r);
+	setMany(e, { silent: t, reset: n } = {}) {
+		let r = !1;
+		for (let [n, i] of Object.entries(e)) {
+			let e = this._values.get(n);
 			if (e === i) continue;
-			this._values.set(r, i);
-			let a = of[r];
-			a && (this._applyRoute(a, i, e), (a.reset ?? !0) && (n = !0), t || this.dispatchEvent({
+			this._values.set(n, i);
+			let a = of[n];
+			a && (this._applyRoute(a, i, e), (a.reset ?? !0) && (r = !0), t || this.dispatchEvent({
 				type: Y.SETTING_CHANGED,
-				key: r,
+				key: n,
 				value: i,
 				prev: e
 			}));
 		}
-		n && this._resetCallback?.();
+		(n === void 0 ? r : n) && this._resetCallback?.();
 	}
 	get(e) {
 		return this._values.get(e);
@@ -14322,44 +14322,89 @@ var rf = {
 	constructor(e) {
 		super();
 		let t = e.clientWidth, n = e.clientHeight;
-		this.camera = new At(60, t / n || 1, .01, 1e3), this.camera.position.set(0, 0, 5), this.controls = new gn(this.camera, e), this.controls.screenSpacePanning = !0, this.controls.zoomToCursor = !0, this.controls.saveState(), this.interactionManager = null, this.cameras = [this.camera], this.currentCameraIndex = 0, this.autoFocusMode = xr.SMOOTHING_FACTOR ? "auto" : "manual", this.afScreenPoint = {
+		this.camera = new At(60, t / n || 1, .01, 1e3), this.camera.position.set(0, 0, 5), this.controls = new gn(this.camera, e), this.controls.screenSpacePanning = !0, this.controls.zoomToCursor = !0, this.controls.saveState(), this.interactionManager = null, this.cameras = [this.camera], this.currentCameraIndex = 0, this._userCameraCounter = 0, this.autoFocusMode = xr.SMOOTHING_FACTOR ? "auto" : "manual", this.afScreenPoint = {
 			x: .5,
 			y: .5
-		}, this.afSmoothingFactor = xr.SMOOTHING_FACTOR, this._lastValidFocusDistance = null, this._smoothedFocusDistance = null, this._afPointDirty = !1, this._afSuspended = !1, this._defaultCameraState = null, this._onResize = null, this._onReset = null, this._getSettings = null;
+		}, this.afSmoothingFactor = xr.SMOOTHING_FACTOR, this._lastValidFocusDistance = null, this._smoothedFocusDistance = null, this._afPointDirty = !1, this._afSuspended = !1, this._defaultCameraState = null, this._onResize = null, this._onReset = null, this._getSettings = null, this._applySettings = null;
 	}
 	setCameras(e) {
-		this.cameras = e;
+		this.cameras = e, this._userCameraCounter = 0;
+	}
+	addCameraFromView(e) {
+		let t = this.camera, n = new At(t.fov, t.aspect, t.near, t.far);
+		return n.position.copy(t.position), n.quaternion.copy(t.quaternion), n.updateMatrixWorld(!0), n.userData.__rayzeeUserCamera = !0, n.userData.__rayzeeEffects = this._captureEffects(), this.controls && (n.userData.__rayzeeOrbitTarget = this.controls.target.clone()), this._userCameraCounter += 1, n.name = e || `View Camera ${this._userCameraCounter}`, this.cameras.push(n), this.cameras.length - 1;
+	}
+	removeCamera(e) {
+		if (!Number.isInteger(e) || e <= 0 || e >= this.cameras.length || !this.cameras[e]?.userData?.__rayzeeUserCamera) return !1;
+		let t = this.currentCameraIndex === e;
+		return this.cameras.splice(e, 1), t ? (this.currentCameraIndex = -1, this.switchCamera(0)) : this.currentCameraIndex > e && --this.currentCameraIndex, !0;
 	}
 	getCameraNames() {
 		return !this.cameras || this.cameras.length === 0 ? ["Default Camera"] : this.cameras.map((e, t) => t === 0 ? "Default Camera" : e.name || `Camera ${t}`);
 	}
-	initCallbacks({ onResize: e, onReset: t, getSettings: n }) {
-		this._onResize = e, this._onReset = t, this._getSettings = n;
+	initCallbacks({ onResize: e, onReset: t, getSettings: n, applySettings: r }) {
+		this._onResize = e, this._onReset = t, this._getSettings = n, this._applySettings = r;
+	}
+	_captureEffects() {
+		let e = this._getSettings;
+		return e ? {
+			enableDOF: e("enableDOF"),
+			focusDistance: e("focusDistance"),
+			aperture: e("aperture"),
+			focalLength: e("focalLength"),
+			apertureScale: e("apertureScale"),
+			anamorphicRatio: e("anamorphicRatio"),
+			autoFocusMode: this.autoFocusMode,
+			afScreenPoint: { ...this.afScreenPoint }
+		} : null;
+	}
+	_applyEffects(e) {
+		e && (this._applySettings?.({
+			enableDOF: e.enableDOF,
+			focusDistance: e.focusDistance,
+			aperture: e.aperture,
+			focalLength: e.focalLength,
+			apertureScale: e.apertureScale,
+			anamorphicRatio: e.anamorphicRatio
+		}), e.autoFocusMode !== void 0 && this.setAutoFocusMode(e.autoFocusMode), e.afScreenPoint && this.setAFScreenPoint(e.afScreenPoint.x, e.afScreenPoint.y));
+	}
+	_getSceneScale() {
+		return this._afContext?.assetLoader?.getSceneScale?.() || 1;
 	}
 	switchCamera(e, t, n, r) {
-		if (t ??= this._getSettings?.("focusDistance"), n ??= this._onResize, r ??= this._onReset, !(!this.cameras || this.cameras.length === 0)) {
-			if ((e < 0 || e >= this.cameras.length) && (console.warn(`CameraManager: Invalid camera index ${e}. Using default camera.`), e = 0), this.currentCameraIndex === 0 && e !== 0 && (this._defaultCameraState = {
-				position: this.camera.position.clone(),
-				quaternion: this.camera.quaternion.clone(),
-				fov: this.camera.fov,
-				near: this.camera.near,
-				far: this.camera.far,
-				target: this.controls ? this.controls.target.clone() : null
-			}), this.currentCameraIndex = e, e === 0 && this._defaultCameraState) {
-				let e = this._defaultCameraState;
-				this.camera.position.copy(e.position), this.camera.quaternion.copy(e.quaternion), this.camera.fov = e.fov, this.camera.near = e.near, this.camera.far = e.far, this.camera.updateProjectionMatrix(), this.camera.updateMatrixWorld(!0), this.controls && e.target && (this.controls.target.copy(e.target), this.controls.update());
-			} else {
-				let n = this.cameras[e];
-				if (this.camera.position.copy(n.position), this.camera.quaternion.copy(n.quaternion), this.camera.fov = n.fov, this.camera.near = n.near, this.camera.far = n.far, this.camera.updateProjectionMatrix(), this.camera.updateMatrixWorld(!0), this.controls) {
+		if (t ??= this._getSettings?.("focusDistance"), n ??= this._onResize, r ??= this._onReset, !this.cameras || this.cameras.length === 0) return;
+		(e < 0 || e >= this.cameras.length) && (console.warn(`CameraManager: Invalid camera index ${e}. Using default camera.`), e = 0);
+		let i = this.cameras[this.currentCameraIndex];
+		if (i && (i.userData.__rayzeeEffects = this._captureEffects()), this.currentCameraIndex === 0 && e !== 0 && (this._defaultCameraState = {
+			position: this.camera.position.clone(),
+			quaternion: this.camera.quaternion.clone(),
+			fov: this.camera.fov,
+			near: this.camera.near,
+			far: this.camera.far,
+			target: this.controls ? this.controls.target.clone() : null
+		}), this.currentCameraIndex = e, e === 0 && this._defaultCameraState) {
+			let e = this._defaultCameraState;
+			this.camera.position.copy(e.position), this.camera.quaternion.copy(e.quaternion), this.camera.fov = e.fov, this.camera.near = e.near, this.camera.far = e.far, this.camera.updateProjectionMatrix(), this.camera.updateMatrixWorld(!0), this.controls && e.target && (this.controls.target.copy(e.target), this.controls.update());
+		} else {
+			let n = this.cameras[e];
+			if (this.camera.position.copy(n.position), this.camera.quaternion.copy(n.quaternion), this.camera.fov = n.fov, this.camera.near = n.near, this.camera.far = n.far, this.camera.updateProjectionMatrix(), this.camera.updateMatrixWorld(!0), this.controls) {
+				let e = n.userData?.__rayzeeOrbitTarget;
+				if (e) this.controls.target.copy(e);
+				else {
 					let e = new rn(0, 0, -1).applyQuaternion(n.quaternion), r = t || 5;
-					this.controls.target.copy(this.camera.position).addScaledVector(e, r), this.controls.update();
+					this.controls.target.copy(this.camera.position).addScaledVector(e, r);
 				}
+				this.controls.update();
 			}
-			n?.(), r?.(), this.dispatchEvent({
-				type: "CameraSwitched",
-				cameraIndex: e
-			});
 		}
+		this._applyEffects(this.cameras[e]?.userData?.__rayzeeEffects), n?.(), r?.();
+		let a = this._captureEffects();
+		a && (a.focusDistance /= this._getSceneScale()), this.dispatchEvent({
+			type: "CameraSwitched",
+			cameraIndex: e,
+			effects: a,
+			fov: this.camera.fov
+		});
 	}
 	focusOn(e) {
 		!e || !this.controls || (this.controls.target.copy(e), this.controls.update(), this._onReset?.());
@@ -16372,11 +16417,7 @@ var Yf = {
 		if (this._loadingInProgress) throw Error("PathTracerApp: another load is already in progress");
 		this._loadingInProgress = !0;
 		try {
-			await e(), this._emissiveSamplingUserSet = !1, 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()
-			});
+			await e(), this._emissiveSamplingUserSet = !1, this._clearAppendedModels(), this._syncControlsAfterLoad(), await this.loadSceneData(), this.pipeline?.eventBus.emit("autoexposure:resetHistory"), this.reset(), this.cameraManager.currentCameraIndex = 0, this.dispatchEvent(t), this._dispatchCamerasUpdated();
 		} finally {
 			this._loadingInProgress = !1;
 		}
@@ -16469,6 +16510,24 @@ var Yf = {
 	setSceneObjectVisibility(e, t) {
 		return this.setMeshVisibilityByUuid(e, t);
 	}
+	get currentCameraIndex() {
+		return this.cameraManager?.currentCameraIndex ?? 0;
+	}
+	addCamera({ name: e } = {}) {
+		let t = this.cameraManager.addCameraFromView(e);
+		return this.cameraManager.switchCamera(t), this._dispatchCamerasUpdated(), t;
+	}
+	removeCamera(e) {
+		let t = this.cameraManager.removeCamera(e);
+		return t && this._dispatchCamerasUpdated(), t;
+	}
+	_dispatchCamerasUpdated() {
+		this.dispatchEvent({
+			type: "CamerasUpdated",
+			cameras: this.cameraManager.cameras,
+			cameraNames: this.cameraManager.getCameraNames()
+		});
+	}
 	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;
@@ -16699,7 +16758,11 @@ var Yf = {
 		}), this.cameraManager.initCallbacks({
 			onResize: () => this.onResize(),
 			onReset: () => this.reset(),
-			getSettings: (e) => this.settings.get(e)
+			getSettings: (e) => this.settings.get(e),
+			applySettings: (e) => this.settings.setMany(e, {
+				silent: !0,
+				reset: !1
+			})
 		}), this.cameraManager.initAutoFocus({
 			meshScene: this.meshScene,
 			assetLoader: this.assetLoader,