@woosh/meep-engine 2.34.16 → 2.34.20

package/core/bvh2/aabb3/aabb3_array_intersects_ray.js

@@ -0,0 +1,20 @@
+//
+
+import { intersectRay } from "./AABB3Math.js";
+
+/**
+ *
+ * @param {ArrayLike<number>|number[]|Float32Array} aabb bounding box, order: x0,y0,z0,x1,y1,z1
+ * @param {number} origin_x
+ * @param {number} origin_y
+ * @param {number} origin_z
+ * @param {number} direction_x
+ * @param {number} direction_y
+ * @param {number} direction_z
+ */
+export function aabb3_array_intersects_ray(aabb, origin_x, origin_y, origin_z, direction_x, direction_y, direction_z) {
+    return intersectRay(aabb[0], aabb[1], aabb[2], aabb[3], aabb[4], aabb[5],
+        origin_x, origin_y, origin_z,
+        direction_x, direction_y, direction_z
+    );
+}

package/core/geom/v3_distance_sqr.d.ts

@@ -0,0 +1 @@
+export function v3_distance_sqr(x0: number, y0: number, z0: number, x1: number, y1: number, z1: number): number

package/engine/graphics/geometry/buffered/query/GeometrySpatialQueryAccelerator.d.ts

@@ -8,4 +8,11 @@ export class GeometrySpatialQueryAccelerator {
     queryContainmentViaClippingPlanes(geometry: BufferGeometry, planes: Plane[]): number
 
     queryRaycastNearest(destination: SurfacePoint3, geometry: BufferGeometry, ray_origin: Vector3, ray_direction: Vector3): boolean
+
+    queryRaycastNearest_primitive(
+        destination: SurfacePoint3,
+        geometry: BufferGeometry,
+        origin_x: number, origin_y: number, origin_z: number,
+        direction_x: number, direction_y: number, direction_z: number
+    ): boolean
 }

package/engine/graphics/micron/build/hierarchy/merge_patches.js

@@ -513,7 +513,13 @@ export async function merge_patches(
         return 0;
     } else if (node_count === 1) {
         // only 1 patch, no merge opportunity, forward it to output directly
-        output[output_offset.value++] = nodes[0];
+        const node = nodes[0];
+
+        //set group bounds to produce a valid root
+        node.group_aabb.copy(node.bounding_box);
+        node.group_bounding_sphere.set(node.bounding_sphere);
+
+        output[output_offset.value++] = node;
         return 1;
     } else {
 

package/engine/graphics/micron/format/MicronGeometry.d.ts

@@ -12,4 +12,6 @@ export class MicronGeometry {
         origin_x: number, origin_y: number, origin_z: number,
         direction_x: number, direction_y: number, direction_z: number
     ): SurfacePoint3[]
+
+    readonly isMicronGeometry: boolean
 }

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

@@ -1,11 +1,17 @@
 import { VertexDataSpec } from "../../geometry/VertexDataSpec.js";
 import { assert } from "../../../../core/assert.js";
-import { intersectRay } from "../../../../core/bvh2/aabb3/AABB3Math.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";
 
 let id_counter = 0;
 
+/**
+ * @readonly
+ * @type {MicronGeometryPatch[]}
+ */
+const scratch_traversal_stack = [];
+
 export class MicronGeometry {
     constructor() {
         /**
@@ -79,8 +85,10 @@ export class MicronGeometry {
          */
         const hits = [];
 
+        // initialize stack
         let stack_cursor = 1;
-        const stack = [this.root];
+        const stack = scratch_traversal_stack;
+        stack[0] = this.root;
 
         const spec = this.vertex_spec;
 
@@ -99,8 +107,8 @@ export class MicronGeometry {
             // using group bounding box because it's conservative, as we want to be able to hit LOD_0
             const bb = patch.group_bounding_box;
 
-            const bb_intersection_exists = intersectRay(
-                bb[0], bb[1], bb[2], bb[3], bb[4], bb[5],
+            const bb_intersection_exists = aabb3_array_intersects_ray(
+                bb,
                 origin_x, origin_y, origin_z,
                 direction_x, direction_y, direction_z
             );
@@ -113,6 +121,15 @@ export class MicronGeometry {
             if (patch.lod === 0) {
                 // LOD 0 - source geometry
 
+                // cast against bounds
+                if (!aabb3_array_intersects_ray(
+                    patch.bounding_box,
+                    origin_x, origin_y, origin_z,
+                    direction_x, direction_y, direction_z
+                )) {
+                    continue;
+                }
+
                 // raycast against geometry
                 const indices = patch.face_indices;
                 const index_count = indices.length;

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