@woosh/meep-engine 2.87.4 → 2.87.6

package/package.json

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

package/src/core/geom/2d/aabb/aabb2_intersects_ray.d.ts

@@ -8,7 +8,7 @@
  * @param {number} origin_y
  * @param {number} direction_x
  * @param {number} direction_y
- * @return {number} distance to hit if possible, and a negative value if not hit occurred
+ * @return {boolean} true if hit found and false otherwise
  */
-export function aabb2_intersects_ray(x0: number, y0: number, x1: number, y1: number, origin_x: number, origin_y: number, direction_x: number, direction_y: number): number;
+export function aabb2_intersects_ray(x0: number, y0: number, x1: number, y1: number, origin_x: number, origin_y: number, direction_x: number, direction_y: number): boolean;
 //# sourceMappingURL=aabb2_intersects_ray.d.ts.map

package/src/core/geom/2d/aabb/aabb2_intersects_ray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aabb2_intersects_ray.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/aabb/aabb2_intersects_ray.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,yCAVW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,YACN,MAAM,YACN,MAAM,eACN,MAAM,eACN,MAAM,GACL,MAAM,CAwCjB"}
+{"version":3,"file":"aabb2_intersects_ray.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/aabb/aabb2_intersects_ray.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,yCAVW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,YACN,MAAM,YACN,MAAM,eACN,MAAM,eACN,MAAM,GACL,OAAO,CAqClB"}

package/src/core/geom/2d/aabb/aabb2_intersects_ray.js

@@ -10,7 +10,7 @@ import { fabsf } from "../../../math/fabsf.js";
  * @param {number} origin_y
  * @param {number} direction_x
  * @param {number} direction_y
- * @return {number} distance to hit if possible, and a negative value if not hit occurred
+ * @return {boolean} true if hit found and false otherwise
  */
 export function aabb2_intersects_ray(
     x0, y0,
@@ -25,9 +25,8 @@ export function aabb2_intersects_ray(
 
     const diff_x = origin_x - center_x;
 
-
     if (diff_x * direction_x >= 0.0 && fabsf(diff_x) > extents_x) {
-        return -1;
+        return false;
     }
 
     // Y projection
@@ -37,9 +36,8 @@ export function aabb2_intersects_ray(
 
     const diff_y = origin_y - center_y;
 
-
     if (diff_y * direction_y >= 0.0 && fabsf(diff_y) > extents_y) {
-        return -1;
+        return false;
     }
 
     const abs_direction_y = fabsf(direction_y);
@@ -48,6 +46,5 @@ export function aabb2_intersects_ray(
 
     const f2 = fabsf(direction_x * diff_y - direction_y * diff_x);
 
-    const distance_g = extents_x * abs_direction_y + extents_y * abs_direction_x;
-    return distance_g - f2;
+    return f2 <= extents_x * abs_direction_y + extents_y * abs_direction_x;
 }

package/src/core/geom/2d/aabb/aabb2_intersects_ray.spec.js

@@ -7,7 +7,7 @@ test("diagonal ray hit", () => {
             1, 1, 2, 2, 0, 0,
             Math.SQRT2, Math.SQRT2
         )
-    ).toBeCloseTo(Math.SQRT2);
+    ).toBe(true);
 
 
     expect(
@@ -15,14 +15,14 @@ test("diagonal ray hit", () => {
             1, 1, 2, 2, 3, 3,
             -Math.SQRT2, -Math.SQRT2
         )
-    ).toBeCloseTo(Math.SQRT2);
+    ).toBe(true);
 
     expect(
         aabb2_intersects_ray(
             1, 1, 2, 2, 3, 0,
             -Math.SQRT2, Math.SQRT2
         )
-    ).toBeCloseTo(Math.SQRT2);
+    ).toBe(true);
 
 
 });

package/src/core/geom/2d/quad-tree/qt_query_data_raycast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qt_query_data_raycast.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/quad-tree/qt_query_data_raycast.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;GAWG;AACH,0EATW,MAAM,YACN,MAAM,eACN,MAAM,eACN,MAAM,gBACN,MAAM,2CAGJ,mBAAiB,SAAS,CA0EtC"}
+{"version":3,"file":"qt_query_data_raycast.d.ts","sourceRoot":"","sources":["../../../../../../src/core/geom/2d/quad-tree/qt_query_data_raycast.js"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AACH,0EATW,MAAM,YACN,MAAM,eACN,MAAM,eACN,MAAM,gBACN,MAAM,2CAGJ,mBAAiB,SAAS,CA6EtC"}

package/src/core/geom/2d/quad-tree/qt_query_data_raycast.js

@@ -1,3 +1,4 @@
+import { aabb2_distance_sqr_to_point } from "../aabb/aabb2_distance_sqr_to_point.js";
 import { aabb2_intersects_ray } from "../aabb/aabb2_intersects_ray.js";
 
 /**
@@ -38,20 +39,21 @@ export function qt_query_data_raycast(
      * @type {QuadTreeDatum<T>|undefined}
      */
     let best_match = undefined;
-    let best_match_distance = max_distance;
+    let best_match_distance = max_distance2;
 
     while (stack_pointer > 0) {
 
         --stack_pointer;
         const node = node_stack[stack_pointer];
 
-        const d2 = aabb2_intersects_ray(node.x0, node.y0, node.x1, node.y1, origin_x, origin_y, direction_x, direction_y);
+        const hit_node = aabb2_intersects_ray(node.x0, node.y0, node.x1, node.y1, origin_x, origin_y, direction_x, direction_y);
 
-        if (d2 < 0) {
-            // no hit
+        if (!hit_node) {
             continue;
         }
 
+        const d2 = aabb2_distance_sqr_to_point(node.x0, node.y0, node.x1, node.y1, origin_x, origin_y);
+
         if (d2 > best_match_distance) {
             // too far, not a match
             continue;
@@ -63,12 +65,14 @@ export function qt_query_data_raycast(
         for (let i = 0; i < data_count; i++) {
             const datum = data[i];
 
-            const d_to_datum = aabb2_intersects_ray(datum.x0, datum.y0, datum.x1, datum.y1, origin_x, origin_y, direction_x, direction_y);
+            const hit_datum = aabb2_intersects_ray(datum.x0, datum.y0, datum.x1, datum.y1, origin_x, origin_y, direction_x, direction_y);
 
-            if (d_to_datum < 0) {
+            if (!hit_datum) {
                 continue;
             }
 
+            const d_to_datum = aabb2_distance_sqr_to_point(datum.x0, datum.y0, datum.x1, datum.y1, origin_x, origin_y);
+
             if (d_to_datum < best_match_distance && predicate.call(
                 predicateContext,
                 datum.data,