@woosh/meep-engine 2.63.0 → 2.65.0

package/src/core/bvh2/bvh3/query/bvh_query_user_data_generic.js

@@ -1,12 +1,13 @@
-import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { assert } from "../../../assert.js";
 import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
+import { NULL_NODE } from "../BVH.js";
 
 const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 
 /**
  *
- * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+ * @param {BVH} bvh
  * @param {number[]} result
  * @param {number} result_offset
  * @param {number} root
@@ -15,9 +16,15 @@ const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
  */
 export function bvh_query_user_data_generic(
     result, result_offset,
-    bvh,root, query
+    bvh, root, query
 ) {
 
+    assert.isArrayLike(result, 'result');
+    assert.isNonNegativeInteger(result_offset, 'result_offset');
+    assert.defined(bvh, 'bvh');
+    assert.isNonNegativeInteger(root, 'root');
+    assert.defined(query, 'query');
+
     if (root === NULL_NODE) {
         return 0;
     }
@@ -44,13 +51,14 @@ export function bvh_query_user_data_generic(
         // test node against the query
         const pass = query.evaluate(node, bvh);
 
-        if (!pass) {
+        if (pass === false) {
             continue;
         }
 
         const node_is_leaf = bvh.node_is_leaf(node);
 
-        if (!node_is_leaf) {
+        if (node_is_leaf === false) {
+            // binary-node
 
             // read in-order
             const child1 = bvh.node_get_child1(node);

package/src/core/bvh2/bvh3/query/bvh_query_user_data_generic.spec.js

@@ -0,0 +1,29 @@
+import { BVH } from "../BVH.js";
+import { bvh_query_user_data_generic } from "./bvh_query_user_data_generic.js";
+import { BVHQueryAny } from "./BVHQueryAny.js";
+
+test("all-accepting query", () => {
+    const bvh = new BVH();
+
+    const leaf_a = bvh.allocate_node();
+    const leaf_b = bvh.allocate_node();
+
+    bvh.node_set_user_data(leaf_a, 7);
+    bvh.node_set_user_data(leaf_b, 13);
+
+    bvh.insert_leaf(leaf_a);
+    bvh.insert_leaf(leaf_b);
+
+    const result = [];
+
+    const count = bvh_query_user_data_generic(
+        result, 1,
+        bvh, bvh.root,
+        BVHQueryAny.INSTANCE
+    );
+
+    expect(count).toBe(2);
+    expect(result).toContain(7);
+    expect(result).toContain(13);
+
+});

package/src/core/bvh2/bvh3/query/bvh_query_user_data_nearest_to_point.js

@@ -1,7 +1,7 @@
-import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 import { aabb3_signed_distance_sqr_to_point } from "../../../geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
 import { max2 } from "../../../math/max2.js";
-import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
+import { NULL_NODE } from "../BVH.js";
 
 /**
  *
@@ -13,7 +13,7 @@ const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
 /**
  *
- * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+ * @param {BVH} bvh
  * @param {number} x
  * @param {number} y
  * @param {number} z

package/src/core/bvh2/bvh3/query/bvh_query_user_data_nearest_to_point.spec.js

@@ -1,13 +1,13 @@
-import { ExplicitBinaryBoundingVolumeHierarchy } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../BVH.js";
 import { bvh_query_user_data_nearest_to_point } from "./bvh_query_user_data_nearest_to_point.js";
 
 /**
  *
  * @param {number[]} boxes
- * @return {ExplicitBinaryBoundingVolumeHierarchy}
+ * @return {BVH}
  */
 function makeBvh(...boxes) {
-    const r = new ExplicitBinaryBoundingVolumeHierarchy();
+    const r = new BVH();
 
     for (let i = 0; i < boxes.length; i++) {
         const box = boxes[i];

package/src/core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js

@@ -1,8 +1,8 @@
 //
-import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 import { aabb3_array_intersects_frustum_degree } from "../../../geom/3d/aabb/aabb3_array_intersects_frustum_degree.js";
+import { NULL_NODE } from "../BVH.js";
 import { bvh_collect_user_data } from "./bvh_collect_user_data.js";
-import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 
 const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
@@ -12,7 +12,7 @@ const scratch_aabb = new Float32Array(6);
  *
  * @param {number[]} result
  * @param {number} result_offset
- * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+ * @param {BVH} bvh
  * @param {number[]|Float32Array} frustum
  */
 export function bvh_query_user_data_overlaps_frustum(

package/src/core/bvh2/bvh3/query/compute_tight_near_far_clipping_planes.js

@@ -2,11 +2,11 @@
 
 
 import { array_copy } from "../../../collection/array/array_copy.js";
-import { NULL_NODE } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
 import { aabb3_array_intersects_frustum_degree } from "../../../geom/3d/aabb/aabb3_array_intersects_frustum_degree.js";
-import { bvh_collect_user_data } from "./bvh_collect_user_data.js";
 import { v3_distance_above_plane } from "../../../geom/vec3/v3_distance_above_plane.js";
-import { SCRATCH_UINT32_TRAVERSAL_STACK } from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
+import { NULL_NODE } from "../BVH.js";
+import { bvh_collect_user_data } from "./bvh_collect_user_data.js";
 
 const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
 
@@ -17,7 +17,7 @@ const scratch_aabb = [];
  * @param {number[]} result
  * @param {number} result_offset
  * @param {number} constrained_planes_mask if bit is set to 1, that plane is not allowed to move
- * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+ * @param {BVH} bvh
  * @param {number[]|ArrayLike<number>|Float32Array} frustum
  */
 export function compute_tight_near_far_clipping_planes(result, result_offset, constrained_planes_mask, bvh, frustum) {

package/src/core/bvh2/bvh3/query/compute_tight_near_far_clipping_planes.spec.js

@@ -1,4 +1,4 @@
-import { ExplicitBinaryBoundingVolumeHierarchy } from "../ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../BVH.js";
 import { compute_tight_near_far_clipping_planes } from "./compute_tight_near_far_clipping_planes.js";
 
 
@@ -14,7 +14,7 @@ function orthographic_frustum(left, right, up, down, near, far) {
 }
 
 test('Empty does not throw', () => {
-    const bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+    const bvh = new BVH();
 
     const res = [];
 
@@ -26,7 +26,7 @@ test('Empty does not throw', () => {
 test.skip('Axis-aligned, orthographic tight fit around a single small node', () => {
     const frustum = orthographic_frustum(-1, 1, -1, 1, -1, 1);
 
-    const bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+    const bvh = new BVH();
 
     const leaf = bvh.allocate_node();
     bvh.node_set_aabb(leaf, [-0.1, -0.1, -0.1, 0.1, 0.1, 0.1]);

package/src/core/collection/list/List.js

@@ -6,8 +6,8 @@
 import { assert } from "../../assert.js";
 import Signal from "../../events/signal/Signal.js";
 import { invokeObjectEquals } from "../../model/object/invokeObjectEquals.js";
-import { arraySetDiff } from "../array/arraySetDiff.js";
 import { arrayIndexByEquality } from "../array/arrayIndexByEquality.js";
+import { arraySetDiff } from "../array/arraySetDiff.js";
 
 
 /**
@@ -51,9 +51,12 @@ class List {
     /**
      * Retrieve element at a given position in the list
      * @param {number} index
-     * @returns {T}
+     * @returns {T|undefined}
      */
     get(index) {
+        assert.isNumber(index, 'index');
+        assert.isNonNegativeInteger(index, 'index');
+
         return this.data[index];
     }
 
@@ -63,6 +66,9 @@ class List {
      * @param {T} value
      */
     set(index, value) {
+        assert.isNumber(index, 'index');
+        assert.isNonNegativeInteger(index, 'index');
+
         const oldValue = this.data[index];
 
         if (oldValue !== undefined) {
@@ -183,7 +189,7 @@ class List {
     /**
      * Replace the data, replacements is performed surgically, meaning that diff is computed and add/remove operations are performed on the set
      * This method is tailored to work well with visualisation as only elements that's missing from the new set is removed, and only elements that are new to are added
-     * Conversely, relevant events are dispatched that a visualisation can observe. This results in fewer changes required to the visualisation
+     * Conversely, relevant events are dispatched that can observe. This results in fewer changes required to the visualisation
      * @param {T[]} newOutput
      */
     patch(newOutput) {

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

@@ -1,10 +1,10 @@
-import { min2 } from "../../../math/min2.js";
-import { max2 } from "../../../math/max2.js";
 import { assert } from "../../../assert.js";
+import { max2 } from "../../../math/max2.js";
+import { min2 } from "../../../math/min2.js";
 
 /**
  *
- * @param {AABB3} result
+ * @param {ArrayLike<number>|number[]|Float32Array|AABB3} result
  * @param {number[]|ArrayLike<number>|Float32Array} input
  * @param {number} input_length length of the input array
  */
@@ -33,5 +33,12 @@ export function aabb3_from_v3_array(result, input, input_length) {
         z1 = max2(z, z1);
     }
 
-    result.setBounds(x0, y0, z0, x1, y1, z1);
+    // read out
+    result[0] = x0;
+    result[1] = y0;
+    result[2] = z0;
+
+    result[3] = x1;
+    result[4] = y1;
+    result[5] = z1;
 }

package/src/core/geom/Vector2.js

@@ -6,11 +6,12 @@
 import { assert } from "../assert.js";
 import Signal from "../events/signal/Signal.js";
 import { clamp } from "../math/clamp.js";
+import { EPSILON } from "../math/EPSILON.js";
+import { epsilonEquals } from "../math/epsilonEquals.js";
 import { lerp } from "../math/lerp.js";
 import { max2 } from "../math/max2.js";
 import { min2 } from "../math/min2.js";
-import { EPSILON } from "../math/EPSILON.js";
-import { epsilonEquals } from "../math/epsilonEquals.js";
+import { computeHashFloat } from "../primitives/numbers/computeHashFloat.js";
 
 class Vector2 {
     /**
@@ -542,8 +543,8 @@ class Vector2 {
      * @returns {number}
      */
     hash() {
-        const x = Math.sin(this.x) * 1367130550;
-        const y = Math.sin(this.y) * 1367130550;
+        const x = computeHashFloat(this.x);
+        const y = computeHashFloat(this.y);
 
         let hash = ((x << 5) - x) + y;
 
@@ -680,6 +681,7 @@ Vector2.one = Object.freeze(new Vector2(1, 1));
  * @type {boolean}
  */
 Vector2.prototype.isVector2 = true;
+
 /**
  *
  * @param {number} x0

package/src/engine/graphics/ecs/decal/v2/FPDecalSystem.js

@@ -1,34 +1,32 @@
-import { AbstractContextSystem } from "../../../../ecs/system/AbstractContextSystem.js";
-import { SystemEntityContext } from "../../../../ecs/system/SystemEntityContext.js";
-import { Decal } from "./Decal.js";
-import { Transform } from "../../../../ecs/transform/Transform.js";
-import { ForwardPlusRenderingPlugin } from "../../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
-import { Reference } from "../../../../reference/v2/Reference.js";
-import { Decal as FPDecal } from '../../../render/forward_plus/model/Decal.js';
-import { AssetManager } from "../../../../asset/AssetManager.js";
-import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
-import { GameAssetType } from "../../../../asset/GameAssetType.js";
+import { mat4 } from "gl-matrix";
 import { assert } from "../../../../../core/assert.js";
-import { AsyncLoadingCache } from "../../../../../core/collection/map/AsyncLoadingCache.js";
-import { returnTrue } from "../../../../../core/function/Functions.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../../../../../core/bvh2/bvh3/BVH.js";
+import { BvhClient } from "../../../../../core/bvh2/bvh3/BvhClient.js";
 import { bvh_query_leaves_ray } from "../../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
-import { ray3_array_apply_matrix4 } from "../../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
-import { ray3_array_compose } from "../../../../../core/geom/3d/ray/ray3_array_compose.js";
-import { mat4 } from "gl-matrix";
-import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
-import { EBBVHLeafProxy } from "../../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
-import { aabb3_matrix4_project } from "../../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { aabb3_raycast } from "../../../../../core/geom/3d/aabb/aabb3_raycast.js";
 import {
     bvh_query_user_data_overlaps_frustum
 } from "../../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+import { AsyncLoadingCache } from "../../../../../core/collection/map/AsyncLoadingCache.js";
+import { returnTrue } from "../../../../../core/function/Functions.js";
+import { aabb3_matrix4_project } from "../../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
+import { aabb3_raycast } from "../../../../../core/geom/3d/aabb/aabb3_raycast.js";
 import {
     aabb3_transformed_compute_plane_side
 } from "../../../../../core/geom/3d/aabb/aabb3_transformed_compute_plane_side.js";
+import { ray3_array_apply_matrix4 } from "../../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
+import { ray3_array_compose } from "../../../../../core/geom/3d/ray/ray3_array_compose.js";
+import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
+import { AssetManager } from "../../../../asset/AssetManager.js";
+import { GameAssetType } from "../../../../asset/GameAssetType.js";
+import { AbstractContextSystem } from "../../../../ecs/system/AbstractContextSystem.js";
+import { SystemEntityContext } from "../../../../ecs/system/SystemEntityContext.js";
+import { Transform } from "../../../../ecs/transform/Transform.js";
+import { Reference } from "../../../../reference/v2/Reference.js";
+import { Decal as FPDecal } from '../../../render/forward_plus/model/Decal.js';
+import { ForwardPlusRenderingPlugin } from "../../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
+import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
 import { sampler2d_ensure_uint8_RGBA } from "../../../texture/sampler/sampler2d_ensure_uint8_RGBA.js";
+import { Decal } from "./Decal.js";
 
 const placeholder_texture = Sampler2D.uint8(4, 1, 1);
 placeholder_texture.data.fill(255);
@@ -64,7 +62,7 @@ class Context extends SystemEntityContext {
      */
     __fp_decal = null;
 
-    #bvh_leaf = new EBBVHLeafProxy();
+    #bvh_leaf = new BvhClient();
 
     /**
      * @return {ForwardPlusRenderingPlugin}
@@ -229,7 +227,7 @@ class Context extends SystemEntityContext {
  *
  */
 export class FPDecalSystem extends AbstractContextSystem {
-    bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+    bvh = new BVH();
 
     /**
      *

package/src/engine/graphics/ecs/mesh/Mesh.js

@@ -1,16 +1,16 @@
 /**
  * Created by Alex Goldring on 25.02.2015.
  */
-import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
-import { getSkeletonBoneByType } from "./SkeletonUtils.js";
 import { assert } from "../../../../core/assert.js";
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
+import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { applyTransformToThreeObject } from "./applyTransformToThreeObject.js";
-import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
-import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
-import { EBBVHLeafProxy } from "../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
-import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
+import { getSkeletonBoneByType } from "./SkeletonUtils.js";
 
 /**
  *
@@ -71,9 +71,9 @@ class Mesh {
 
         /**
          *
-         * @type {EBBVHLeafProxy}
+         * @type {BvhClient}
          */
-        this.__bvh_leaf = new EBBVHLeafProxy();
+        this.__bvh_leaf = new BvhClient();
 
         /**
          * @private

package/src/engine/graphics/ecs/mesh/MeshSystem.js

@@ -5,9 +5,7 @@
 
 import { BoxBufferGeometry, MeshLambertMaterial } from "three";
 import { assert } from "../../../../core/assert.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import {
     bvh_query_user_data_overlaps_frustum
 } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
@@ -97,10 +95,10 @@ export class MeshSystem extends System {
 
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          * @private
          */
-        this.__bvh_binary = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.__bvh_binary = new BVH();
     }
 
     /**

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.js

@@ -1,12 +1,12 @@
+import { mat4 } from "gl-matrix";
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
-import { DrawMode } from "./DrawMode.js";
-import { ShadedGeometryFlags } from "./ShadedGeometryFlags.js";
+import { aabb3_from_threejs_geometry } from "../../../../core/geom/3d/aabb/aabb3_from_threejs_geometry.js";
 import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { mat4 } from "gl-matrix";
 import { ray3_array_apply_matrix4 } from "../../../../core/geom/3d/ray/ray3_array_apply_matrix4.js";
 import { GeometrySpatialQueryAccelerator } from "../../geometry/buffered/query/GeometrySpatialQueryAccelerator.js";
-import { EBBVHLeafProxy } from "../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
-import { aabb3_from_threejs_geometry } from "../../../../core/geom/3d/aabb/aabb3_from_threejs_geometry.js";
+import { DrawMode } from "./DrawMode.js";
+import { ShadedGeometryFlags } from "./ShadedGeometryFlags.js";
 
 /**
  * @readonly
@@ -60,7 +60,7 @@ export class ShadedGeometry {
          */
         this.depth_material = null;
 
-        this.__bvh_leaf = new EBBVHLeafProxy();
+        this.__bvh_leaf = new BvhClient();
 
         /**
          * Transient, assigned in the system

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.d.ts

@@ -1,13 +1,13 @@
+import {BVH} from "../../../../core/bvh2/bvh3/BVH";
+import {SurfacePoint3} from "../../../../core/geom/3d/SurfacePoint3";
 import {System} from "../../../ecs/System";
 import Engine from "../../../Engine";
 import {ShadedGeometry} from "./ShadedGeometry";
-import {SurfacePoint3} from "../../../../core/geom/3d/SurfacePoint3";
-import {ExplicitBinaryBoundingVolumeHierarchy} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy";
 
 export class ShadedGeometrySystem extends System<ShadedGeometry> {
     constructor(engine: Engine)
 
-    readonly bvh: ExplicitBinaryBoundingVolumeHierarchy
+    readonly bvh: BVH
 
     raycastNearest(
         contact: SurfacePoint3,

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometrySystem.js

@@ -1,26 +1,24 @@
-import { ShadedGeometry } from "./ShadedGeometry.js";
-import { Transform } from "../../../ecs/transform/Transform.js";
-import { System } from "../../../ecs/System.js";
-import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
-import { v3_distance_sqr } from "../../../../core/geom/vec3/v3_distance_sqr.js";
 import { mat4 } from "gl-matrix";
-import { returnTrue } from "../../../../core/function/Functions.js";
-import { ShadedGeometryRendererContext } from "./render/ShadedGeometryRendererContext.js";
 import { assert } from "../../../../core/assert.js";
-import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { bvh_query_leaves_generic } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_generic.js";
+import {
+    bvh_query_user_data_overlaps_frustum
+} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
 import { BVHQueryIntersectsRay } from "../../../../core/bvh2/bvh3/query/BVHQueryIntersectsRay.js";
+import { returnTrue } from "../../../../core/function/Functions.js";
+import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
+import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
+import { v3_distance_sqr } from "../../../../core/geom/vec3/v3_distance_sqr.js";
 import Task from "../../../../core/process/task/Task.js";
-import { RuntimeDrawMethodOptimizer } from "./render/optimization/RuntimeDrawMethodOptimizer.js";
 import { TaskSignal } from "../../../../core/process/task/TaskSignal.js";
 import TaskState from "../../../../core/process/task/TaskState.js";
-import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
 import { iteratorTask } from "../../../../core/process/task/util/iteratorTask.js";
+import { System } from "../../../ecs/System.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { RuntimeDrawMethodOptimizer } from "./render/optimization/RuntimeDrawMethodOptimizer.js";
+import { ShadedGeometryRendererContext } from "./render/ShadedGeometryRendererContext.js";
+import { ShadedGeometry } from "./ShadedGeometry.js";
 
 
 /**
@@ -106,10 +104,10 @@ export class ShadedGeometrySystem extends System {
 
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          * @private
          */
-        this.__bvh_binary = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.__bvh_binary = new BVH();
 
         const optimizer = new RuntimeDrawMethodOptimizer();
 
@@ -137,7 +135,7 @@ export class ShadedGeometrySystem extends System {
 
     /**
      *
-     * @returns {ExplicitBinaryBoundingVolumeHierarchy}
+     * @returns {BVH}
      */
     get bvh() {
         return this.__bvh_binary;

package/src/engine/graphics/ecs/mesh-v2/render/ShadedGeometryRendererContext.js

@@ -1,12 +1,12 @@
-import { AbstractRenderAdapter } from "./adapters/AbstractRenderAdapter.js";
-import { InstancedRendererAdapter } from "./adapters/InstancedRendererAdapter.js";
-import { GenericRendererAdapter } from "./adapters/GenericRendererAdapter.js";
 import { assert } from "../../../../../core/assert.js";
-import { ShadedGeometry } from "../ShadedGeometry.js";
 import {
     bvh_query_user_data_overlaps_frustum
 } from "../../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+import { ShadedGeometry } from "../ShadedGeometry.js";
 import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
+import { AbstractRenderAdapter } from "./adapters/AbstractRenderAdapter.js";
+import { GenericRendererAdapter } from "./adapters/GenericRendererAdapter.js";
+import { InstancedRendererAdapter } from "./adapters/InstancedRendererAdapter.js";
 
 /**
  *
@@ -95,7 +95,7 @@ export class ShadedGeometryRendererContext {
      * @param {number} destination_offset
      * @param {THREE.WebGLRenderer} renderer
      * @param {CameraView} view
-     * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+     * @param {BVH} bvh
      * @param {EntityComponentDataset} ecd
      */
     collect(destination, destination_offset, renderer, view, bvh, ecd) {

package/src/engine/graphics/particles/particular/engine/ParticularEngine.js

@@ -1,13 +1,11 @@
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../../../../../core/bvh2/bvh3/BVH.js";
 import List from "../../../../../core/collection/list/List.js";
-import {ParticleEmitterFlag} from "./emitter/ParticleEmitterFlag.js";
-import {ShaderManager} from "./shader/ShaderManager.js";
-import {SimulationStepApplyForce} from "./simulator/SimulationStepApplyForce.js";
-import {SimulationStepCurlNoiseAcceleration} from "./simulator/SimulationStepCurlNoiseAcceleration.js";
-import {SimulationStepCurlNoiseVelocity} from "./simulator/SimulationStepCurlNoiseVelocity.js";
-import {SimulationStepFixedPhysics} from "./simulator/SimulationStepFixedPhysics.js";
+import { ParticleEmitterFlag } from "./emitter/ParticleEmitterFlag.js";
+import { ShaderManager } from "./shader/ShaderManager.js";
+import { SimulationStepApplyForce } from "./simulator/SimulationStepApplyForce.js";
+import { SimulationStepCurlNoiseAcceleration } from "./simulator/SimulationStepCurlNoiseAcceleration.js";
+import { SimulationStepCurlNoiseVelocity } from "./simulator/SimulationStepCurlNoiseVelocity.js";
+import { SimulationStepFixedPhysics } from "./simulator/SimulationStepFixedPhysics.js";
 
 
 export class ParticularEngine {
@@ -25,9 +23,9 @@ export class ParticularEngine {
 
     /**
      * @readonly
-     * @type {ExplicitBinaryBoundingVolumeHierarchy}
+     * @type {BVH}
      */
-    bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+    bvh = new BVH();
 
 
     /**