@woosh/meep-engine 2.119.39 → 2.119.40

package/package.json

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

package/src/core/geom/3d/triangle/computeTriangleClosestPointToPointBarycentric.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeTriangleClosestPointToPointBarycentric.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/triangle/computeTriangleClosestPointToPointBarycentric.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AACH,sEAhBW,MAAM,EAAE,iBACR,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,IAAI,CAgIhB"}
+{"version":3,"file":"computeTriangleClosestPointToPointBarycentric.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/3d/triangle/computeTriangleClosestPointToPointBarycentric.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AACH,sEAhBW,MAAM,EAAE,iBACR,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,IAAI,CAoJhB"}

package/src/core/geom/3d/triangle/computeTriangleClosestPointToPointBarycentric.js

@@ -24,7 +24,7 @@ export function computeTriangleClosestPointToPointBarycentric(
     ax, ay, az,
     bx, by, bz,
     cx, cy, cz
-){
+) {
     // adapted from https://github.com/mrdoob/three.js/blob/676e85dc7cd5971a6565c4152e9e6d8bdd20a2b7/src/math/Triangle.js#L222
 
     let v, w;
@@ -48,15 +48,15 @@ export function computeTriangleClosestPointToPointBarycentric(
     const _vap_y = py - ay;
     const _vap_z = pz - az;
 
-    const d1 = v3_dot(_vab_x, _vab_y, _vab_z,  _vap_x, _vap_y, _vap_z );
-    const d2 = v3_dot(_vac_x, _vac_y, _vac_z,  _vap_x, _vap_y, _vap_z );
+    const d1 = v3_dot(_vab_x, _vab_y, _vab_z, _vap_x, _vap_y, _vap_z);
+    const d2 = v3_dot(_vac_x, _vac_y, _vac_z, _vap_x, _vap_y, _vap_z);
 
-    if ( d1 <= 0 && d2 <= 0 ) {
+    if (d1 <= 0 && d2 <= 0) {
 
         // vertex region of A; barycentric coords (1, 0, 0)
 
         result[result_offset] = 1;
-        result[result_offset+1] = 0;
+        result[result_offset + 1] = 0;
 
         return;
 
@@ -66,28 +66,34 @@ export function computeTriangleClosestPointToPointBarycentric(
     const _vbp_y = py - by;
     const _vbp_z = pz - bz;
 
-    const d3 = v3_dot(_vab_x, _vab_y, _vab_z,  _vbp_x, _vbp_y, _vbp_z );
-    const d4 = v3_dot(_vac_x, _vac_y, _vac_z,  _vbp_x, _vbp_y, _vbp_z );
+    const d3 = v3_dot(_vab_x, _vab_y, _vab_z, _vbp_x, _vbp_y, _vbp_z);
+    const d4 = v3_dot(_vac_x, _vac_y, _vac_z, _vbp_x, _vbp_y, _vbp_z);
 
-    if ( d3 >= 0 && d4 <= d3 ) {
+    if (d3 >= 0 && d4 <= d3) {
 
         // vertex region of B; barycentric coords (0, 1, 0)
 
         result[result_offset] = 0;
-        result[result_offset+1] = 1;
+        result[result_offset + 1] = 1;
 
         return;
 
     }
 
     const vc = d1 * d4 - d3 * d2;
-    if ( vc <= 0 && d1 >= 0 && d3 <= 0  && d1 !== d3) {
+    if (vc <= 0 && d1 >= 0 && d3 <= 0) {
 
-        v = d1 / ( d1 - d3 );
+        const s = d1 - d3;
+
+        if (s !== 0) {
+            v = d1 / s;
+        } else {
+            v = 0;
+        }
         // edge region of AB; barycentric coords (1-v, v, 0)
 
-        result[result_offset] = 1-v;
-        result[result_offset+1] = v;
+        result[result_offset] = 1 - v;
+        result[result_offset + 1] = v;
 
         return;
 
@@ -97,52 +103,65 @@ export function computeTriangleClosestPointToPointBarycentric(
     const _vcp_y = py - cy;
     const _vcp_z = pz - cz;
 
-    const d5 = v3_dot(_vab_x, _vab_y, _vab_z,  _vcp_x, _vcp_y, _vcp_z );
-    const d6 = v3_dot(_vac_x, _vac_y, _vac_z,  _vcp_x, _vcp_y, _vcp_z );
+    const d5 = v3_dot(_vab_x, _vab_y, _vab_z, _vcp_x, _vcp_y, _vcp_z);
+    const d6 = v3_dot(_vac_x, _vac_y, _vac_z, _vcp_x, _vcp_y, _vcp_z);
 
-    if ( d6 >= 0 && d5 <= d6 ) {
+    if (d6 >= 0 && d5 <= d6) {
 
         // vertex region of C; barycentric coords (0, 0, 1)
 
         result[result_offset] = 0;
-        result[result_offset+1] = 0;
+        result[result_offset + 1] = 0;
 
         return;
 
     }
 
     const vb = d5 * d2 - d1 * d6;
-    if ( vb <= 0 && d2 >= 0 && d6 <= 0 && d2 !== d6 ) {
+    if (vb <= 0 && d2 >= 0 && d6 <= 0) {
+
+        const s = d2 - d6;
 
-        w = d2 / ( d2 - d6 );
+        if (s !== 0) {
+            w = d2 / s;
+        } else {
+            w = 0;
+        }
 
         // edge region of AC; barycentric coords (1-w, 0, w)
 
-        result[result_offset] = 1-w;
-        result[result_offset+1] = 0;
+        result[result_offset] = 1 - w;
+        result[result_offset + 1] = 0;
 
         return;
 
     }
 
     const va = d3 * d6 - d5 * d4;
-    if ( va <= 0 && ( d4 - d3 ) >= 0 && ( d5 - d6 ) >= 0 ) {
+    if (va <= 0 && (d4 - d3) >= 0 && (d5 - d6) >= 0) {
+
+        const s = (d4 - d3) + (d5 - d6);
+
+        if(s !== 0) {
+            w = (d4 - d3) / s;
+        }else{
+            w = 1;
+        }
 
-        w = ( d4 - d3 ) / ( ( d4 - d3 ) + ( d5 - d6 ) );
         // edge region of BC; barycentric coords (0, 1-w, w)
 
         result[result_offset] = 0;
-        result[result_offset+1] = 1-w;
+        result[result_offset + 1] = 1 - w;
 
         return;
 
     }
 
     // face region
-    const denom = 1 / ( va + vb + vc );
+    const denom = 1 / (va + vb + vc);
     const u = va * denom
     v = vb * denom;
 
     result[result_offset] = u;
-    result[result_offset+1] = v;
+    result[result_offset + 1] = v;
 }

package/src/engine/graphics/geometry/buffered/query/query_bvh_geometry_nearest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query_bvh_geometry_nearest.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/geometry/buffered/query/query_bvh_geometry_nearest.js"],"names":[],"mappings":"AAwBA;;;;;;;;;;;GAWG;AACH,uFARW,MAAM,EAAE,GAAC,YAAY,WACrB,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,KAChC,MAAM,KACN,MAAM,KACN,MAAM,gBACN,MAAM,GACL,OAAO,CA2KlB"}
+{"version":3,"file":"query_bvh_geometry_nearest.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/geometry/buffered/query/query_bvh_geometry_nearest.js"],"names":[],"mappings":"AAwBA;;;;;;;;;;;GAWG;AACH,uFARW,MAAM,EAAE,GAAC,YAAY,WACrB,MAAM,EAAE,GAAC,WAAW,GAAC,WAAW,KAChC,MAAM,KACN,MAAM,KACN,MAAM,gBACN,MAAM,GACL,OAAO,CA8KlB"}

package/src/engine/graphics/geometry/buffered/query/query_bvh_geometry_nearest.js

@@ -180,7 +180,10 @@ export function query_bvh_geometry_nearest(
             const contact_y = (by - ay) * v + (cy - ay) * w + ay;
             const contact_z = (bz - az) * v + (cz - az) * w + az;
 
-            const distance_to_triangle_sqr = v3_distance_sqr(contact_x, contact_y, contact_z, x, y, z);
+            const distance_to_triangle_sqr = v3_distance_sqr(
+                contact_x, contact_y, contact_z,
+                x, y, z
+            );
 
             if (distance_to_triangle_sqr >= nearest_distance_sqr) {
                 continue;