Added forward getter to gizmo and fixed plane flipping for ortho

slimbuck · Oct 24, 2024 · 54fd4fe · 54fd4fe
1 parent a95cea4
commit 54fd4fe
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 33 deletions.
diff --git a/src/extras/gizmo/gizmo.js b/src/extras/gizmo/gizmo.js
@@ -21,6 +21,7 @@ import { GIZMOSPACE_LOCAL, GIZMOSPACE_WORLD } from './constants.js';
 
 // temporary variables
 const tmpV1 = new Vec3();
+const tmpV2 = new Vec3();
 const tmpM1 = new Mat4();
 const tmpM2 = new Mat4();
 const tmpR1 = new Ray();
@@ -337,6 +338,17 @@ class Gizmo extends EventHandler {
         return this._size;
     }
 
+    /**
+     * @type {Vec3}
+     * @protected
+     */
+    get forward() {
+        if (this._camera.projection === PROJECTION_PERSPECTIVE) {
+            return tmpV2.copy(this.root.getPosition()).sub(this._camera.entity.getPosition()).normalize();
+        }
+        return tmpV2.copy(this._camera.entity.forward);
+    }
+
     /**
      * @param {PointerEvent} e - The pointer event.
      * @private

diff --git a/src/extras/gizmo/scale-gizmo.js b/src/extras/gizmo/scale-gizmo.js
@@ -95,14 +95,6 @@ class ScaleGizmo extends TransformGizmo {
      */
     _nodeScales = new Map();
 
-    /**
-     * Internal forward vector of the camera in the direction of the gizmo.
-     *
-     * @type {Vec3}
-     * @private
-     */
-    _forward = new Vec3();
-
     /**
      * Internal state if transform should use uniform scaling.
      *
@@ -380,39 +372,38 @@ class ScaleGizmo extends TransformGizmo {
      * @private
      */
     _shapesLookAtCamera() {
-        this._forward.copy(this.root.getPosition()).sub(this._camera.entity.getPosition()).normalize();
-
-        let dot = this._forward.dot(this.root.right);
+        const forward = this.forward;
+        let dot = forward.dot(this.root.right);
         this._shapes.x.entity.enabled = Math.abs(dot) < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.x.flipped = dot > 0;
         }
 
-        dot = this._forward.dot(this.root.up);
+        dot = forward.dot(this.root.up);
         this._shapes.y.entity.enabled = Math.abs(dot) < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.y.flipped = dot > 0;
         }
 
-        dot = this._forward.dot(this.root.forward);
+        dot = forward.dot(this.root.forward);
         this._shapes.z.entity.enabled = Math.abs(dot) < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.z.flipped = dot < 0;
         }
 
-        tmpV1.cross(this._forward, this.root.right);
+        tmpV1.cross(forward, this.root.right);
         this._shapes.yz.entity.enabled = tmpV1.length() < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.yz.flipped = tmpV2.set(0, +(tmpV1.dot(this.root.forward) > 0), +(tmpV1.dot(this.root.up) > 0));
         }
 
-        tmpV1.cross(this._forward, this.root.forward);
+        tmpV1.cross(forward, this.root.forward);
         this._shapes.xy.entity.enabled = tmpV1.length() < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.xy.flipped = tmpV2.set(+(tmpV1.dot(this.root.up) > 0), +(tmpV1.dot(this.root.right) < 0), 0);
         }
 
-        tmpV1.cross(this._forward, this.root.up);
+        tmpV1.cross(forward, this.root.up);
         this._shapes.xz.entity.enabled = tmpV1.length() < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.xz.flipped = tmpV2.set(+(tmpV1.dot(this.root.forward) < 0), 0, +(tmpV1.dot(this.root.right) < 0));

diff --git a/src/extras/gizmo/transform-gizmo.js b/src/extras/gizmo/transform-gizmo.js
@@ -139,7 +139,6 @@ class TransformGizmo extends Gizmo {
      */
     _rootStartPos = new Vec3();
 
-
     /**
      * Internal gizmo starting rotation in world space.
      *

diff --git a/src/extras/gizmo/translate-gizmo.js b/src/extras/gizmo/translate-gizmo.js
@@ -107,14 +107,6 @@ class TranslateGizmo extends TransformGizmo {
      */
     _nodePositions = new Map();
 
-    /**
-     * Internal forward vector of the camera in the direction of the gizmo.
-     *
-     * @type {Vec3}
-     * @private
-     */
-    _forward = new Vec3();
-
     /**
      * @override
      */
@@ -369,39 +361,38 @@ class TranslateGizmo extends TransformGizmo {
      * @private
      */
     _shapesLookAtCamera() {
-        this._forward.copy(this.root.getPosition()).sub(this._camera.entity.getPosition()).normalize();
-
-        let dot = this._forward.dot(this.root.right);
+        const forward = this.forward;
+        let dot = forward.dot(this.root.right);
         this._shapes.x.entity.enabled = Math.abs(dot) < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.x.flipped = dot > 0;
         }
 
-        dot = this._forward.dot(this.root.up);
+        dot = forward.dot(this.root.up);
         this._shapes.y.entity.enabled = Math.abs(dot) < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.y.flipped = dot > 0;
         }
 
-        dot = this._forward.dot(this.root.forward);
+        dot = forward.dot(this.root.forward);
         this._shapes.z.entity.enabled = Math.abs(dot) < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.z.flipped = dot < 0;
         }
 
-        tmpV1.cross(this._forward, this.root.right);
+        tmpV1.cross(forward, this.root.right);
         this._shapes.yz.entity.enabled = tmpV1.length() < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.yz.flipped = tmpV2.set(0, +(tmpV1.dot(this.root.forward) > 0), +(tmpV1.dot(this.root.up) > 0));
         }
 
-        tmpV1.cross(this._forward, this.root.forward);
+        tmpV1.cross(forward, this.root.forward);
         this._shapes.xy.entity.enabled = tmpV1.length() < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.xy.flipped = tmpV2.set(+(tmpV1.dot(this.root.up) > 0), +(tmpV1.dot(this.root.right) < 0), 0);
         }
 
-        tmpV1.cross(this._forward, this.root.up);
+        tmpV1.cross(forward, this.root.up);
         this._shapes.xz.entity.enabled = tmpV1.length() < GLANCE_EPSILON;
         if (this.flipShapes) {
             this._shapes.xz.flipped = tmpV2.set(+(tmpV1.dot(this.root.forward) < 0), 0, +(tmpV1.dot(this.root.right) < 0));
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,6 @@ class TransformGizmo extends Gizmo { @@
          */
         _rootStartPos = new Vec3();
         /**
          * Internal gizmo starting rotation in world space.
          *
@@ Expand Down @@