@woosh/meep-engine 2.33.72 → 2.33.76

package/engine/graphics/ecs/camera/topdown/TopDownCameraController.js

@@ -8,10 +8,11 @@ import { assert } from "../../../../../core/assert.js";
 import { lerp } from "../../../../../core/math/lerp.js";
 import { Euler, Matrix4 } from "three";
 import { normalize_angle_rad } from "../../../../../core/geom/normalize_angle_rad.js";
-import { v3_angle_between_atan2 } from "../../../../../core/geom/v3_angle_between.js";
+import { eulerAnglesFromMatrix } from "../../../../../core/geom/3d/eulerAnglesFromMatrix.js";
 
 const m4 = new Matrix4();
 const euler = new Euler();
+const angles = [];
 
 const panOffset = new Vector3();
 
@@ -27,9 +28,12 @@ export function rotate_from_view(displacement_x, displacement_y, input, output)
     // crop yaw and pitch to safe range of -PI to PI
     const i_pitch = normalize_angle_rad(input.pitch);
     const i_yaw = normalize_angle_rad(input.yaw);
+    const i_roll = normalize_angle_rad(input.roll);
+
+    const d_roll = (i_roll >= (Math.PI / 2 - 0.0001) || i_roll <= -(Math.PI / 2 - 0.0001)) ? -1 : 1;
 
     // flip rotation axis when pitch is over 90deg in either direction, that is UP vector is pointing down
-    const d_yaw = ((i_pitch > Math.PI || i_pitch < -Math.PI) ? -1 : 1) * displacement_x;
+    const d_yaw = d_roll * ((i_pitch > Math.PI || i_pitch < 0) ? -1 : 1) * displacement_x;
 
     output.yaw = i_yaw + d_yaw;
     output.pitch = i_pitch - displacement_y;
@@ -123,56 +127,6 @@ class TopDownCameraController {
      * @param {Vector3} [up]
      */
     setFromEyeAndTarget(eye, target, up = Vector3.up) {
-        /**
-         * ----
-         * float projectOnPlane(Vector3 a, Vector3 b) {
-         *       Vector3 bProjection = (Vector3.Dot(a, b) / b.Length) * (b / b.Length);
-         *       return a - bProjection;
-         *  }
-         * ----
-         * @see https://gamedev.stackexchange.com/questions/134354/gravity-vector-and-forward-vector-to-local-heading-yaw-pitch-and-roll
-         * @param {Vector3} a
-         * @param {Vector3} b
-         */
-        function projectOnPlane(a, b) {
-            const i = a.dot(b) / b.length();
-            const j = new Vector3();
-            j.copy(b);
-            j.normalize();
-
-            j.multiplyScalar(i);
-
-            j.subVectors(a, j);
-
-            return j;
-        }
-
-        function pitch(direction, gravity) {
-            const heading = projectOnPlane(direction, gravity);
-
-            return v3_angle_between_atan2(
-                direction.x, direction.y, direction.z,
-                heading.x, heading.y, heading.z
-            )
-        }
-
-        function yaw(direction, gravity, north) {
-            const heading = projectOnPlane(direction, gravity);
-
-            return v3_angle_between_atan2(
-                heading.x, heading.y, heading.z,
-                north.x, north.y, north.z,
-            );
-        }
-
-
-        // extract pitch and yaw only
-        const view_vector = new Vector3();
-        view_vector.subVectors(eye, target);
-
-
-        const _p3 = pitch(view_vector, up);
-        const _y3 = yaw(view_vector, up, Vector3.back);
 
         /*
         NOTE: I'm not sure why, but three.js camera points in the opposite direction to normal objects
@@ -180,17 +134,11 @@ class TopDownCameraController {
          */
         m4.lookAt(target, eye, up);
 
+        eulerAnglesFromMatrix(angles, m4.elements, 2, 1, 0)
 
-        euler.setFromRotationMatrix(m4, 'ZYX');
-
-
-        const _p0 = normalize_angle_rad(euler.x);
-        const _y0 = normalize_angle_rad(euler.y);
-        const _r0 = normalize_angle_rad(euler.z);
-
-        this.pitch = _p3;
-        this.yaw = _y3;
-        this.roll = 0;
+        this.pitch = angles[2];
+        this.yaw = angles[1];
+        this.roll = angles[0];
 
         this.distance = eye.distanceTo(target);
 

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.72",
+  "version": "2.33.76",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",