feat(orbit): fix orbit under ortho camera

Orillusion · Jan 18, 2025 · 462b7f8 · 462b7f8
1 parent 750bded
commit 462b7f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/samples/base/Sample_CameraType.ts b/samples/base/Sample_CameraType.ts
@@ -85,8 +85,8 @@ let options = {
     fov: 45,
     frustumSize: 10,
     'ortho': () => {
-        options.near = -100
-        options.far = 100
+        options.near = -1000
+        options.far = 1000
         camera.ortho(options.frustumSize, options.near, options.far)
     },
     'perspective': () => {

diff --git a/src/components/controller/OrbitController.ts b/src/components/controller/OrbitController.ts
@@ -5,6 +5,7 @@ import { Vector3 } from '../../math/Vector3';
 import { Vector3Ex } from '../../util/Vector3Ex';
 import { clamp } from '../../math/MathUtil';
 import { PointerEvent3D } from '../../event/eventConst/PointerEvent3D';
+import { CameraType } from '../../core/CameraType';
 
 /**
  * Orbit Camera Controller
@@ -190,6 +191,7 @@ export class OrbitController extends ComponentBase {
         }
         if (changed) {
             this._spherical.setCoords(this._position.x - this._target.x, this._position.y - this._target.y, this._position.z - this._target.z)
+            this.updateCamera();
         } else if (!this._isMouseDown && this.autoRotate) {
             this._spherical.theta -= this.autoRotateSpeed * Math.PI / 180;
             this.updateCamera();
@@ -211,6 +213,15 @@ export class OrbitController extends ComponentBase {
         this._spherical.radius += e.deltaY * this.zoomFactor;
         this._spherical.radius = clamp(this._spherical.radius, this.minDistance, this.maxDistance);
         this.updateCamera();
+
+        if(this._camera.type === CameraType.ortho){
+            this._camera.frustumSize += e.deltaY * this.zoomFactor
+            if(this._camera.frustumSize < this._minDistance)
+                this._camera.frustumSize = this._minDistance
+            else if(this._camera.frustumSize > this._maxDistance)
+                this._camera.frustumSize = this._maxDistance
+            this._camera.updateProjection()
+        }
     }
     /**
      * @internal

diff --git a/src/core/Camera3D.ts b/src/core/Camera3D.ts
@@ -249,8 +249,8 @@ export class Camera3D extends ComponentBase {
      */
     public ortho(frustumSize: number, near: number, far: number) {
         this.frustumSize = frustumSize;
-        let w = frustumSize * 0.5 * this.aspect;
-        let h = frustumSize * 0.5;
+        let w = frustumSize * this.aspect;
+        let h = frustumSize;
         let left = -w / 2;
         let right = w / 2;
         let top = h / 2;