@zephyr3d/scene 0.6.1 → 0.7.1

package/dist/camera/orbit.js

@@ -6,7 +6,6 @@ import { BaseCameraController } from './base.js';
  * @public
  */ class OrbitCameraController extends BaseCameraController {
     /** @internal */ options;
-    /** @internal */ mouseDown;
     /** @internal */ lastMouseX;
     /** @internal */ lastMouseY;
     /** @internal */ rotateX;
@@ -14,10 +13,11 @@ import { BaseCameraController } from './base.js';
     /** @internal */ eyePos;
     /** @internal */ upVector;
     /** @internal */ xVector;
-    /** @internal */ target;
     /** @internal */ direction;
     /** @internal */ quat;
-    /** @internal */ scale;
+    /** @internal */ currentOp;
+    /** @internal */ panVelocityX;
+    /** @internal */ panVelocityY;
     /**
    * Creates an instance of OrbitCameraController
    * @param options - The creation options
@@ -25,51 +25,101 @@ import { BaseCameraController } from './base.js';
         super();
         this.options = Object.assign({
             center: Vector3.zero(),
-            distance: 1,
-            damping: 0.1,
-            moveSpeed: 0.2,
-            rotateSpeed: 0.01,
-            zoomSpeed: 1
+            damping: 1,
+            rotateSpeed: 1,
+            panSpeed: 1,
+            zoomSpeed: 1,
+            controls: {
+                rotate: {
+                    button: 0,
+                    shiftKey: false,
+                    ctrlKey: false,
+                    altKey: false,
+                    metaKey: false
+                },
+                pan: {
+                    button: 0,
+                    shiftKey: true,
+                    ctrlKey: false,
+                    altKey: false,
+                    metaKey: false
+                },
+                zoom: {
+                    button: 2,
+                    shiftKey: false,
+                    ctrlKey: true,
+                    altKey: false,
+                    metaKey: false
+                },
+                zoomWheel: true
+            }
         }, options || {});
-        this.rotateX = 0;
-        this.rotateY = 0;
         this.eyePos = new Vector3();
-        this.upVector = Vector3.axisPY();
+        this.upVector = new Vector3();
         this.xVector = new Vector3();
-        this.target = new Vector3();
         this.direction = new Vector3();
         this.quat = new Quaternion();
-        this.scale = 1;
+        this.reset();
     }
     /** Rotation center */ get center() {
         return this.options.center;
     }
     set center(val) {
-        this.options.center.set(val);
+        const center = this.options.center;
+        const dx = val.x - center.x;
+        const dy = val.y - center.y;
+        const dz = val.z - center.z;
+        center.x += dx;
+        center.y += dy;
+        center.z += dz;
+        this.eyePos.x += dx;
+        this.eyePos.y += dy;
+        this.eyePos.z += dz;
     }
     /**
    * {@inheritDoc BaseCameraController.reset}
    * @override
    */ reset() {
-        this.mouseDown = false;
         this.lastMouseX = 0;
         this.lastMouseY = 0;
         this.rotateX = 0;
         this.rotateY = 0;
         this.upVector = Vector3.axisPY();
-        this.scale = 1;
+        this.currentOp = 0;
+        this.panVelocityX = 0;
+        this.panVelocityY = 0;
         this._loadCameraParams();
     }
     /**
    * {@inheritDoc BaseCameraController._onMouseDown}
    * @override
    */ _onMouseDown(evt) {
-        if (evt.button === 0) {
-            this.mouseDown = true;
+        if (this.matchesControl(evt, this.options.controls.rotate)) {
+            this.lastMouseX = evt.offsetX;
+            this.lastMouseY = evt.offsetY;
+            this.rotateX = 0;
+            this.rotateY = 0;
+            this.panVelocityX = 0;
+            this.panVelocityY = 0;
+            this.currentOp = 1;
+            return true;
+        } else if (this.matchesControl(evt, this.options.controls.pan)) {
+            this.lastMouseX = evt.offsetX;
+            this.lastMouseY = evt.offsetY;
+            this.rotateX = 0;
+            this.rotateY = 0;
+            this.panVelocityX = 0;
+            this.panVelocityY = 0;
+            this.currentOp = 2;
+            return true;
+        } else if (this.matchesControl(evt, this.options.controls.zoom)) {
             this.lastMouseX = evt.offsetX;
             this.lastMouseY = evt.offsetY;
+            this.currentOp = 3;
             this.rotateX = 0;
             this.rotateY = 0;
+            this.panVelocityX = 0;
+            this.panVelocityY = 0;
             return true;
         }
         return false;
@@ -78,8 +128,9 @@ import { BaseCameraController } from './base.js';
    * {@inheritDoc BaseCameraController._onMouseUp}
    * @override
    */ _onMouseUp(evt) {
-        if (evt.button === 0 && this.mouseDown) {
-            this.mouseDown = false;
+        const control = this.currentOp === 1 ? this.options.controls.rotate : this.currentOp === 2 ? this.options.controls.pan : this.currentOp === 3 ? this.options.controls.zoom : null;
+        if (control && evt.button === control.button) {
+            this.currentOp = 0;
             return true;
         }
         return false;
@@ -88,39 +139,58 @@ import { BaseCameraController } from './base.js';
    * {@inheritDoc BaseCameraController._onMouseWheel}
    * @override
    */ _onMouseWheel(evt) {
-        const factor = Math.pow(0.9, Math.abs(this.options.zoomSpeed));
-        if (evt.deltaY > 0) {
-            this.scale /= factor;
-        } else {
-            this.scale *= factor;
-        }
+        this.zoom(evt.deltaY);
         return true;
     }
     /**
    * {@inheritDoc BaseCameraController._onMouseMove}
    * @override
    */ _onMouseMove(evt) {
-        if (this.mouseDown) {
+        if (this.currentOp !== 0) {
             const dx = evt.offsetX - this.lastMouseX;
             const dy = evt.offsetY - this.lastMouseY;
             this.lastMouseX = evt.offsetX;
             this.lastMouseY = evt.offsetY;
-            this.rotateX -= dy * this.options.rotateSpeed;
-            this.rotateY -= dx * this.options.rotateSpeed;
+            if (this.currentOp === 1) {
+                this.rotateX -= dy * this.options.rotateSpeed * 0.005;
+                this.rotateY -= dx * this.options.rotateSpeed * 0.005;
+            } else if (this.currentOp === 2) {
+                this.panVelocityX = -dx * this.options.panSpeed;
+                this.panVelocityY = dy * this.options.panSpeed;
+            } else if (this.currentOp === 3) {
+                this.zoom(dy);
+            }
             return true;
         }
         return false;
     }
+    zoom(dy) {
+        const distance = Vector3.distance(this.eyePos, this.options.center);
+        let t = dy > 0 ? this.options.zoomSpeed : dy < 0 ? -this.options.zoomSpeed : 0;
+        t = Math.exp(t * 0.1);
+        if (t > 1 || distance > 0.01) {
+            this.eyePos.combineBy(this.options.center, t, 1 - t);
+        }
+    }
+    matchesControl(evt, control) {
+        return evt.button === control.button && evt.shiftKey === control.shiftKey && evt.ctrlKey === control.ctrlKey && evt.altKey === control.altKey && evt.metaKey === control.metaKey;
+    }
     /** @internal */ _loadCameraParams() {
         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.lookAt(camera.position, this.options.center, this.upVector);
+        }
+    }
+    lookAt(from, to, up) {
+        const camera = this._getCamera();
+        if (camera) {
+            this.eyePos.set(from);
+            this.options.center.set(to);
+            this.upVector.set(up);
+            camera.lookAt(this.eyePos, this.options.center, this.upVector);
+            Vector3.sub(this.eyePos, this.options.center, this.direction);
             this.direction.inplaceNormalize();
-            const mat = this._getCamera().localMatrix;
+            const mat = camera.localMatrix;
             this.xVector.setXYZ(mat[0], mat[1], mat[2]);
         }
     }
@@ -128,45 +198,50 @@ import { BaseCameraController } from './base.js';
    * Set options
    * @param opt - options
    */ setOptions(opt) {
-        opt && Object.assign(this.options, opt);
+        Object.assign(this.options, opt ?? {});
         this.reset();
     }
     /**
    * {@inheritDoc BaseCameraController.update}
    * @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);
+        const camera = this._getCamera();
+        const center = this.options.center;
+        if (Math.abs(this.panVelocityX) > 0.0001 || Math.abs(this.panVelocityY) > 0.0001) {
+            const right = this.xVector;
+            const up = this.upVector;
+            center.combineBy(right, 1, this.panVelocityX);
+            center.combineBy(up, 1, this.panVelocityY);
+            this.eyePos.combineBy(right, 1, this.panVelocityX);
+            this.eyePos.combineBy(up, 1, this.panVelocityY);
+            this.panVelocityX *= 1 - this.options.damping;
+            this.panVelocityY *= 1 - this.options.damping;
+            if (Math.abs(this.panVelocityX) < 0.0001) {
+                this.panVelocityX = 0;
+            }
+            if (Math.abs(this.panVelocityY) < 0.0001) {
+                this.panVelocityY = 0;
+            }
+        }
+        if (Math.abs(this.rotateX) > 0.0001 || Math.abs(this.rotateY) > 0.0001) {
             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);
+            this.quat.transform(this.eyePos.subBy(center), this.eyePos);
+            Quaternion.fromEulerAngle(0, this.rotateY, 0, 'ZYX', this.quat);
             this.quat.transform(this.eyePos, this.eyePos);
             this.quat.transform(this.xVector, this.xVector).inplaceNormalize();
             Vector3.normalize(this.eyePos, this.direction).inplaceNormalize();
             Vector3.cross(this.direction, this.xVector, this.upVector).inplaceNormalize();
-            Vector3.add(this.target, Vector3.scale(this.direction, this.options.distance * this.scale), this.eyePos);
-            this._getCamera().lookAt(this.eyePos, this.target, this.upVector);
-            // this._loadCameraParams();
-            if (this.mouseDown) {
+            this.eyePos.addBy(center);
+            this.rotateX *= 1 - this.options.damping;
+            this.rotateY *= 1 - this.options.damping;
+            if (Math.abs(this.rotateX) < 0.0001) {
                 this.rotateX = 0;
+            }
+            if (Math.abs(this.rotateY) < 0.0001) {
                 this.rotateY = 0;
-            } else {
-                this.rotateX *= 1 - this.options.damping;
-                this.rotateY *= 1 - this.options.damping;
-                if (Math.abs(this.rotateX) < 0.0001) {
-                    this.rotateX = 0;
-                }
-                if (Math.abs(this.rotateY) < 0.0001) {
-                    this.rotateY = 0;
-                }
             }
         }
+        camera.lookAt(this.eyePos, center, this.upVector);
     }
 }
 

package/dist/camera/orbit.js.map

@@ -1 +1 @@
-{"version":3,"file":"orbit.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"orbit.js","sources":["../../src/camera/orbit.ts"],"sourcesContent":["import type { DeepRequireOptionals, Immutable } from '@zephyr3d/base';\r\nimport { Vector3, Quaternion } from '@zephyr3d/base';\r\nimport type {\r\n  IControllerMouseEvent,\r\n  IControllerPointerDownEvent,\r\n  IControllerPointerMoveEvent,\r\n  IControllerPointerUpEvent,\r\n  IControllerWheelEvent\r\n} from './base';\r\nimport { BaseCameraController } from './base';\r\n\r\n/**\r\n * Creation options for OrbitCameraController\r\n * @public\r\n */\r\nexport interface OrbitCameraControllerOptions {\r\n  /** target position */\r\n  center: Vector3;\r\n  /** damping value */\r\n  damping?: number;\r\n  /** Zooming speed */\r\n  zoomSpeed?: number;\r\n  /** Rotating speed */\r\n  rotateSpeed?: number;\r\n  /** Panning speed */\r\n  panSpeed?: number;\r\n  controls?: {\r\n    rotate?: {\r\n      button: number;\r\n      shiftKey: boolean;\r\n      ctrlKey: boolean;\r\n      altKey: boolean;\r\n      metaKey: boolean;\r\n    };\r\n    pan?: {\r\n      button: number;\r\n      shiftKey: boolean;\r\n      ctrlKey: boolean;\r\n      altKey: boolean;\r\n      metaKey: boolean;\r\n    };\r\n    zoom?: {\r\n      button: number;\r\n      shiftKey: boolean;\r\n      ctrlKey: boolean;\r\n      altKey: boolean;\r\n      metaKey: boolean;\r\n    };\r\n    zoomWheel?: boolean; // 是否启用滚轮缩放\r\n  };\r\n}\r\n\r\nenum OperationType {\r\n  NONE = 0,\r\n  ROTATE = 1,\r\n  PAN = 2,\r\n  ZOOM = 3\r\n}\r\n\r\n/**\r\n * Orbit camera controller\r\n * @public\r\n */\r\nexport class OrbitCameraController extends BaseCameraController {\r\n  /** @internal */\r\n  private readonly options: DeepRequireOptionals<OrbitCameraControllerOptions>;\r\n  /** @internal */\r\n  private lastMouseX!: number;\r\n  /** @internal */\r\n  private lastMouseY!: number;\r\n  /** @internal */\r\n  private rotateX!: number;\r\n  /** @internal */\r\n  private rotateY!: number;\r\n  /** @internal */\r\n  private readonly eyePos: Vector3;\r\n  /** @internal */\r\n  private upVector: Vector3;\r\n  /** @internal */\r\n  private readonly xVector: Vector3;\r\n  /** @internal */\r\n  private readonly direction: Vector3;\r\n  /** @internal */\r\n  private readonly quat: Quaternion;\r\n  /** @internal */\r\n  private currentOp!: OperationType;\r\n  /** @internal */\r\n  private panVelocityX!: number;\r\n  /** @internal */\r\n  private panVelocityY!: number;\r\n  /**\r\n   * Creates an instance of OrbitCameraController\r\n   * @param options - The creation options\r\n   */\r\n  constructor(options?: Partial<OrbitCameraControllerOptions>) {\r\n    super();\r\n    this.options = Object.assign(\r\n      {\r\n        center: Vector3.zero(),\r\n        damping: 1,\r\n        rotateSpeed: 1,\r\n        panSpeed: 1,\r\n        zoomSpeed: 1,\r\n        controls: {\r\n          rotate: {\r\n            button: 0,\r\n            shiftKey: false,\r\n            ctrlKey: false,\r\n            altKey: false,\r\n            metaKey: false\r\n          },\r\n          pan: {\r\n            button: 0,\r\n            shiftKey: true,\r\n            ctrlKey: false,\r\n            altKey: false,\r\n            metaKey: false\r\n          },\r\n          zoom: {\r\n            button: 2,\r\n            shiftKey: false,\r\n            ctrlKey: true,\r\n            altKey: false,\r\n            metaKey: false\r\n          },\r\n          zoomWheel: true\r\n        }\r\n      },\r\n      options || {}\r\n    );\r\n    this.eyePos = new Vector3();\r\n    this.upVector = new Vector3();\r\n    this.xVector = new Vector3();\r\n    this.direction = new Vector3();\r\n    this.quat = new Quaternion();\r\n    this.reset();\r\n  }\r\n  /** Rotation center */\r\n  get center(): Immutable<Vector3> {\r\n    return this.options.center;\r\n  }\r\n  set center(val: Immutable<Vector3>) {\r\n    const center = this.options.center;\r\n    const dx = val.x - center.x;\r\n    const dy = val.y - center.y;\r\n    const dz = val.z - center.z;\r\n    center.x += dx;\r\n    center.y += dy;\r\n    center.z += dz;\r\n    this.eyePos.x += dx;\r\n    this.eyePos.y += dy;\r\n    this.eyePos.z += dz;\r\n  }\r\n  /**\r\n   * {@inheritDoc BaseCameraController.reset}\r\n   * @override\r\n   */\r\n  reset() {\r\n    this.lastMouseX = 0;\r\n    this.lastMouseY = 0;\r\n    this.rotateX = 0;\r\n    this.rotateY = 0;\r\n    this.upVector = Vector3.axisPY();\r\n    this.currentOp = OperationType.NONE;\r\n    this.panVelocityX = 0;\r\n    this.panVelocityY = 0;\r\n    this._loadCameraParams();\r\n  }\r\n  /**\r\n   * {@inheritDoc BaseCameraController._onMouseDown}\r\n   * @override\r\n   */\r\n  protected _onMouseDown(evt: IControllerPointerDownEvent) {\r\n    if (this.matchesControl(evt, this.options.controls.rotate)) {\r\n      this.lastMouseX = evt.offsetX;\r\n      this.lastMouseY = evt.offsetY;\r\n      this.rotateX = 0;\r\n      this.rotateY = 0;\r\n      this.panVelocityX = 0;\r\n      this.panVelocityY = 0;\r\n      this.currentOp = OperationType.ROTATE;\r\n      return true;\r\n    } else if (this.matchesControl(evt, this.options.controls.pan)) {\r\n      this.lastMouseX = evt.offsetX;\r\n      this.lastMouseY = evt.offsetY;\r\n      this.rotateX = 0;\r\n      this.rotateY = 0;\r\n      this.panVelocityX = 0;\r\n      this.panVelocityY = 0;\r\n      this.currentOp = OperationType.PAN;\r\n      return true;\r\n    } else if (this.matchesControl(evt, this.options.controls.zoom)) {\r\n      this.lastMouseX = evt.offsetX;\r\n      this.lastMouseY = evt.offsetY;\r\n      this.currentOp = OperationType.ZOOM;\r\n      this.rotateX = 0;\r\n      this.rotateY = 0;\r\n      this.panVelocityX = 0;\r\n      this.panVelocityY = 0;\r\n      return true;\r\n    }\r\n    return false;\r\n  }\r\n  /**\r\n   * {@inheritDoc BaseCameraController._onMouseUp}\r\n   * @override\r\n   */\r\n  protected _onMouseUp(evt: IControllerPointerUpEvent) {\r\n    const control =\r\n      this.currentOp === OperationType.ROTATE\r\n        ? this.options.controls.rotate\r\n        : this.currentOp === OperationType.PAN\r\n          ? this.options.controls.pan\r\n          : this.currentOp === OperationType.ZOOM\r\n            ? this.options.controls.zoom\r\n            : null;\r\n    if (control && evt.button === control.button) {\r\n      this.currentOp = OperationType.NONE;\r\n      return true;\r\n    }\r\n    return false;\r\n  }\r\n  /**\r\n   * {@inheritDoc BaseCameraController._onMouseWheel}\r\n   * @override\r\n   */\r\n  protected _onMouseWheel(evt: IControllerWheelEvent) {\r\n    this.zoom(evt.deltaY);\r\n    return true;\r\n  }\r\n  /**\r\n   * {@inheritDoc BaseCameraController._onMouseMove}\r\n   * @override\r\n   */\r\n  protected _onMouseMove(evt: IControllerPointerMoveEvent) {\r\n    if (this.currentOp !== OperationType.NONE) {\r\n      const dx = evt.offsetX - this.lastMouseX;\r\n      const dy = evt.offsetY - this.lastMouseY;\r\n      this.lastMouseX = evt.offsetX;\r\n      this.lastMouseY = evt.offsetY;\r\n      if (this.currentOp === OperationType.ROTATE) {\r\n        this.rotateX -= dy * this.options.rotateSpeed * 0.005;\r\n        this.rotateY -= dx * this.options.rotateSpeed * 0.005;\r\n      } else if (this.currentOp === OperationType.PAN) {\r\n        this.panVelocityX = -dx * this.options.panSpeed;\r\n        this.panVelocityY = dy * this.options.panSpeed;\r\n      } else if (this.currentOp === OperationType.ZOOM) {\r\n        this.zoom(dy);\r\n      }\r\n      return true;\r\n    }\r\n    return false;\r\n  }\r\n  private zoom(dy: number) {\r\n    const distance = Vector3.distance(this.eyePos, this.options.center);\r\n    let t = dy > 0 ? this.options.zoomSpeed : dy < 0 ? -this.options.zoomSpeed : 0;\r\n    t = Math.exp(t * 0.1);\r\n    if (t > 1 || distance > 0.01) {\r\n      this.eyePos.combineBy(this.options.center, t, 1 - t);\r\n    }\r\n  }\r\n  private matchesControl(\r\n    evt: IControllerMouseEvent<any>,\r\n    control: {\r\n      button: number;\r\n      shiftKey: boolean;\r\n      ctrlKey: boolean;\r\n      altKey: boolean;\r\n      metaKey: boolean;\r\n    }\r\n  ) {\r\n    return (\r\n      evt.button === control.button &&\r\n      evt.shiftKey === control.shiftKey &&\r\n      evt.ctrlKey === control.ctrlKey &&\r\n      evt.altKey === control.altKey &&\r\n      evt.metaKey === control.metaKey\r\n    );\r\n  }\r\n  /** @internal */\r\n  private _loadCameraParams() {\r\n    const camera = this._getCamera();\r\n    if (camera) {\r\n      this.lookAt(camera.position, this.options.center, this.upVector);\r\n    }\r\n  }\r\n  lookAt(from: Vector3, to: Vector3, up: Vector3) {\r\n    const camera = this._getCamera();\r\n    if (camera) {\r\n      this.eyePos.set(from);\r\n      this.options.center.set(to);\r\n      this.upVector.set(up);\r\n      camera.lookAt(this.eyePos, this.options.center, this.upVector);\r\n      Vector3.sub(this.eyePos, this.options.center, this.direction);\r\n      this.direction.inplaceNormalize();\r\n      const mat = camera.localMatrix;\r\n      this.xVector.setXYZ(mat[0], mat[1], mat[2]);\r\n    }\r\n  }\r\n  /**\r\n   * Set options\r\n   * @param opt - options\r\n   */\r\n  setOptions(opt?: OrbitCameraControllerOptions) {\r\n    Object.assign(this.options, opt ?? {});\r\n    this.reset();\r\n  }\r\n  /**\r\n   * {@inheritDoc BaseCameraController.update}\r\n   * @override\r\n   */\r\n  update() {\r\n    const camera = this._getCamera()!;\r\n    const center = this.options.center;\r\n\r\n    if (Math.abs(this.panVelocityX) > 0.0001 || Math.abs(this.panVelocityY) > 0.0001) {\r\n      const right = this.xVector;\r\n      const up = this.upVector;\r\n\r\n      center.combineBy(right, 1, this.panVelocityX);\r\n      center.combineBy(up, 1, this.panVelocityY);\r\n      this.eyePos.combineBy(right, 1, this.panVelocityX);\r\n      this.eyePos.combineBy(up, 1, this.panVelocityY);\r\n\r\n      this.panVelocityX *= 1 - this.options.damping;\r\n      this.panVelocityY *= 1 - this.options.damping;\r\n\r\n      if (Math.abs(this.panVelocityX) < 0.0001) {\r\n        this.panVelocityX = 0;\r\n      }\r\n      if (Math.abs(this.panVelocityY) < 0.0001) {\r\n        this.panVelocityY = 0;\r\n      }\r\n    }\r\n\r\n    if (Math.abs(this.rotateX) > 0.0001 || Math.abs(this.rotateY) > 0.0001) {\r\n      Quaternion.fromAxisAngle(this.xVector, this.rotateX, this.quat);\r\n      this.quat.transform(this.eyePos.subBy(center), this.eyePos);\r\n      Quaternion.fromEulerAngle(0, this.rotateY, 0, 'ZYX', this.quat);\r\n      this.quat.transform(this.eyePos, this.eyePos);\r\n      this.quat.transform(this.xVector, this.xVector).inplaceNormalize();\r\n      Vector3.normalize(this.eyePos, this.direction).inplaceNormalize();\r\n      Vector3.cross(this.direction, this.xVector, this.upVector).inplaceNormalize();\r\n      this.eyePos.addBy(center);\r\n\r\n      this.rotateX *= 1 - this.options.damping;\r\n      this.rotateY *= 1 - this.options.damping;\r\n      if (Math.abs(this.rotateX) < 0.0001) {\r\n        this.rotateX = 0;\r\n      }\r\n      if (Math.abs(this.rotateY) < 0.0001) {\r\n        this.rotateY = 0;\r\n      }\r\n    }\r\n\r\n    camera.lookAt(this.eyePos, center, this.upVector);\r\n  }\r\n}\r\n"],"names":["OrbitCameraController","BaseCameraController","options","Object","assign","center","Vector3","zero","damping","rotateSpeed","panSpeed","zoomSpeed","controls","rotate","button","shiftKey","ctrlKey","altKey","metaKey","pan","zoom","zoomWheel","eyePos","upVector","xVector","direction","quat","Quaternion","reset","val","dx","x","dy","y","dz","z","lastMouseX","lastMouseY","rotateX","rotateY","axisPY","currentOp","panVelocityX","panVelocityY","_loadCameraParams","_onMouseDown","evt","matchesControl","offsetX","offsetY","_onMouseUp","control","_onMouseWheel","deltaY","_onMouseMove","distance","t","Math","exp","combineBy","camera","_getCamera","lookAt","position","from","to","up","set","sub","inplaceNormalize","mat","localMatrix","setXYZ","setOptions","opt","update","abs","right","fromAxisAngle","transform","subBy","fromEulerAngle","normalize","cross","addBy"],"mappings":"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"}

package/dist/camera/orthocamera.js

@@ -1,4 +1,5 @@
 import { Camera } from './camera.js';
+import { Matrix4x4 } from '@zephyr3d/base';
 
 /**
  * Orthogonal camera class
@@ -10,14 +11,17 @@ import { Camera } from './camera.js';
     _bottom;
     _near;
     _far;
+    _window;
     /**
-   * Creates an instance of PerspectiveCamera
+   * Creates an instance of OrthoCamera
    * @param scene - The scene that the camera belongs to.
-   * @param fovY - A radian value indicates the field of view in Y axis
-   * @param aspect - Aspect ratio of the perspective transform
-   * @param nearPlane - The near clip plane
-   * @param farPlane - The far clip plane
-   */ constructor(scene, left, right, bottom, top, near, far){
+   * @param left - The left clip plane
+   * @param right - The right clip plane
+   * @param bottom - The bottom clip plane
+   * @param top - The top clip plane
+   * @param near - The near clip plane
+   * @param far - The far clip plane
+   */ constructor(scene, left = -1, right = 1, bottom = -1, top = 1, near = -1, far = 1){
         super(scene);
         this._left = left;
         this._right = right;
@@ -25,6 +29,14 @@ import { Camera } from './camera.js';
         this._top = top;
         this._near = near;
         this._far = far;
+        this._window = null;
+        this._invalidate(true);
+    }
+    /** Sub-window of the frustum */ get window() {
+        return this._window;
+    }
+    set window(val) {
+        this._window = val?.slice() ?? null;
         this._invalidate(true);
     }
     /** The near clip plane */ get near() {
@@ -46,7 +58,7 @@ import { Camera } from './camera.js';
         }
     }
     /** The left clip plane */ get left() {
-        return this._left;
+        return this.adapted ? this.getProjectionMatrix().getLeftPlane() : this._left;
     }
     set left(val) {
         if (val !== this._left) {
@@ -55,7 +67,7 @@ import { Camera } from './camera.js';
         }
     }
     /** The right clip plane */ get right() {
-        return this._right;
+        return this.adapted ? this.getProjectionMatrix().getRightPlane() : this._right;
     }
     set right(val) {
         if (val !== this._right) {
@@ -64,7 +76,7 @@ import { Camera } from './camera.js';
         }
     }
     /** The top clip plane */ get top() {
-        return this._top;
+        return this.adapted ? this.getProjectionMatrix().getTopPlane() : this._top;
     }
     set top(val) {
         if (val !== this._top) {
@@ -73,7 +85,7 @@ import { Camera } from './camera.js';
         }
     }
     /** The bottom clip plane */ get bottom() {
-        return this._bottom;
+        return this.adapted ? this.getProjectionMatrix().getBottomPlane() : this._bottom;
     }
     set bottom(val) {
         if (val !== this._bottom) {
@@ -105,20 +117,39 @@ import { Camera } from './camera.js';
    * Setup a projection matrix for the camera
    * @param matrix - The projection matrix
    */ setProjectionMatrix(matrix) {
-        if (matrix && matrix !== this._projMatrix && matrix.isOrtho()) {
-            this._left = matrix.getLeftPlane();
-            this._right = matrix.getRightPlane();
-            this._near = matrix.getNearPlane();
-            this._far = matrix.getFarPlane();
-            this._top = matrix.getTopPlane();
-            this._bottom = matrix.getBottomPlane();
-            this._invalidate(true);
-        } else {
-            throw new Error(`OrthoCamera.setProjectionMatrix(): param is not an orthogonal projection matrix`);
+        if (matrix !== this._projMatrix) {
+            if (matrix?.isOrtho()) {
+                super.setProjectionMatrix(matrix);
+                this._left = matrix.getLeftPlane();
+                this._right = matrix.getRightPlane();
+                this._near = matrix.getNearPlane();
+                this._far = matrix.getFarPlane();
+                this._top = matrix.getTopPlane();
+                this._bottom = matrix.getBottomPlane();
+            } else {
+                throw new Error(`OrthoCamera.setProjectionMatrix(): param is not an orthogonal projection matrix`);
+            }
         }
     }
     /** @internal */ _computeProj() {
-        this._projMatrix.ortho(this._left, this._right, this._bottom, this._top, this._near, this._far);
+        if (this.adapted) {
+            this.calcAdaptedOrthographicProjection(this._near, this._far, this._projMatrix);
+        } else {
+            let left = this._left;
+            let right = this._right;
+            let bottom = this._bottom;
+            let top = this._top;
+            if (this._window) {
+                const width = right - left;
+                const height = top - bottom;
+                left += width * this._window[0];
+                bottom += height * this._window[1];
+                right = left + width * this._window[2];
+                top = bottom + height * this._window[3];
+            }
+            this._projMatrix.ortho(left, right, bottom, top, this._near, this._far);
+        }
+        Matrix4x4.invert(this._projMatrix, this._invProjMatrix);
     }
 }
 

package/dist/camera/orthocamera.js.map

@@ -1 +1 @@
-{"version":3,"file":"orthocamera.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"orthocamera.js","sources":["../../src/camera/orthocamera.ts"],"sourcesContent":["import { Camera } from './camera';\r\nimport type { Scene } from '../scene/scene';\r\nimport type { Immutable, Nullable } from '@zephyr3d/base';\r\nimport { Matrix4x4 } from '@zephyr3d/base';\r\n\r\n/**\r\n * Orthogonal camera class\r\n * @public\r\n */\r\nexport class OrthoCamera extends Camera {\r\n  /** @internal */\r\n  private _left: number;\r\n  private _right: number;\r\n  private _top: number;\r\n  private _bottom: number;\r\n  private _near: number;\r\n  private _far: number;\r\n  private _window: Nullable<number[]>;\r\n  /**\r\n   * Creates an instance of OrthoCamera\r\n   * @param scene - The scene that the camera belongs to.\r\n   * @param left - The left clip plane\r\n   * @param right - The right clip plane\r\n   * @param bottom - The bottom clip plane\r\n   * @param top - The top clip plane\r\n   * @param near - The near clip plane\r\n   * @param far - The far clip plane\r\n   */\r\n  constructor(scene: Nullable<Scene>, left = -1, right = 1, bottom = -1, top = 1, near = -1, far = 1) {\r\n    super(scene);\r\n    this._left = left;\r\n    this._right = right;\r\n    this._bottom = bottom;\r\n    this._top = top;\r\n    this._near = near;\r\n    this._far = far;\r\n    this._window = null;\r\n    this._invalidate(true);\r\n  }\r\n  /** Sub-window of the frustum */\r\n  get window(): Nullable<Immutable<number[]>> {\r\n    return this._window;\r\n  }\r\n  set window(val: Nullable<Immutable<number[]>>) {\r\n    this._window = val?.slice() ?? null;\r\n    this._invalidate(true);\r\n  }\r\n  /** The near clip plane */\r\n  get near() {\r\n    return this._near;\r\n  }\r\n  set near(val) {\r\n    if (val !== this._near) {\r\n      this._near = val;\r\n      this._invalidate(true);\r\n    }\r\n  }\r\n  /** The far clip plane */\r\n  get far() {\r\n    return this._far;\r\n  }\r\n  set far(val) {\r\n    if (val !== this._far) {\r\n      this._far = val;\r\n      this._invalidate(true);\r\n    }\r\n  }\r\n  /** The left clip plane */\r\n  get left() {\r\n    return this.adapted ? this.getProjectionMatrix().getLeftPlane() : this._left;\r\n  }\r\n  set left(val) {\r\n    if (val !== this._left) {\r\n      this._left = val;\r\n      this._invalidate(true);\r\n    }\r\n  }\r\n  /** The right clip plane */\r\n  get right() {\r\n    return this.adapted ? this.getProjectionMatrix().getRightPlane() : this._right;\r\n  }\r\n  set right(val) {\r\n    if (val !== this._right) {\r\n      this._right = val;\r\n      this._invalidate(true);\r\n    }\r\n  }\r\n  /** The top clip plane */\r\n  get top() {\r\n    return this.adapted ? this.getProjectionMatrix().getTopPlane() : this._top;\r\n  }\r\n  set top(val) {\r\n    if (val !== this._top) {\r\n      this._top = val;\r\n      this._invalidate(true);\r\n    }\r\n  }\r\n  /** The bottom clip plane */\r\n  get bottom() {\r\n    return this.adapted ? this.getProjectionMatrix().getBottomPlane() : this._bottom;\r\n  }\r\n  set bottom(val) {\r\n    if (val !== this._bottom) {\r\n      this._bottom = val;\r\n      this._invalidate(true);\r\n    }\r\n  }\r\n  /**\r\n   * Not valid for OrthoCamera\r\n   *\r\n   * @remarks\r\n   * This method is only valid for {@link Camera} class or {@link PerspectiveCamera} class.\r\n   */\r\n  setPerspective(): this {\r\n    throw new Error(`setPerspective() not allowed on OrthoCamera`);\r\n  }\r\n  /**\r\n   * {@inheritDoc Camera.setOrtho}\r\n   */\r\n  setOrtho(left: number, right: number, bottom: number, top: number, near: number, far: number) {\r\n    this._left = left;\r\n    this._right = right;\r\n    this._bottom = bottom;\r\n    this._top = top;\r\n    this._near = near;\r\n    this._far = far;\r\n    this._invalidate(true);\r\n    return this;\r\n  }\r\n  /**\r\n   * Setup a projection matrix for the camera\r\n   * @param matrix - The projection matrix\r\n   */\r\n  setProjectionMatrix(matrix: Matrix4x4) {\r\n    if (matrix !== this._projMatrix) {\r\n      if (matrix?.isOrtho()) {\r\n        super.setProjectionMatrix(matrix);\r\n        this._left = matrix.getLeftPlane();\r\n        this._right = matrix.getRightPlane();\r\n        this._near = matrix.getNearPlane();\r\n        this._far = matrix.getFarPlane();\r\n        this._top = matrix.getTopPlane();\r\n        this._bottom = matrix.getBottomPlane();\r\n      } else {\r\n        throw new Error(`OrthoCamera.setProjectionMatrix(): param is not an orthogonal projection matrix`);\r\n      }\r\n    }\r\n  }\r\n  /** @internal */\r\n  protected _computeProj() {\r\n    if (this.adapted) {\r\n      this.calcAdaptedOrthographicProjection(this._near, this._far, this._projMatrix);\r\n    } else {\r\n      let left = this._left;\r\n      let right = this._right;\r\n      let bottom = this._bottom;\r\n      let top = this._top;\r\n      if (this._window) {\r\n        const width = right - left;\r\n        const height = top - bottom;\r\n        left += width * this._window[0];\r\n        bottom += height * this._window[1];\r\n        right = left + width * this._window[2];\r\n        top = bottom + height * this._window[3];\r\n      }\r\n      this._projMatrix.ortho(left, right, bottom, top, this._near, this._far);\r\n    }\r\n    Matrix4x4.invert(this._projMatrix, this._invProjMatrix);\r\n  }\r\n}\r\n"],"names":["OrthoCamera","Camera","_right","_top","_bottom","_near","_far","_window","scene","left","right","bottom","top","near","far","_left","_invalidate","window","val","slice","adapted","getProjectionMatrix","getLeftPlane","getRightPlane","getTopPlane","getBottomPlane","setPerspective","Error","setOrtho","setProjectionMatrix","matrix","_projMatrix","isOrtho","getNearPlane","getFarPlane","calcAdaptedOrthographicProjection","width","height","ortho","Matrix4x4","invert","_invProjMatrix"],"mappings":"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"}