@woosh/meep-engine 2.34.27 → 2.34.31

package/core/bvh2/aabb3/aabb3_array_contains_point.js

@@ -0,0 +1,18 @@
+//
+
+/**
+ *
+ * @param {ArrayLike<number>|number[]} aabb
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @return {boolean}
+ */
+export function aabb3_array_contains_point(aabb, x, y, z) {
+    return x >= aabb[0]
+        && x <= aabb[3]
+        && y >= aabb[1]
+        && y <= aabb[4]
+        && z >= aabb[2]
+        && z <= aabb[5];
+}

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

@@ -0,0 +1,15 @@
+import { sphereIntersectsPoint } from "./sphereIntersectsPoint.js";
+
+//
+
+/**
+ *
+ * @param {ArrayLike<number>|number[]} sphere
+ * @param {number} x
+ * @param {number} y
+ * @param {number} z
+ * @return {boolean}
+ */
+export function sphere_array_intersects_point(sphere, x, y, z) {
+    return sphereIntersectsPoint(sphere[0], sphere[1], sphere[2], sphere[3], x, y, z);
+}

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

@@ -1,7 +1,6 @@
 //
 
 import { v3_dot } from "../../v3_dot.js";
-import { ray_distance_to_point } from "../ray/ray_distance_to_point.js";
 
 /**
  *

package/engine/graphics/micron/build/PatchRepresentation.js

@@ -31,6 +31,10 @@ export class PatchRepresentation {
             Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY
         );
 
+        /**
+         *
+         * @type {AABB3}
+         */
         this.group_aabb = new AABB3(0, 0, 0, 0, 0, 0);
 
         /**

package/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -202,6 +202,11 @@ export async function buildMicronGeometryFromBufferGeometry(input) {
 
 
     const t_build_hierarchy_start = current_time_millis();
+
+    /**
+     *
+     * @type {PatchRepresentation}
+     */
     const root = await buildAbstractPatchHierarchy(patches);
 
     if (PRINT_VERBOSE_STATS) {

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

@@ -48,13 +48,15 @@ async function assemble_graph(nodes) {
      */
     let __nodes = nodes.slice();
 
+    const initial_node_count = __nodes.length;
+
     /**
      *
      * @type {{value: number}}
      * @private
      */
     const __node_count = {
-        value: __nodes.length
+        value: initial_node_count
     };
 
     let level = 0;
@@ -136,9 +138,12 @@ async function assemble_graph(nodes) {
     // return root
     const root = __nodes[0];
 
-    //set group bounds to produce a valid root
-    root.group_aabb.copy(root.bounding_box);
-    root.group_bounding_sphere.set(root.bounding_sphere);
+    if (initial_node_count === 1) {
+        // there are no children, whole hierarchy is just one node, set group bounds to equal node bounds
+        root.group_bounding_sphere.set(root.bounding_sphere);
+        root.group_aabb.copy(root.bounding_box);
+    }
+
 
     return root;
 }

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

@@ -1,6 +1,7 @@
 import {BufferGeometry} from "three";
 import {VertexDataSpec} from "../../geometry/VertexDataSpec";
 import {SurfacePoint3} from "../../../../core/geom/3d/SurfacePoint3";
+import {MicronGeometryPatch} from "./MicronGeometryPatch";
 
 export class MicronGeometry {
     vertex_spec: VertexDataSpec
@@ -14,4 +15,6 @@ export class MicronGeometry {
     ): SurfacePoint3[]
 
     readonly isMicronGeometry: boolean
+
+    readonly patches: MicronGeometryPatch[]
 }

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;
 
@@ -105,43 +106,18 @@ export class MicronGeometry {
 
             const patch = stack[stack_cursor];
 
-            // using group bounds because it's conservative, as we want to be able to hit LOD_0
-
-            // sphere test
-
-            // TODO check what's wrong with sphere tests and re-enable them
-            // if (!sphere_array_intersects_ray(patch.group_bounding_sphere,
-            //     origin_x, origin_y, origin_z,
-            //     direction_x, direction_y, direction_z
-            // )) {
-            //     continue;
-            // }
-
-
-            // 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;
-            }
-
             if (patch.lod === 0) {
                 // LOD 0 - source geometry
 
                 // cast against bounds
 
                 // sphere test
-
-                // TODO check what's wrong with sphere tests and re-enable them
-                // if (!sphere_array_intersects_ray(patch.bounding_sphere,
-                //     origin_x, origin_y, origin_z,
-                //     direction_x, direction_y, direction_z
-                // )) {
-                //     continue;
-                // }
+                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(
@@ -200,6 +176,28 @@ export class MicronGeometry {
                 }
 
             } else {
+
+                // using group bounds because it's conservative, as we want to be able to hit LOD_0
+
+                // sphere test
+                if (!sphere_array_intersects_ray(patch.group_bounding_sphere,
+                    origin_x, origin_y, origin_z,
+                    direction_x, direction_y, direction_z
+                )) {
+                    continue;
+                }
+
+
+                // 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;
+                }
+
                 // refine more
                 const children = patch.children;
 

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

@@ -0,0 +1,3 @@
+export class MicronGeometryPatch {
+
+}

package/engine/graphics/micron/format/serialization/MicronGeometryBinarySerializationAdapter.spec.js

@@ -0,0 +1,63 @@
+import { MicronGeometryPatch } from "../MicronGeometryPatch.js";
+import { BinaryBuffer } from "../../../../../core/binary/BinaryBuffer.js";
+import { MicronGeometry } from "../MicronGeometry.js";
+import { VertexDataSpec } from "../../../geometry/VertexDataSpec.js";
+import { AttributeSpec } from "../../../geometry/AttributeSpec.js";
+import { DataType } from "../../../../../core/collection/table/DataType.js";
+import { MicronGeometryBinarySerializationAdapter } from "./MicronGeometryBinarySerializationAdapter.js";
+
+function sampleGeometry() {
+    const a = new MicronGeometryPatch();
+
+    a.vertex_attribute_arrays[0] = new Uint8Array([
+        7, 11, 13,
+        17, 23, 29,
+        31, 39, 43
+    ]);
+    a.vertex_count = 3;
+
+    a.face_indices = new Uint8Array([1, 2, 3]);
+    a.polygon_count = 1;
+
+    a.group_error = 1.234;
+
+    a.bounding_box.set([7, 11, 13, 31, 39, 43]);
+    a.group_bounding_box.set([7, 11, 13, 31, 39, 43]);
+    a.bounding_sphere.set([19, 25, 28, 50.1]);
+    a.group_bounding_sphere.set([19, 25, 28, 50.1]);
+
+    const g_a = new MicronGeometry();
+
+    const vertex_spec = new VertexDataSpec();
+    vertex_spec.add(AttributeSpec.fromJSON({
+        name: 'position',
+        type: DataType.Uint8,
+        itemSize: 3,
+        normalized: false
+    }));
+
+    g_a.vertex_spec = vertex_spec;
+    g_a.root = a;
+    g_a.initialize();
+
+    return g_a;
+}
+
+test("serialization/deserialization consistency", () => {
+    const g_a = sampleGeometry();
+
+    const buffer = new BinaryBuffer();
+
+    const adapter = new MicronGeometryBinarySerializationAdapter();
+
+    adapter.serialize(buffer, g_a);
+
+
+    const g_b = new MicronGeometry();
+
+    buffer.position = 0;
+    adapter.deserialize(buffer, g_b);
+
+    expect(g_b.vertex_spec.equals(g_a.vertex_spec)).toBe(true);
+    expect(g_b.patches.length).toEqual(g_a.patches.length);
+});

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

@@ -0,0 +1,69 @@
+import { noop } from "../../../../core/function/Functions.js";
+import { aabb3_array_contains_point } from "../../../../core/bvh2/aabb3/aabb3_array_contains_point.js";
+import { sphere_array_intersects_point } from "../../../../core/geom/3d/sphere/sphere_array_intersects_point.js";
+
+/**
+ *
+ * @param {MicronGeometryPatch} patch
+ * @param {VertexDataSpec} vertex_spec
+ * @param {function(string)} [error_consumer]
+ * @returns {boolean}
+ */
+export function validate_patch_bounds(patch, vertex_spec, error_consumer = noop) {
+    const position_attribute_index = vertex_spec.getAttributeIndexByName('position');
+
+    if (position_attribute_index === -1) {
+        error_consumer(`No 'position' attribute found`);
+        // technically any bounds are valid if there is no position
+        return true;
+    }
+
+    const position_data = patch.vertex_attribute_arrays[position_attribute_index];
+
+    let b_sphere_valid = true;
+    let b_box_valid = true;
+    let gb_sphere_valid = true;
+    let gb_box_valid = true;
+
+    for (let i = 0; i < this.vertex_count; i++) {
+        const i3 = i * 3;
+
+        const x = position_data[i3];
+        const y = position_data[i3 + 1];
+        const z = position_data[i3 + 2];
+
+        if (!aabb3_array_contains_point(patch.bounding_box, x, y, z)) {
+            b_box_valid = false;
+        }
+
+        if (!aabb3_array_contains_point(patch.group_bounding_box, x, y, z)) {
+            gb_box_valid = false;
+        }
+
+        if (!sphere_array_intersects_point(patch.bounding_sphere, x, y, z)) {
+            b_sphere_valid = false;
+        }
+
+        if (!sphere_array_intersects_point(patch.group_bounding_sphere, x, y, z)) {
+            gb_sphere_valid = false;
+        }
+    }
+
+    if (!b_sphere_valid) {
+        error_consumer('.bounding_sphere is violated');
+    }
+
+    if (!gb_sphere_valid) {
+        error_consumer('.group_bounding_sphere is violated');
+    }
+
+    if (!b_box_valid) {
+        error_consumer('.bounding_box is violated');
+    }
+
+    if (!gb_box_valid) {
+        error_consumer('.group_bounding_box is violated');
+    }
+
+    return b_sphere_valid && gb_sphere_valid && b_box_valid && gb_box_valid;
+}

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