@woosh/meep-engine 2.119.34 → 2.119.36

package/package.json

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

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

@@ -80,7 +80,7 @@ export function computeTriangleClosestPointToPointBarycentric(
     }
 
     const vc = d1 * d4 - d3 * d2;
-    if ( vc <= 0 && d1 >= 0 && d3 <= 0 ) {
+    if ( vc <= 0 && d1 >= 0 && d3 <= 0  && d1 !== d3) {
 
         v = d1 / ( d1 - d3 );
         // edge region of AB; barycentric coords (1-v, v, 0)
@@ -111,7 +111,7 @@ export function computeTriangleClosestPointToPointBarycentric(
     }
 
     const vb = d5 * d2 - d1 * d6;
-    if ( vb <= 0 && d2 >= 0 && d6 <= 0 ) {
+    if ( vb <= 0 && d2 >= 0 && d6 <= 0 && d2 !== d6 ) {
 
         w = d2 / ( d2 - d6 );
 

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

@@ -0,0 +1,14 @@
+/**
+ *
+ * @param {SurfacePoint3} result
+ * @param {BVH} bvh
+ * @param {number[]|Float32Array} positions
+ * @param {number[]|Uint32Array|Uint16Array} indices
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number} max_distance
+ * @return {boolean}
+ */
+export function query_bvh_geometry_nearest(result: SurfacePoint3, bvh: BVH, positions: number[] | Float32Array, indices: number[] | Uint32Array | Uint16Array, x: number, y: number, z: number, max_distance: number): boolean;
+//# sourceMappingURL=query_bvh_geometry_nearest.d.ts.map

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

@@ -0,0 +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,CAuKlB"}

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

@@ -0,0 +1,202 @@
+import {
+    COLUMN_CHILD_1,
+    COLUMN_CHILD_2,
+    COLUMN_USER_DATA,
+    ELEMENT_WORD_COUNT,
+    NULL_NODE
+} from "../../../../../core/bvh2/bvh3/BVH.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../../../core/collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
+import {
+    aabb3_unsigned_distance_sqr_to_point
+} from "../../../../../core/geom/3d/aabb/aabb3_unsigned_distance_sqr_to_point.js";
+import {
+    computeTriangleClosestPointToPointBarycentric
+} from "../../../../../core/geom/3d/triangle/computeTriangleClosestPointToPointBarycentric.js";
+import { v3_compute_triangle_normal } from "../../../../../core/geom/3d/triangle/v3_compute_triangle_normal.js";
+import { v3_distance_sqr } from "../../../../../core/geom/vec3/v3_distance_sqr.js";
+
+/**
+ *
+ * @type {number[]}
+ */
+const v3_scratch_0 = [];
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
+
+/**
+ *
+ * @param {SurfacePoint3} result
+ * @param {BVH} bvh
+ * @param {number[]|Float32Array} positions
+ * @param {number[]|Uint32Array|Uint16Array} indices
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @param {number} max_distance
+ * @return {boolean}
+ */
+export function query_bvh_geometry_nearest(
+    result,
+    bvh,
+    positions,
+    indices,
+    x, y, z,
+    max_distance
+) {
+
+    const root = bvh.root;
+
+    if (root === NULL_NODE) {
+        return false;
+    }
+
+
+    /**
+     * Move stack pointer to local variable scope to avoid de-referencing inside the loop
+     * @type {number}
+     */
+    let pointer = stack.pointer;
+
+    /**
+     *
+     * @type {number}
+     */
+    const stack_top = pointer;
+
+    stack[pointer++] = root;
+
+    /*
+     For performance, we bind data directly to avoid extra copies required to read out AABB
+     */
+    const float32 = bvh.__data_float32;
+    const uint32 = bvh.__data_uint32;
+
+    let nearest_distance_sqr = max_distance * max_distance;
+
+
+    do {
+        --pointer;
+
+        /**
+         *
+         * @type {number}
+         */
+        const node = stack[pointer];
+
+        const address = node * ELEMENT_WORD_COUNT;
+
+        // test node against the ray
+
+
+        // get fist child to check if this is a leaf node or not
+        const child_1 = uint32[address + COLUMN_CHILD_1];
+
+        if (child_1 !== NULL_NODE) {
+
+            // this is not a leaf node, push children onto traversal stack
+            const child_2 = uint32[address + COLUMN_CHILD_2];
+
+            // to achieve faster convergence, we sort children before adding them to the stack by their proximity to the reference point
+            const child_1_address = child_1 * ELEMENT_WORD_COUNT;
+
+            const distance_sqr_to_child1 = aabb3_unsigned_distance_sqr_to_point(
+                float32[child_1_address], float32[child_1_address + 1], float32[child_1_address + 2],
+                float32[child_1_address + 3], float32[child_1_address + 4], float32[child_1_address + 5],
+                x, y, z
+            );
+
+            const child_2_address = child_2 * ELEMENT_WORD_COUNT;
+
+            const distance_sqr_to_child2 = aabb3_unsigned_distance_sqr_to_point(
+                float32[child_2_address], float32[child_2_address + 1], float32[child_2_address + 2],
+                float32[child_2_address + 3], float32[child_2_address + 4], float32[child_2_address + 5],
+                x, y, z
+            );
+
+            if (distance_sqr_to_child1 < distance_sqr_to_child2) {
+
+                if (distance_sqr_to_child2 < nearest_distance_sqr) {
+                    stack[pointer++] = child_2;
+                }
+
+                if (distance_sqr_to_child1 < nearest_distance_sqr) {
+                    stack[pointer++] = child_1;
+                }
+
+            } else {
+
+                if (distance_sqr_to_child1 < nearest_distance_sqr) {
+                    stack[pointer++] = child_1;
+                }
+
+                if (distance_sqr_to_child2 < nearest_distance_sqr) {
+                    stack[pointer++] = child_2;
+                }
+
+            }
+
+
+        } else {
+            // leaf node
+            // read triangle data
+            const triangle_index = uint32[address + COLUMN_USER_DATA];
+
+            const a = indices[triangle_index];
+            const b = indices[triangle_index + 1];
+            const c = indices[triangle_index + 2];
+
+
+            const a_address = a * 3;
+            const b_address = b * 3;
+            const c_address = c * 3;
+
+            const ax = positions[a_address];
+            const ay = positions[a_address + 1];
+            const az = positions[a_address + 2];
+
+            const bx = positions[b_address];
+            const by = positions[b_address + 1];
+            const bz = positions[b_address + 2];
+
+            const cx = positions[c_address];
+            const cy = positions[c_address + 1];
+            const cz = positions[c_address + 2];
+
+            computeTriangleClosestPointToPointBarycentric(
+                v3_scratch_0, 0,
+                x, y, z,
+                ax, ay, az,
+                bx, by, bz,
+                cx, cy, cz
+            );
+
+            const u = v3_scratch_0[0];
+            const v = v3_scratch_0[1];
+
+            // construct edge
+
+            const contact_x = (bx - ax) * u + (cx - ax) * v + ax;
+            const contact_y = (by - ay) * u + (cy - ay) * v + ay;
+            const contact_z = (bz - az) * u + (cz - az) * v + az;
+
+            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;
+            }
+
+            nearest_distance_sqr = distance_to_triangle_sqr;
+
+            result.position.set(contact_x, contact_y, contact_z);
+
+            v3_compute_triangle_normal(result.normal, 0,
+                ax, ay, az,
+                bx, by, bz,
+                cx, cy, cz
+            );
+
+            result.index = triangle_index;
+        }
+    } while (pointer > stack_top);
+
+    return true;
+}

package/src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BufferedGeometryBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js"],"names":[],"mappings":"AA8CA;IAkBI;;;OAGG;IACH,eAFW,KAAK,GAAC,MAAM,EAAE,QAIxB;IAIG;;;;OAIG;IACH,mBAAsB;IAEtB;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,6BAAgC;IAGhC;;;;OAIG;IACH,yBAAyB;IAG7B;;;OAGG;IACH,WAFW,MAAM,cAAc,QA2C9B;IAED;;;;;OAKG;IACH,qBAFa,OAAO,CAmHnB;IAED;;;;;;;OAOG;IACH,4BANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAqKnB;IAGD;;;;;;OAMG;IACH,iBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CAoIlB;IAED;;;;;OAKG;IACH,gBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CA2ElB;;CACJ;sBA7oBqB,wCAAwC;8BAMhC,2CAA2C"}
+{"version":3,"file":"BufferedGeometryBVH.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js"],"names":[],"mappings":"AAuCA;IAkBI;;;OAGG;IACH,eAFW,KAAK,GAAC,MAAM,EAAE,QAIxB;IAIG;;;;OAIG;IACH,mBAAsB;IAEtB;;;;OAIG;IACH,yBAA4B;IAE5B;;;;OAIG;IACH,6BAAgC;IAGhC;;;;OAIG;IACH,yBAAyB;IAG7B;;;OAGG;IACH,WAFW,MAAM,cAAc,QA2C9B;IAED;;;;;OAKG;IACH,qBAFa,OAAO,CAmHnB;IAED;;;;;;;OAOG;IACH,4BANW,aAAa,KACb,MAAM,KACN,MAAM,KACN,MAAM,GACJ,OAAO,CAUnB;IAGD;;;;;;OAMG;IACH,iBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CAoIlB;IAED;;;;;OAKG;IACH,gBAJW,MAAM,EAAE,OACR,MAAM,EAAE,OAAK,GACX,MAAM,CA2ElB;;CACJ;sBA3eqB,wCAAwC;8BAGhC,2CAA2C"}

package/src/engine/graphics/sh3/path_tracer/BufferedGeometryBVH.js

@@ -13,21 +13,14 @@ import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../../core/collection/SCRA
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { aabb3_from_v3_array } from "../../../../core/geom/3d/aabb/aabb3_from_v3_array.js";
 import { aabb3_intersects_ray_segment } from "../../../../core/geom/3d/aabb/aabb3_intersects_ray_segment.js";
-import {
-    aabb3_unsigned_distance_sqr_to_point
-} from "../../../../core/geom/3d/aabb/aabb3_unsigned_distance_sqr_to_point.js";
 import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
-import {
-    computeTriangleClosestPointToPointBarycentric
-} from "../../../../core/geom/3d/triangle/computeTriangleClosestPointToPointBarycentric.js";
 
 import {
     computeTriangleRayIntersectionBarycentricGeometry
 } from "../../../../core/geom/3d/triangle/computeTriangleRayIntersectionBarycentricGeometry.js";
-import { v3_compute_triangle_normal } from "../../../../core/geom/3d/triangle/v3_compute_triangle_normal.js";
-import { v3_distance_sqr } from "../../../../core/geom/vec3/v3_distance_sqr.js";
 import Vector4 from "../../../../core/geom/Vector4.js";
 import { makeGeometryIndexed } from "../../geometry/buffered/makeGeometryIndexed.js";
+import { query_bvh_geometry_nearest } from "../../geometry/buffered/query/query_bvh_geometry_nearest.js";
 import { computeBoundingSphereFromVertexData } from "../../geometry/computeBoundingSphereFromVertexData.js";
 import { construct_ray_hit_from_geometry } from "./geometry/construct_ray_hit_from_geometry.js";
 
@@ -127,7 +120,7 @@ export class BufferedGeometryBVH {
 
         const bvh = this.#bvh;
 
-        aabb3_from_v3_array( this.#bounds, array_positions, array_positions.length);
+        aabb3_from_v3_array(this.#bounds, array_positions, array_positions.length);
 
         ebvh_build_for_geometry_morton(
             bvh,
@@ -285,162 +278,7 @@ export class BufferedGeometryBVH {
 
         const bvh = this.#bvh;
 
-        const root = bvh.root;
-
-        if (root === NULL_NODE) {
-            return false;
-        }
-
-        /**
-         * Move stack pointer to local variable scope to avoid de-referencing inside the loop
-         * @type {number}
-         */
-        let pointer = stack.pointer;
-
-        /**
-         *
-         * @type {number}
-         */
-        const stack_top = pointer;
-
-        stack[pointer++] = root;
-
-        /*
-         For performance, we bind data directly to avoid extra copies required to read out AABB
-         */
-        const float32 = bvh.__data_float32;
-        const uint32 = bvh.__data_uint32;
-
-        let nearest_distance_sqr = Infinity;
-
-
-        do {
-            --pointer;
-
-            /**
-             *
-             * @type {number}
-             */
-            const node = stack[pointer];
-
-            const address = node * ELEMENT_WORD_COUNT;
-
-            // test node against the ray
-
-
-            // get fist child to check if this is a leaf node or not
-            const child_1 = uint32[address + COLUMN_CHILD_1];
-
-            if (child_1 !== NULL_NODE) {
-
-                // this is not a leaf node, push children onto traversal stack
-                const child_2 = uint32[address + COLUMN_CHILD_2];
-
-                // to achieve faster convergence, we sort children before adding them to the stack by their proximity to the reference point
-                const child_1_address = child_1 * ELEMENT_WORD_COUNT;
-
-                const distance_sqr_to_child1 = aabb3_unsigned_distance_sqr_to_point(
-                    float32[child_1_address], float32[child_1_address + 1], float32[child_1_address + 2],
-                    float32[child_1_address + 3], float32[child_1_address + 4], float32[child_1_address + 5],
-                    x, y, z
-                );
-
-                const child_2_address = child_2 * ELEMENT_WORD_COUNT;
-
-                const distance_sqr_to_child2 = aabb3_unsigned_distance_sqr_to_point(
-                    float32[child_2_address], float32[child_2_address + 1], float32[child_2_address + 2],
-                    float32[child_2_address + 3], float32[child_2_address + 4], float32[child_2_address + 5],
-                    x, y, z
-                );
-
-                if (distance_sqr_to_child1 < distance_sqr_to_child2) {
-
-                    if (distance_sqr_to_child2 < nearest_distance_sqr) {
-                        stack[pointer++] = child_2;
-                    }
-
-                    if (distance_sqr_to_child1 < nearest_distance_sqr) {
-                        stack[pointer++] = child_1;
-                    }
-
-                } else {
-
-                    if (distance_sqr_to_child1 < nearest_distance_sqr) {
-                        stack[pointer++] = child_1;
-                    }
-
-                    if (distance_sqr_to_child2 < nearest_distance_sqr) {
-                        stack[pointer++] = child_2;
-                    }
-
-                }
-
-
-            } else {
-                // leaf node
-                // read triangle data
-                const triangle_index = uint32[address + COLUMN_USER_DATA];
-
-                const a = indices[triangle_index];
-                const b = indices[triangle_index + 1];
-                const c = indices[triangle_index + 2];
-
-
-                const a_address = a * 3;
-                const b_address = b * 3;
-                const c_address = c * 3;
-
-                const ax = positions[a_address];
-                const ay = positions[a_address + 1];
-                const az = positions[a_address + 2];
-
-                const bx = positions[b_address];
-                const by = positions[b_address + 1];
-                const bz = positions[b_address + 2];
-
-                const cx = positions[c_address];
-                const cy = positions[c_address + 1];
-                const cz = positions[c_address + 2];
-
-                computeTriangleClosestPointToPointBarycentric(
-                    v3_scratch_0, 0,
-                    x, y, z,
-                    ax, ay, az,
-                    bx, by, bz,
-                    cx, cy, cz
-                );
-
-                const u = v3_scratch_0[0];
-                const v = v3_scratch_0[1];
-
-                // construct edge
-
-                const contact_x = (bx - ax) * u + (cx - ax) * v + ax;
-                const contact_y = (by - ay) * u + (cy - ay) * v + ay;
-                const contact_z = (bz - az) * u + (cz - az) * v + az;
-
-                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;
-                }
-
-                nearest_distance_sqr = distance_to_triangle_sqr;
-
-                result.position.set(contact_x, contact_y, contact_z);
-
-                v3_compute_triangle_normal(result.normal, 0,
-                    ax, ay, az,
-                    bx, by, bz,
-                    cx, cy, cz
-                );
-
-                result.index = triangle_index;
-            }
-        } while (pointer > stack_top);
-
-
-        return true;
+        return query_bvh_geometry_nearest(result, bvh, positions, indices, x, y, z, Infinity);
     }