@woosh/meep-engine 2.119.42 → 2.119.43

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.119.42",
+  "version": "2.119.43",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/geom/3d/sphere/sphere_project.d.ts

@@ -1,10 +1,15 @@
 /**
  * Computations of screen-space pixel area covered by a sphere
  * NOTE: Port of GLSL code by Ingo Quilez. Source: http://www.iquilezles.org/www/articles/sphereproj/sphereproj.htm
- * @param {Vector4} sph Sphere in world space
- * @param {Matrix4} cam camera transform matrix (world to camera)(inverse world matrix of camera)
+ * @param {number[]|{0:number,1:number,2:number,3:number}} sph Sphere in world space
+ * @param {number[]|Float32Array} cam camera transform matrix (world to camera)(inverse world matrix of camera)
  * @param {number} fl focal length (fov in Radians)
  * @returns {number} area on the screen as a fraction, 1=entire screen, 0=zero area
  */
-export function sphere_project(sph: Vector4, cam: Matrix4, fl: number): number;
+export function sphere_project(sph: number[] | {
+    0: number;
+    1: number;
+    2: number;
+    3: number;
+}, cam: number[] | Float32Array, fl: number): number;
 //# sourceMappingURL=sphere_project.d.ts.map

package/src/core/geom/3d/sphere/sphere_project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sphere_project.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/sphere/sphere_project.js"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,+DAHW,MAAM,GACJ,MAAM,CA0BlB"}
+{"version":3,"file":"sphere_project.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/sphere/sphere_project.js"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,oCALW,MAAM,EAAE,GAAC;IAAC,CAAC,EAAC,MAAM,CAAC;IAAA,CAAC,EAAC,MAAM,CAAC;IAAA,CAAC,EAAC,MAAM,CAAC;IAAA,CAAC,EAAC,MAAM,CAAA;CAAC,OAC9C,MAAM,EAAE,GAAC,YAAY,MACrB,MAAM,GACJ,MAAM,CAoClB"}

package/src/core/geom/3d/sphere/sphere_project.js

@@ -7,23 +7,26 @@ const v4 = [];
 /**
  * Computations of screen-space pixel area covered by a sphere
  * NOTE: Port of GLSL code by Ingo Quilez. Source: http://www.iquilezles.org/www/articles/sphereproj/sphereproj.htm
- * @param {Vector4} sph Sphere in world space
- * @param {Matrix4} cam camera transform matrix (world to camera)(inverse world matrix of camera)
+ * @param {number[]|{0:number,1:number,2:number,3:number}} sph Sphere in world space
+ * @param {number[]|Float32Array} cam camera transform matrix (world to camera)(inverse world matrix of camera)
  * @param {number} fl focal length (fov in Radians)
  * @returns {number} area on the screen as a fraction, 1=entire screen, 0=zero area
  */
 export function sphere_project(sph, cam, fl) {
     assert.notNull(cam, 'cam');
+    assert.isNumber(fl, 'fl');
+    assert.greaterThan(fl, 0, 'fl');
 
-    v4[0] = sph.x;
-    v4[1] = sph.y;
-    v4[2] = sph.z;
+    v4[0] = sph[0];
+    v4[1] = sph[1];
+    v4[2] = sph[2];
     v4[3] = 1;
 
     //transform to camera space
-    v4_multiply_mat4(v4, v4, cam.elements);
+    v4_multiply_mat4(v4, v4, cam);
 
-    const r2 = sph.w * sph.w;
+    const r = sph[3];
+    const r2 = r * r;
 
     const v4_x = v4[0];
     const v4_y = v4[1];
@@ -33,7 +36,14 @@ export function sphere_project(sph, cam, fl) {
 
     const l2 = v3_dot(v4_x, v4_y, v4_z, v4_x, v4_y, v4_z);
 
-    const area = -Math.PI * fl * fl * r2 * Math.sqrt(Math.abs((l2 - r2) / (r2 - z2))) / (r2 - z2);
+    const rz2 = r2 - z2;
 
-    return area;
+    if (rz2 === 0) {
+        // avoid division by 0
+        return 0;
+    }
+
+    const area = -Math.PI * fl * fl * r2 * Math.sqrt(Math.abs((l2 - r2) / rz2)) / rz2;
+
+    return Math.abs(area);
 }

package/src/core/geom/3d/topology/simplify/quadratic/Quadratic3.d.ts

@@ -54,7 +54,7 @@ export class Quadratic3 {
     /**
      * Find optimal vertex position based on the quadratic
      *
-     * Based on Bleder's implementation: https://github.com/blender/blender/blob/594f47ecd2d5367ca936cf6fc6ec8168c2b360d0/source/blender/blenlib/intern/quadric.c
+     * Based on Blender's implementation: https://github.com/blender/blender/blob/594f47ecd2d5367ca936cf6fc6ec8168c2b360d0/source/blender/blenlib/intern/quadric.c
      *
      * @param {number[]} out
      * @returns {boolean}

package/src/core/geom/3d/topology/simplify/quadratic/Quadratic3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Quadratic3.d.ts","sourceRoot":"","sources":["../../../../../../../../src/core/geom/3d/topology/simplify/quadratic/Quadratic3.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH;IAGI,WAAO;IACP,WAAO;IACP,WAAO;IACP,WAAO;IAGP,WAAO;IACP,WAAO;IACP,WAAO;IAGP,WAAO;IACP,WAAO;IAGP,WAAO;IAGP;;;OAGG;IACH,kBAFW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,QAMjD;IAED;;;OAGG;IACH,eAFW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,QAcjD;IAED;;;;;OAKG;IACH,sBAJW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,WACvC,MAAM,GACJ,OAAO,CAkCnB;IAED;;;;;;OAMG;IACH,kBALW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAgBhB;IAED;;;OAGG;IACH,sCAmBC;IAED;;;;;;OAMG;IACH,YALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,MAAM,CASlB;IAED;;;;;;;OAOG;IACH,cAHW,MAAM,EAAE,GACN,OAAO,CAiBnB;IAED;;;OAGG;IACH,OAFW,UAAU,QAuBpB;IAED;;;OAGG;IACH,kBAFW,MAAM,QAoBhB;IAED;;;OAGG;IACH,SAFa,UAAU,CAQtB;IAED;;;OAGG;IACH,YAFW,UAAU,QAqBpB;IAED;;OAEG;IACH,cAmBC;CACJ"}
+{"version":3,"file":"Quadratic3.d.ts","sourceRoot":"","sources":["../../../../../../../../src/core/geom/3d/topology/simplify/quadratic/Quadratic3.js"],"names":[],"mappings":"AASA;;;GAGG;AACH;IAGI,WAAO;IACP,WAAO;IACP,WAAO;IACP,WAAO;IAGP,WAAO;IACP,WAAO;IACP,WAAO;IAGP,WAAO;IACP,WAAO;IAGP,WAAO;IAGP;;;OAGG;IACH,kBAFW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,QAMjD;IAED;;;OAGG;IACH,eAFW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,QAcjD;IAED;;;;;OAKG;IACH,sBAJW,UAAU,MAAM,CAAC,GAAC,MAAM,EAAE,GAAC,YAAY,WACvC,MAAM,GACJ,OAAO,CAkCnB;IAED;;;;;;OAMG;IACH,kBALW,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,QAgBhB;IAED;;;OAGG;IACH,sCAmBC;IAED;;;;;;OAMG;IACH,YALW,MAAM,KACN,MAAM,KACN,MAAM,GACJ,MAAM,CASlB;IAED;;;;;;;OAOG;IACH,cAHW,MAAM,EAAE,GACN,OAAO,CAgBnB;IAED;;;OAGG;IACH,OAFW,UAAU,QAuBpB;IAED;;;OAGG;IACH,kBAFW,MAAM,QAoBhB;IAED;;;OAGG;IACH,SAFa,UAAU,CAQtB;IAED;;;OAGG;IACH,YAFW,UAAU,QAqBpB;IAED;;OAEG;IACH,cAmBC;CACJ"}

package/src/core/geom/3d/topology/simplify/quadratic/Quadratic3.js

@@ -5,6 +5,7 @@ import { v3_dot } from "../../../../vec3/v3_dot.js";
 import { compute_triangle_normal } from "../../../compute_triangle_normal.js";
 
 const scratch_v3 = new Float32Array(3);
+const scratch_m3 = new Float32Array(9);
 
 /**
  * Quadric Error Metric
@@ -166,19 +167,18 @@ export class Quadratic3 {
     /**
      * Find optimal vertex position based on the quadratic
      *
-     * Based on Bleder's implementation: https://github.com/blender/blender/blob/594f47ecd2d5367ca936cf6fc6ec8168c2b360d0/source/blender/blenlib/intern/quadric.c
+     * Based on Blender's implementation: https://github.com/blender/blender/blob/594f47ecd2d5367ca936cf6fc6ec8168c2b360d0/source/blender/blenlib/intern/quadric.c
      *
      * @param {number[]} out
      * @returns {boolean}
      */
     optimize(out) {
-        const m = new Float32Array(9);
 
-        if (this.toTensorM3Inverse(m, EPSILON)) {
+        if (this.toTensorM3Inverse(scratch_m3, EPSILON)) {
 
             this.toVector3(out);
 
-            vec3.transformMat3(out, out, m);
+            vec3.transformMat3(out, out, scratch_m3);
             vec3.negate(out, out);
 
             return true;

package/src/engine/ecs/systems/AnimationSystem.js

@@ -286,7 +286,7 @@ class AnimationSystem extends System {
             v4boundingSphere.multiplyScalar(scaleMax);
             v4boundingSphere.add3(position);
 
-            const area = sphere_project(v4boundingSphere, cameraMatrix, focalLength);
+            const area = sphere_project(v4boundingSphere, cameraMatrix.elements, focalLength);
             const inPixels = area * viewportSize.x * viewportSize.y;
             return inPixels;
         }

package/src/engine/graphics/ecs/animation/animator/AnimationGraphSystem.js

@@ -240,7 +240,7 @@ export class AnimationGraphSystem extends System {
         v4boundingSphere.multiplyScalar(scaleMax);
         v4boundingSphere.add3(position);
 
-        const area = sphere_project(v4boundingSphere, cameraMatrix, this.__focalLength);
+        const area = sphere_project(v4boundingSphere, cameraMatrix.elements, this.__focalLength);
 
         /**
          *