@woosh/meep-engine 2.34.23 → 2.34.24

package/core/bvh2/aabb3/aabb3_nearest_point_on_surface.js

@@ -0,0 +1,65 @@
+import { clamp } from "../../math/clamp.js";
+import { min2 } from "../../math/min2.js";
+
+//
+
+/**
+ *
+ * @param {number[]|ArrayLike<number>} result
+ * @param {number} x0
+ * @param {number} y0
+ * @param {number} z0
+ * @param {number} x1
+ * @param {number} y1
+ * @param {number} z1
+ * @param {number} r_x
+ * @param {number} r_y
+ * @param {number} r_z
+ */
+export function aabb3_nearest_point_on_surface(result, x0, y0, z0, x1, y1, z1, r_x, r_y, r_z) {
+    const ar_x0 = Math.abs(r_x - x0);
+    const ar_x1 = Math.abs(r_x - x1);
+    const ar_x_min = min2(ar_x0, ar_x1);
+
+    const ar_y0 = Math.abs(r_y - y0);
+    const ar_y1 = Math.abs(r_y - y1);
+    const ar_y_min = min2(ar_y0, ar_y1);
+
+    const ar_z0 = Math.abs(r_z - z0);
+    const ar_z1 = Math.abs(r_z - z1);
+    const ar_z_min = min2(ar_z0, ar_z1);
+
+    // figure out closest face to the reference point
+    if (ar_x_min > ar_y_min && ar_x_min > ar_z_min) {
+        // X is smallest, project onto X axis
+        if (ar_x0 <= ar_x1) {
+            result[0] = x0;
+        } else {
+            result[0] = x1;
+        }
+
+        result[1] = clamp(r_y, y0, y1);
+        result[2] = clamp(r_z, z0, z1);
+    } else if (ar_y_min > ar_x_min && ar_y_min > ar_z_min) {
+        // Y is smallest, project onto X axis
+        if (ar_y0 <= ar_y1) {
+            result[1] = y0;
+        } else {
+            result[1] = y1;
+        }
+
+        result[0] = clamp(r_x, x0, x1);
+        result[2] = clamp(r_z, z0, z1);
+    } else {
+        // project onto Z axis
+
+        if (ar_z0 <= ar_z1) {
+            result[2] = z0;
+        } else {
+            result[2] = z1;
+        }
+
+        result[0] = clamp(r_x, x0, x1);
+        result[1] = clamp(r_y, y0, y1);
+    }
+}

package/core/geom/3d/shape/UnitCubeShape3D.js

@@ -4,8 +4,8 @@ import { v3_length } from "../../v3_length.js";
 import { max2 } from "../../../math/max2.js";
 import { max3 } from "../../../math/max3.js";
 import { min2 } from "../../../math/min2.js";
-import { clamp } from "../../../math/clamp.js";
 import { compute_signed_distance_gradient_by_sampling } from "./util/compute_signed_distance_gradient_by_sampling.js";
+import { aabb3_nearest_point_on_surface } from "../../../bvh2/aabb3/aabb3_nearest_point_on_surface.js";
 
 export class UnitCubeShape3D extends AbstractShape3D {
 
@@ -18,43 +18,13 @@ export class UnitCubeShape3D extends AbstractShape3D {
         const r_y = reference[1];
         const r_z = reference[2];
 
-        // figure out closest face to the reference point
-        const ar_x = Math.abs(r_x);
-        const ar_y = Math.abs(r_y);
-        const ar_z = Math.abs(r_z);
+        aabb3_nearest_point_on_surface(
+            result,
+            -0.5, -0.5, -0.5,
+            0.5, 0.5, 0.5,
+            r_x, r_y, r_z
+        );
 
-        if (ar_x > ar_y && ar_x > ar_z) {
-            // X is smallest, project onto X axis
-            if (r_x <= 0) {
-                result[0] = -0.5;
-            } else {
-                result[0] = 0.5;
-            }
-
-            result[1] = clamp(r_y, -0.5, 0.5);
-            result[2] = clamp(r_z, -0.5, 0.5);
-        } else if (ar_y > ar_x && ar_y > ar_z) {
-            // Y is smallest, project onto X axis
-            if (r_y <= 0) {
-                result[1] = -0.5;
-            } else {
-                result[1] = 0.5;
-            }
-
-            result[0] = clamp(r_x, -0.5, 0.5);
-            result[2] = clamp(r_z, -0.5, 0.5);
-        } else {
-            // project onto Z axis
-
-            if (r_z <= 0) {
-                result[2] = -0.5;
-            } else {
-                result[2] = 0.5;
-            }
-
-            result[0] = clamp(r_x, -0.5, 0.5);
-            result[1] = clamp(r_y, -0.5, 0.5);
-        }
     }
 
     signed_distance_gradient_at_point(result, point) {

package/core/geom/3d/sphere/sphere_array_intersects_ray.js

@@ -0,0 +1,25 @@
+//
+
+import { sphere_intersects_ray } from "./sphere_intersects_ray.js";
+
+/**
+ *
+ * @param {number[]|ArrayLike<number>} sphere
+ * @param {number} origin_x
+ * @param {number} origin_y
+ * @param {number} origin_z
+ * @param {number} direction_x
+ * @param {number} direction_y
+ * @param {number} direction_z
+ * @returns {boolean}
+ */
+export function sphere_array_intersects_ray(
+    sphere,
+    origin_x, origin_y, origin_z,
+    direction_x, direction_y, direction_z
+) {
+    return sphere_intersects_ray(sphere[0], sphere[1], sphere[2], sphere[3],
+        origin_x, origin_y, origin_z,
+        direction_x, direction_y, direction_z
+    );
+}

package/core/geom/3d/sphere/sphere_intersects_ray.js

@@ -0,0 +1,51 @@
+//
+
+import { v3_dot } from "../../v3_dot.js";
+
+/**
+ *
+ * @param {number} center_x
+ * @param {number} center_y
+ * @param {number} center_z
+ * @param {number} radius
+ * @param {number} origin_x
+ * @param {number} origin_y
+ * @param {number} origin_z
+ * @param {number} direction_x
+ * @param {number} direction_y
+ * @param {number} direction_z
+ * @returns {boolean}
+ */
+export function sphere_intersects_ray(
+    center_x, center_y, center_z, radius,
+    origin_x, origin_y, origin_z,
+    direction_x, direction_y, direction_z
+) {
+    const delta_x = center_x - origin_x;
+    const delta_y = center_y - origin_y;
+    const delta_z = center_z - origin_z;
+
+    const tca = v3_dot(delta_x, delta_y, delta_z, direction_x, direction_y, direction_z);
+    const d2 = v3_dot(delta_x, delta_y, delta_z, delta_x, delta_y, delta_z) - tca * tca;
+
+    const radius2 = radius * radius;
+
+    if (d2 > radius2) {
+        return false;
+    }
+
+    const thc = Math.sqrt(radius2 - d2);
+
+    // t0 = first intersect point - entrance on front of sphere
+    const t0 = tca - thc;
+
+    // t1 = second intersect point - exit point on back of sphere
+    const t1 = tca + thc;
+
+    // test to see if both t0 and t1 are behind the ray - if so, no intersection
+    if (t0 < 0 && t1 < 0) {
+        return false;
+    }
+
+    return true;
+}

package/engine/graphics/micron/format/MicronGeometry.js

@@ -3,6 +3,7 @@ import { assert } from "../../../../core/assert.js";
 import { computeTriangleRayIntersection } from "../../../../core/geom/3d/triangle/computeTriangleRayIntersection.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
 import { aabb3_array_intersects_ray } from "../../../../core/bvh2/aabb3/aabb3_array_intersects_ray.js";
+import { sphere_array_intersects_ray } from "../../../../core/geom/3d/sphere/sphere_array_intersects_ray.js";
 
 let id_counter = 0;
 
@@ -104,16 +105,23 @@ export class MicronGeometry {
 
             const patch = stack[stack_cursor];
 
-            // using group bounding box because it's conservative, as we want to be able to hit LOD_0
-            const bb = patch.group_bounding_box;
+            // using group bounds because it's conservative, as we want to be able to hit LOD_0
 
-            const bb_intersection_exists = aabb3_array_intersects_ray(
-                bb,
+            // sphere test
+            if (!sphere_array_intersects_ray(patch.group_bounding_sphere,
                 origin_x, origin_y, origin_z,
                 direction_x, direction_y, direction_z
-            );
+            )) {
+                continue;
+            }
+
 
-            if (!bb_intersection_exists) {
+            // box test (more expensive, different volume)
+            if (!aabb3_array_intersects_ray(
+                patch.group_bounding_box,
+                origin_x, origin_y, origin_z,
+                direction_x, direction_y, direction_z
+            )) {
                 // no intersection
                 continue;
             }
@@ -122,6 +130,16 @@ export class MicronGeometry {
                 // LOD 0 - source geometry
 
                 // cast against bounds
+
+                // sphere test
+                if (!sphere_array_intersects_ray(patch.bounding_sphere,
+                    origin_x, origin_y, origin_z,
+                    direction_x, direction_y, direction_z
+                )) {
+                    continue;
+                }
+
+                // box test
                 if (!aabb3_array_intersects_ray(
                     patch.bounding_box,
                     origin_x, origin_y, origin_z,

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.34.23",
+  "version": "2.34.24",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",