@xviewer.js/core 1.0.0-alpha.32 → 1.0.0-alpha.33

package/dist/module.js

@@ -1467,7 +1467,7 @@ class VirtualCamera extends Component {
         this.correctPosition = new Vector3();
         this.correctRotation = new Quaternion();
         this.lookaheadPosition = new Vector3();
-        this.trackedObjectOffset = new Vector3();
+        this.lookAtOffset = new Vector3();
     }
 }
 __decorate([
@@ -2637,7 +2637,7 @@ class FreelookVirtualCamera extends VirtualCamera {
     _onMouseWheel(e) {
         const { __worldPos } = FreelookVirtualCamera;
         if (this.lookAt) {
-            let dist = __worldPos.copy(this.lookAt.position).add(this.trackedObjectOffset).distanceTo(this.node.position);
+            let dist = __worldPos.copy(this.lookAt.position).add(this.lookAtOffset).distanceTo(this.node.position);
             let distNew = dist + this._distanceDelta;
             if (e.deltaY > 0) {
                 distNew *= this._calculateDistanceScale(1 / 0.85);
@@ -2668,7 +2668,7 @@ class FreelookVirtualCamera extends VirtualCamera {
             __loc0.set(touches[rotateTouchID].pageX, touches[rotateTouchID].pageY);
             __loc1.set(touches[rotateTouchID + 1].pageX, touches[rotateTouchID + 1].pageY);
             if (this.lookAt) {
-                let dist = __worldPos.copy(this.lookAt.position).add(this.trackedObjectOffset).distanceTo(this.node.position);
+                let dist = __worldPos.copy(this.lookAt.position).add(this.lookAtOffset).distanceTo(this.node.position);
                 let distNew = (dist + this._distanceDelta) * this._calculateDistanceScale(this._preLoc0.distanceTo(this._preLoc1) / __loc0.distanceTo(__loc1));
                 this._distanceDelta = distNew - dist;
             }
@@ -2723,7 +2723,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         __posDelta.applyQuaternion(__quat);
         __spherical.setFromVector3(__posDelta);
         const { theta, phi, radius } = __spherical;
-        __worldPos.copy(this.lookAt.position).add(this.trackedObjectOffset);
+        __worldPos.copy(this.lookAt.position).add(this.lookAtOffset);
         __posDelta.copy(this.node.position).sub(__worldPos);
         __posDelta.applyQuaternion(__quat);
         __spherical.setFromVector3(__posDelta);
@@ -2734,12 +2734,13 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._rotateDelta.y = dy;
         this._distanceDelta = dz;
         this._tempSmoothing = smoothing;
+        this._lookAtOffsetDelta.copy(lookAt).sub(this.lookAt.position).sub(this.lookAtOffset);
     }
     update(dt) {
         if (!this.lookAt) return;
         const dampFactor = exponentialDamp(1, 0, this._tempSmoothing, dt);
-        const { __posDelta, __worldPos, __quat, __spherical, __xAxis, __yAxis } = FreelookVirtualCamera;
-        __worldPos.copy(this.lookAt.position).add(this.trackedObjectOffset);
+        const { __posDelta, __offsetDelta, __worldPos, __quat, __spherical, __xAxis, __yAxis } = FreelookVirtualCamera;
+        __worldPos.copy(this.lookAt.position).add(this.lookAtOffset);
         if (this._rotateDelta.manhattanLength() + abs(this._distanceDelta) > 0.001) {
             __quat.setFromUnitVectors(this.node.up, Object3D.DEFAULT_UP);
             __posDelta.copy(this.node.position).sub(__worldPos);
@@ -2766,13 +2767,17 @@ class FreelookVirtualCamera extends VirtualCamera {
                 __yAxis.normalize();
             }
             let length = __posDelta.length() * 2 * tan(degToRad(this.fov * 0.5));
-            let trackedObjectOffset = this.trackedObjectOffset;
-            trackedObjectOffset.sub(__xAxis.multiplyScalar(this._panDelta.x * length * (1 - dampFactor)));
-            trackedObjectOffset.add(__yAxis.multiplyScalar(this._panDelta.y * length * (1 - dampFactor)));
+            let lookAtOffset = this.lookAtOffset;
+            lookAtOffset.sub(__xAxis.multiplyScalar(this._panDelta.x * length * (1 - dampFactor)));
+            lookAtOffset.add(__yAxis.multiplyScalar(this._panDelta.y * length * (1 - dampFactor)));
             this._panDelta.multiplyScalar(dampFactor);
-            __worldPos.copy(this.lookAt.position).add(trackedObjectOffset);
+            __worldPos.copy(this.lookAt.position).add(lookAtOffset);
             this.node.position.copy(__posDelta.add(__worldPos));
         }
+        if (this._lookAtOffsetDelta.manhattanLength() > 0.001) {
+            this.lookAtOffset.add(__offsetDelta.copy(this._lookAtOffsetDelta).multiplyScalar(1 - dampFactor));
+            this._lookAtOffsetDelta.multiplyScalar(dampFactor);
+        }
         this.node.lookAt(__worldPos);
     }
     constructor(...args){
@@ -2785,6 +2790,7 @@ class FreelookVirtualCamera extends VirtualCamera {
         this._rotateDelta = new Vector2();
         this._panDelta = new Vector2();
         this._tempSmoothing = 0;
+        this._lookAtOffsetDelta = new Vector3();
         this.forbidX = false;
         this.forbidY = false;
         this.forbidZ = false;
@@ -2816,6 +2822,7 @@ FreelookVirtualCamera.__xAxis = new Vector3();
 FreelookVirtualCamera.__yAxis = new Vector3();
 FreelookVirtualCamera.__quat = new Quaternion();
 FreelookVirtualCamera.__spherical = new Spherical();
+FreelookVirtualCamera.__offsetDelta = new Vector3();
 __decorate([
     property({
         dir: "set"