@woosh/meep-engine 2.131.43 → 2.131.45

package/package.json

@@ -5,7 +5,7 @@
   "description": "Pure JavaScript game engine. Fully featured and production ready.",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.131.43",
+  "version": "2.131.45",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/geom/3d/plane/plane3_matrix4_project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plane3_matrix4_project.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/plane/plane3_matrix4_project.js"],"names":[],"mappings":"AAOA;;;;;;;;;GASG;AACH,oDARW,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,sBAClC,MAAM,UACN,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,KAClC,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAiBhB"}
+{"version":3,"file":"plane3_matrix4_project.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/plane/plane3_matrix4_project.js"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,oDARW,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,sBAClC,MAAM,UACN,MAAM,EAAE,GAAC,YAAY,GAAC,YAAY,KAClC,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAuBhB"}

package/src/core/geom/3d/plane/plane3_matrix4_project.js

@@ -1,9 +1,7 @@
-import { v3_dot_array_array } from "../../vec3/v3_dot_array_array.js";
-import { v3_matrix4_multiply } from "../../vec3/v3_matrix4_multiply.js";
-import { v3_matrix4_rotate } from "../../vec3/v3_matrix4_rotate.js";
-import { v3_multiply_scalar } from "../../vec3/v3_multiply_scalar.js";
+import { m4_invert } from "../mat4/m4_invert.js";
+
+const mat_inv = new Float32Array(16);
 
-const scratch_v3_0 = new Float32Array(3);
 
 /**
  *
@@ -21,13 +19,19 @@ export function plane3_matrix4_project(
     x, y, z, w,
 ) {
 
-    // build reference point in the new pane
-    v3_multiply_scalar(scratch_v3_0, 0, x, y, z, -w);
-    v3_matrix4_multiply(scratch_v3_0, 0, scratch_v3_0, 0, matrix);
+    m4_invert(mat_inv, matrix);
+
+    // multiply by transpose
+    const nx = x * mat_inv[0] + y * mat_inv[1] + z * mat_inv[2] + w * mat_inv[3];
+    const ny = x * mat_inv[4] + y * mat_inv[5] + z * mat_inv[6] + w * mat_inv[7];
+    const nz = x * mat_inv[8] + y * mat_inv[9] + z * mat_inv[10] + w * mat_inv[11];
+    const nw = x * mat_inv[12] + y * mat_inv[13] + z * mat_inv[14] + w * mat_inv[15];
 
-    // construct rotation matrix for the normal
-    v3_matrix4_rotate(destination, destination_offset, x, y, z, matrix);
+    // Re-normalize
+    const len = Math.sqrt(nx * nx + ny * ny + nz * nz);
 
-    // figure out new planar offset using new orientation and a reference point
-    destination[destination_offset + 3] = -v3_dot_array_array(scratch_v3_0, 0, destination, destination_offset);
+    destination[destination_offset] = nx / len;
+    destination[destination_offset + 1] = ny / len;
+    destination[destination_offset + 2] = nz / len;
+    destination[destination_offset + 3] = nw / len;
 }

package/src/core/geom/vec3/v3_matrix4_rotate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v3_matrix4_rotate.d.ts","sourceRoot":"","sources":["../../../../../src/core/geom/vec3/v3_matrix4_rotate.js"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,0CAPW,MAAM,EAAE,GAAC,YAAY,iBACrB,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,MACN,MAAM,EAAE,GAAC,YAAY,QAkB/B"}
+{"version":3,"file":"v3_matrix4_rotate.d.ts","sourceRoot":"","sources":["../../../../../src/core/geom/vec3/v3_matrix4_rotate.js"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,0CAPW,MAAM,EAAE,GAAC,YAAY,iBACrB,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,MACN,MAAM,EAAE,GAAC,YAAY,QAoB/B"}

package/src/core/geom/vec3/v3_matrix4_rotate.js

@@ -1,5 +1,8 @@
+import { m4_invert } from "../3d/mat4/m4_invert.js";
 import { v3_length } from "./v3_length.js";
 
+const m4_inv = new Float32Array(16);
+
 /**
  * Perform rotation on a direction vector using 3x3 portion of a 4x4 matrix
  * @param {number[]|Float32Array} output
@@ -15,9 +18,11 @@ export function v3_matrix4_rotate(
     m4
 ) {
 
-    const _x = m4[0] * x + m4[4] * y + m4[8] * z;
-    const _y = m4[1] * x + m4[5] * y + m4[9] * z;
-    const _z = m4[2] * x + m4[6] * y + m4[10] * z;
+    m4_invert(m4_inv, m4);
+
+    const _x = m4_inv[0] * x + m4_inv[1] * y + m4_inv[2] * z;
+    const _y = m4_inv[4] * x + m4_inv[5] * y + m4_inv[6] * z;
+    const _z = m4_inv[8] * x + m4_inv[9] * y + m4_inv[10] * z;
 
     // perform normalization
     const norm = 1 / v3_length(_x, _y, _z);