@woosh/meep-engine 2.65.0 → 2.66.0

package/src/core/bvh2/binary/2/bvh32_query_user_data_ray.js

@@ -0,0 +1,98 @@
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
+import { aabb3_array_intersects_ray } from "../../../geom/3d/aabb/aabb3_array_intersects_ray.js";
+import { BVH_BINARY_NODE_SIZE, BVH_LEAF_NODE_SIZE } from "./BinaryUint32BVH.js";
+
+const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
+
+/**
+ *
+ * @param {BinaryUint32BVH} bvh
+ * @param {number[]} result
+ * @param {number} result_offset
+ * @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 {number}
+ */
+export function bvh32_query_user_data_ray(
+    bvh,
+    result, result_offset,
+    origin_x, origin_y, origin_z,
+    direction_x, direction_y, direction_z
+) {
+    let hit_count = 0;
+
+    const binary_node_count = bvh.getBinaryNodeCount();
+
+    if (binary_node_count <= 0) {
+        // this should not happen
+        return 0;
+    }
+
+    /**
+     *
+     * @type {number}
+     */
+    const stack_top = stack.pointer++;
+
+    /**
+     * After performing empirical tests, stack-based depth-first traversal turns out faster than using a queue
+     * @type {number}
+     */
+    stack[stack_top] = 0;
+
+    const last_valid_index = binary_node_count + bvh.getLeafNodeCount();
+
+    const float32 = bvh.float32;
+    const uint32 = bvh.uint32;
+
+    do {
+        stack.pointer--;
+
+        // query_bvh_frustum_from_objects.iteration_count++;
+        const node_index = stack[stack.pointer];
+
+        if (node_index < binary_node_count) {
+            // is intermediate node
+            const node_address = node_index * BVH_BINARY_NODE_SIZE;
+
+            if (!aabb3_array_intersects_ray(
+                float32, node_address,
+                origin_x, origin_y, origin_z,
+                direction_x, direction_y, direction_z
+            )) {
+                continue;
+            }
+
+            const left_index = (node_index << 1) + 1;
+            const right_index = left_index + 1;
+
+            // left node ends up on top of the stack, which aligns with the desired access sequence
+            if (right_index < last_valid_index) {
+                stack[stack.pointer++] = right_index;
+                // micro-optimization, since we know that right node is valid and left appears before that, left is valid too
+                stack[stack.pointer++] = left_index;
+            } else if (left_index < last_valid_index) {
+                stack[stack.pointer++] = left_index;
+            }
+
+
+        } else {
+            // leaf node
+            const leaf_index = node_index - binary_node_count;
+
+            const node_address = leaf_index * BVH_LEAF_NODE_SIZE + binary_node_count * BVH_BINARY_NODE_SIZE;
+
+            // write to output
+            result[result_offset + hit_count] = uint32[node_address + 6];
+
+            hit_count++;
+        }
+
+    } while (stack.pointer > stack_top)
+
+    return hit_count;
+}

package/src/core/bvh2/bvh3/BVH.d.ts

@@ -1,4 +1,4 @@
-export class BVH {
+export declare class BVH {
     readonly root: number
 
     node_capacity: number

package/src/core/bvh2/bvh3/BvhClient.d.ts

@@ -0,0 +1,11 @@
+import {BVH} from "./BVH";
+
+export declare class BvhClient{
+    readonly is_linked:boolean
+    readonly bounds:ArrayLike<number>
+
+    write_bound():void
+
+    link(tree:BVH,data:number):void
+    unlink():void
+}

package/src/core/bvh2/bvh3/BvhClient.js

@@ -1,4 +1,5 @@
 import { assert } from "../../assert.js";
+import { aabb3_array_set } from "../../geom/3d/aabb/aabb3_array_set.js";
 
 /**
  * A convenience class to work with BVH leaf nodes
@@ -67,4 +68,22 @@ export class BvhClient {
 
         this.#tree.node_move_aabb(this.#node_id, this.bounds);
     }
+
+    /**
+     *
+     * @param {number} x0
+     * @param {number} y0
+     * @param {number} z0
+     * @param {number} x1
+     * @param {number} y1
+     * @param {number} z1
+     */
+    resize(x0, y0, z0, x1, y1, z1) {
+        aabb3_array_set(
+            this.bounds, 0,
+            x0, y0, z0, x1, y1, z1
+        );
+
+        this.write_bounds();
+    }
 }

package/src/core/collection/array/array_copy.js

@@ -1,3 +1,5 @@
+import { assert } from "../../assert.js";
+
 /**
  * Copy data from one array to another
  * Follows Java System.arraycopy interface
@@ -15,6 +17,10 @@ export function array_copy(
     destination_position,
     length
 ) {
+    assert.isNonNegativeInteger(source_position, 'source_position');
+    assert.isNonNegativeInteger(destination_position, 'destination_position');
+    assert.isNonNegativeInteger(length, 'length');
+
     let i, j, k;
 
     for (k = 0; k < length; k++) {

package/src/core/geom/3d/aabb/aabb3_array_combine.js

@@ -1,20 +1,29 @@
 //
 
-import { min2 } from "../../../math/min2.js";
 import { max2 } from "../../../math/max2.js";
+import { min2 } from "../../../math/min2.js";
 
 /**
  * Merge bounds of two axis-aligned bounding boxes, the result is a box that tightly bounds inputs
  * @param {ArrayLike<number>|number[]|Float32Array} result where resulting value is written to
+ * @param {number} result_offset
  * @param {ArrayLike<number>|number[]|Float32Array} a
+ * @param {number} a_offset
  * @param {ArrayLike<number>|number[]|Float32Array} b
+ * @param {number} b_offset
  */
-export function aabb3_array_combine(result, a, b) {
-    result[0] = min2(a[0], b[0]);
-    result[1] = min2(a[1], b[1]);
-    result[2] = min2(a[2], b[2]);
+export function aabb3_array_combine(
+    result, result_offset,
+    a, a_offset,
+    b, b_offset
+) {
+
+    result[result_offset + 0] = min2(a[a_offset + 0], b[b_offset + 0]);
+    result[result_offset + 1] = min2(a[a_offset + 1], b[b_offset + 1]);
+    result[result_offset + 2] = min2(a[a_offset + 2], b[b_offset + 2]);
+
+    result[result_offset + 3] = max2(a[a_offset + 3], b[b_offset + 3]);
+    result[result_offset + 4] = max2(a[a_offset + 4], b[b_offset + 4]);
+    result[result_offset + 5] = max2(a[a_offset + 5], b[b_offset + 5]);
 
-    result[3] = max2(a[3], b[3]);
-    result[4] = max2(a[4], b[4]);
-    result[5] = max2(a[5], b[5]);
 }

package/src/core/geom/3d/aabb/aabb3_array_intersects_ray.js

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

package/src/core/geom/3d/aabb/aabb3_array_set.js

@@ -0,0 +1,25 @@
+/**
+ *
+ * @param {ArrayLike<number>|Float32Array|number[]} result
+ * @param {number} result_offset
+ * @param {number} x0
+ * @param {number} y0
+ * @param {number} z0
+ * @param {number} x1
+ * @param {number} y1
+ * @param {number} z1
+ */
+export function aabb3_array_set(
+    result, result_offset,
+    x0, y0, z0,
+    x1, y1, z1
+) {
+
+    result[result_offset + 0] = x0;
+    result[result_offset + 1] = y0;
+    result[result_offset + 2] = z0;
+
+    result[result_offset + 3] = x1;
+    result[result_offset + 4] = y1;
+    result[result_offset + 5] = z1;
+}

package/src/core/geom/3d/aabb/aabb3_compute_half_surface_area.js

@@ -9,8 +9,11 @@
  * @returns {number}
  */
 export function aabb3_compute_half_surface_area(x0, y0, z0, x1, y1, z1) {
+
     const dx = x1 - x0;
     const dy = y1 - y0;
     const dz = z1 - z0;
+
     return dy * (dx + dz) + dz * dx; //1 side, since it's a heuristic only
+
 }

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

@@ -83,5 +83,12 @@ export function computeTriangleRayIntersectionBarycentric(
     const edge2_y = cy - ay;
     const edge2_z = cz - az;
 
-    return computeTriangleRayIntersectionBarycentricEdge(result, origin_x, origin_y, origin_z, direction_x, direction_y, direction_z, ax, ay, az, edge1_x, edge1_y, edge1_z, edge2_x, edge2_y, edge2_z);
+    return computeTriangleRayIntersectionBarycentricEdge(
+        result,
+        origin_x, origin_y, origin_z,
+        direction_x, direction_y, direction_z,
+        ax, ay, az,
+        edge1_x, edge1_y, edge1_z,
+        edge2_x, edge2_y, edge2_z
+    );
 }

package/src/engine/EngineHarness.js

@@ -1,36 +1,36 @@
-import Engine from "./Engine.js";
-import { MouseEvents } from "./input/devices/events/MouseEvents.js";
-import { Transform } from "./ecs/transform/Transform.js";
-import TopDownCameraController from "./graphics/ecs/camera/topdown/TopDownCameraController.js";
-import { Camera } from "./graphics/ecs/camera/Camera.js";
-import Entity from "./ecs/Entity.js";
-import { Light } from "./graphics/ecs/light/Light.js";
-import Vector3 from "../core/geom/Vector3.js";
-import Terrain from "./ecs/terrain/ecs/Terrain.js";
+import Stats from "three/examples/jsm/libs/stats.module.js";
+import { noop } from "../core/function/Functions.js";
 import Vector2 from "../core/geom/Vector2.js";
-import Water from "./graphics/ecs/water/Water.js";
-import { WebEnginePlatform } from "./platform/WebEnginePlatform.js";
-import Tag from "./ecs/components/Tag.js";
+import Vector3 from "../core/geom/Vector3.js";
+import EmptyView from "../view/elements/EmptyView.js";
+import { JsonAssetLoader } from "./asset/loaders/JsonAssetLoader.js";
 import { SerializationMetadata } from "./ecs/components/SerializationMetadata.js";
+import Tag from "./ecs/components/Tag.js";
+import Entity from "./ecs/Entity.js";
 import { TerrainLayer } from "./ecs/terrain/ecs/layers/TerrainLayer.js";
+import Terrain from "./ecs/terrain/ecs/Terrain.js";
+import TerrainSystem from "./ecs/terrain/ecs/TerrainSystem.js";
+import { Transform } from "./ecs/transform/Transform.js";
+import Engine from "./Engine.js";
+import { EngineConfiguration } from "./EngineConfiguration.js";
 import { makeOrbitalCameraController } from "./graphics/camera/makeOrbitalCameraController.js";
-import TopDownCameraControllerSystem from "./graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
+import { Camera } from "./graphics/ecs/camera/Camera.js";
 import { CameraSystem } from "./graphics/ecs/camera/CameraSystem.js";
+import TopDownCameraController from "./graphics/ecs/camera/topdown/TopDownCameraController.js";
+import TopDownCameraControllerSystem from "./graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
+import { Light } from "./graphics/ecs/light/Light.js";
 import LightSystem from "./graphics/ecs/light/LightSystem.js";
-import InputControllerSystem from "./input/ecs/systems/InputControllerSystem.js";
-import TerrainSystem from "./ecs/terrain/ecs/TerrainSystem.js";
+import Water from "./graphics/ecs/water/Water.js";
 import WaterSystem from "./graphics/ecs/water/WaterSystem.js";
+import { MouseEvents } from "./input/devices/events/MouseEvents.js";
 import KeyboardCameraController from "./input/ecs/controllers/KeyboardCameraController.js";
-import { EngineConfiguration } from "./EngineConfiguration.js";
-import { JsonAssetLoader } from "./asset/loaders/JsonAssetLoader.js";
-import { logger } from "./logging/GlobalLogger.js";
+import InputControllerSystem from "./input/ecs/systems/InputControllerSystem.js";
 import { ConsoleLoggerBackend } from "./logging/ConsoleLoggerBackend.js";
-import { noop } from "../core/function/Functions.js";
-import SoundListenerSystem from "./sound/ecs/SoundListenerSystem.js";
-import SoundListener from "./sound/ecs/SoundListener.js";
+import { logger } from "./logging/GlobalLogger.js";
 import { getURLHash } from "./platform/GetURLHash.js";
-import Stats from "three/examples/jsm/libs/stats.module.js";
-import EmptyView from "../view/elements/EmptyView.js";
+import { WebEnginePlatform } from "./platform/WebEnginePlatform.js";
+import SoundListener from "./sound/ecs/SoundListener.js";
+import SoundListenerSystem from "./sound/ecs/SoundListenerSystem.js";
 
 /**
  *
@@ -438,7 +438,6 @@ export class EngineHarness {
             engine,
             size = new Vector2(10, 10),
             diffuse0 = "data/textures/utility/checkers_dark_grey_256x256.png",
-            heightMap = "data/textures/utility/white_pixel.png",
             heightRange = 0,
             resolution = 10,
             waterLevel = 0,
@@ -464,7 +463,6 @@ export class EngineHarness {
         ));
         terrain.splat.resize(1, 1, 1);
         terrain.splat.fillLayerWeights(0, 255);
-        terrain.heightMapURL = heightMap;
 
         terrain.build(engine.assetManager);
 

package/src/engine/ecs/renderable/RenderSystem.js

@@ -1,22 +1,44 @@
 /**
  * Created by Alex on 01/04/2014.
  */
-import { System } from '../System.js';
-import Renderable from './Renderable.js';
-import { Transform } from '../transform/Transform.js';
+import { BVH } from "../../../core/bvh2/bvh3/BVH.js";
 import { SignalBinding } from "../../../core/events/signal/SignalBinding.js";
-import { RenderableFlags } from "./RenderableFlags.js";
-import { rootObject3DFastMatrixUpdate } from "../../graphics/ecs/mesh/rootObject3DFastMatrixUpdate.js";
-import { updateNodeByTransformAndBBB } from "../../graphics/ecs/mesh/updateNodeByTransformAndBBB.js";
-import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { copy_transform_to_threejs_object } from "../../graphics/copy_transform_to_threejs_object.js";
+import { rootObject3DFastMatrixUpdate } from "../../graphics/ecs/mesh/rootObject3DFastMatrixUpdate.js";
+import { updateNodeByTransformAndBBB } from "../../graphics/ecs/mesh/updateNodeByTransformAndBBB.js";
+import { make_bvh_visibility_builder } from "../../graphics/render/make_bvh_visibility_builder.js";
+import { System } from '../System.js';
+import { Transform } from '../transform/Transform.js';
+import Renderable from './Renderable.js';
+import { RenderableFlags } from "./RenderableFlags.js";
 
 
 /**
  * @deprecated use {@link ShadedGeometry} instead
  */
 class RenderSystem extends System {
+    dependencies = [Renderable, Transform];
+
+    components_used = [
+        ResourceAccessSpecification.from(Renderable, ResourceAccessKind.Read | ResourceAccessKind.Write)
+    ];
+
+    entityData = [];
+
+    /**
+     *
+     * @type {RenderLayer|null}
+     */
+    renderLayer = null;
+
+    /**
+     *
+     * @type {BVH}
+     */
+    bvh = new BVH();
+
     /**
      *
      * @param {GraphicsEngine} graphicsEngine
@@ -29,26 +51,6 @@ class RenderSystem extends System {
          * @type {GraphicsEngine}
          */
         this.graphics = graphicsEngine;
-
-        this.dependencies = [Renderable, Transform];
-
-        this.components_used = [
-            ResourceAccessSpecification.from(Renderable, ResourceAccessKind.Read | ResourceAccessKind.Write)
-        ];
-
-        this.entityData = [];
-
-        /**
-         *
-         * @type {RenderLayer|null}
-         */
-        this.renderLayer = null;
-
-        /**
-         *
-         * @type {BinaryNode}
-         */
-        this.bvh = null;
     }
 
     startup(entityManager, readyCallback, errorCallback) {
@@ -56,7 +58,19 @@ class RenderSystem extends System {
 
         this.renderLayer = this.graphics.layers.create('render-system');
 
-        this.bvh = this.renderLayer.bvh;
+        this.renderLayer.buildVisibleSet = make_bvh_visibility_builder(
+            this.entityManager, this.bvh,
+            (destination, offset, entity, ecd) => {
+                const component = ecd.getComponent(entity, Renderable);
+
+                if (component.object === null) {
+                    return 0;
+                }
+
+                destination[offset] = component.object;
+                return 1;
+            }
+        )
 
         const visibleSet = this.renderLayer.visibleSet;
 
@@ -102,8 +116,6 @@ class RenderSystem extends System {
      * @param {int} entity
      */
     link(renderable, transform, entity) {
-        //remember entity for fast lookup
-        renderable.bvh.entity = entity;
 
         // create back-links to ECS
         renderable.object.__meep_ecs_component = renderable;
@@ -139,7 +151,7 @@ class RenderSystem extends System {
 
         handle_transform_change();
 
-        this.bvh.insertNode(renderable.bvh);
+        renderable.bvh.link(this.bvh,entity);
     }
 
     /**
@@ -158,7 +170,7 @@ class RenderSystem extends System {
 
         delete this.entityData[entity];
 
-        renderable.bvh.disconnect();
+        renderable.bvh.unlink();
 
         // cleanup resources
         renderable.dispose();

package/src/engine/ecs/renderable/Renderable.d.ts

@@ -1,6 +1,6 @@
 import {Object3D} from "three";
+import {BvhClient} from "../../../core/bvh2/bvh3/BvhClient";
 import {AABB3} from "../../../core/geom/3d/aabb/AABB3";
-import {LeafNode} from "../../../core/bvh2/LeafNode";
 
 export default class Renderable {
     readonly object: Object3D
@@ -9,7 +9,7 @@ export default class Renderable {
     matrixAutoUpdate: boolean
     boundingBoxNeedsUpdate: boolean
 
-    readonly bvh: LeafNode<Object3D>
+    readonly bvh: BvhClient
 
     constructor(object: Object3D)
 

package/src/engine/ecs/renderable/Renderable.js

@@ -3,13 +3,13 @@
  */
 
 
-import { LeafNode } from "../../../core/bvh2/LeafNode.js";
+import { BvhClient } from "../../../core/bvh2/bvh3/BvhClient.js";
 import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
-import { RenderableFlags } from "./RenderableFlags.js";
 import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
 import {
     expand_aabb_by_transformed_three_object
 } from "../../graphics/three/expand_aabb_by_transformed_three_object.js";
+import { RenderableFlags } from "./RenderableFlags.js";
 
 const DEFAULT_FLAGS = RenderableFlags.UpdateMatrix | RenderableFlags.BoundingBoxNeedsUpdate;
 
@@ -18,18 +18,19 @@ const DEFAULT_FLAGS = RenderableFlags.UpdateMatrix | RenderableFlags.BoundingBox
  @deprecated use {@link ShadedGeometry} instead
  */
 class Renderable {
-    constructor(object) {
-        this.object = object;
+    boundingBox = new AABB3(0, 0, 0, 0, 0, 0);
+
+    bvh = new BvhClient();
 
-        this.boundingBox = new AABB3(0, 0, 0, 0, 0, 0);
+    /**
+     *
+     * @type {number}
+     */
+    flags = DEFAULT_FLAGS;
 
-        this.bvh = new LeafNode(object, 0, 0, 0, 0, 0, 0);
+    constructor(object) {
+        this.object = object;
 
-        /**
-         *
-         * @type {number}
-         */
-        this.flags = DEFAULT_FLAGS;
     }
 
     dispose() {