@zephyr3d/scene 0.1.2 → 0.3.0

package/dist/camera/orbit.js

@@ -24,6 +24,7 @@ import { BaseCameraController } from './base.js';
    */ constructor(options){
         super();
         this.options = Object.assign({
+            center: Vector3.zero(),
             distance: 1,
             damping: 0.1,
             moveSpeed: 0.2,
@@ -40,6 +41,12 @@ import { BaseCameraController } from './base.js';
         this.quat = new Quaternion();
         this.scale = 1;
     }
+    /** Rotation center */ get center() {
+        return this.options.center;
+    }
+    set center(val) {
+        this.options.center.set(val);
+    }
     /**
    * {@inheritDoc BaseCameraController.reset}
    * @override
@@ -49,6 +56,7 @@ import { BaseCameraController } from './base.js';
         this.lastMouseY = 0;
         this.rotateX = 0;
         this.rotateY = 0;
+        this.upVector = Vector3.axisPY();
         this.scale = 1;
         this._loadCameraParams();
     }
@@ -80,8 +88,6 @@ import { BaseCameraController } from './base.js';
    * {@inheritDoc BaseCameraController._onMouseWheel}
    * @override
    */ _onMouseWheel(evt) {
-        console.log(`wheel deltaX: ${evt.deltaX}`);
-        console.log(`wheel deltaY: ${evt.deltaY}`);
         const factor = Math.pow(0.9, Math.abs(this.options.zoomSpeed));
         if (evt.deltaY > 0) {
             this.scale /= factor;
@@ -106,11 +112,15 @@ import { BaseCameraController } from './base.js';
         return false;
     }
     /** @internal */ _loadCameraParams() {
-        if (this._getCamera()) {
-            const mat = this._getCamera().worldMatrix;
-            mat.decomposeLookAt(this.eyePos, this.target);
-            Vector3.normalize(Vector3.sub(this.eyePos, this.target), this.direction);
-            Vector3.sub(this.eyePos, Vector3.scale(this.direction, this.options.distance), this.target);
+        const camera = this._getCamera();
+        if (camera) {
+            this.eyePos = this._getCamera().position;
+            this.target.set(this.options.center);
+            camera.lookAt(this.eyePos, this.target, this.upVector);
+            Vector3.sub(this.eyePos, this.target, this.direction);
+            this.options.distance = this.direction.magnitude;
+            this.direction.inplaceNormalize();
+            const mat = this._getCamera().localMatrix;
             this.xVector.setXYZ(mat[0], mat[1], mat[2]);
         }
     }
@@ -126,6 +136,13 @@ import { BaseCameraController } from './base.js';
    * @override
    */ update() {
         if (this._getCamera()) {
+            const dx = this.options.center.x - this.target.x;
+            const dy = this.options.center.y - this.target.y;
+            const dz = this.options.center.z - this.target.z;
+            this.eyePos.x += dx;
+            this.eyePos.y += dy;
+            this.eyePos.z += dz;
+            this.target.set(this.options.center);
             Quaternion.fromAxisAngle(this.xVector, this.rotateX, this.quat);
             this.quat.transform(this.eyePos.subBy(this.target), this.eyePos);
             Quaternion.fromEulerAngle(0, this.rotateY, 0, 'XYZ', this.quat);

package/dist/camera/orbit.js.map

@@ -1 +1 @@
-{"version":3,"file":"orbit.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"orbit.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}