From 04d6f76192de83c441edb2e7d0bcc1e4acaa1af0 Mon Sep 17 00:00:00 2001 From: kpal Date: Mon, 18 Nov 2024 11:47:55 +0000 Subject: [PATCH] Updated get focus point --- scripts/camera-controls.mjs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/camera-controls.mjs b/scripts/camera-controls.mjs index c564f154eac..3cbb0ac599c 100644 --- a/scripts/camera-controls.mjs +++ b/scripts/camera-controls.mjs @@ -31,7 +31,7 @@ class CameraControls extends Script { * @private * @type {Vec3} */ - _origin = new Vec3(0, 0, 0); + _origin = new Vec3(); /** * @private @@ -296,7 +296,7 @@ class CameraControls extends Script { } this.attach(this.entity.camera); - this.focusPoint = focusPoint ?? Vec3.ZERO; + this.focusPoint = focusPoint ?? this._origin; this.pitchRange = pitchRange ?? this.pitchRange; this.zoomMin = zoomMin ?? this.zoomMin; this.zoomMax = zoomMax ?? this.zoomMax; @@ -315,13 +315,10 @@ class CameraControls extends Script { } get focusPoint() { - if (!this._camera) { - return Vec3.ZERO; + if (this._flying) { + return tmpV1.copy(this.root.forward).mulScalar(this._zoomDist).add(this._origin); } - return tmpV1 - .copy(this._camera.entity.forward) - .mulScalar(this._zoomDist) - .add(this._camera.entity.getPosition()); + return this._origin; } /**