@woosh/meep-engine 2.64.0 → 2.65.0

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();
 
 
     /**

package/src/engine/graphics/particles/particular/engine/emitter/ParticleEmitter.js

@@ -1,6 +1,6 @@
 import { Box3, BufferGeometry, Frustum, Points, PointsMaterial } from 'three';
 import { assert } from "../../../../../../core/assert.js";
-import { EBBVHLeafProxy } from "../../../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
+import { BvhClient } from "../../../../../../core/bvh2/bvh3/BvhClient.js";
 import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
 import List from "../../../../../../core/collection/list/List.js";
 import { AABB3 } from "../../../../../../core/geom/3d/aabb/AABB3.js";
@@ -144,9 +144,9 @@ export class ParticleEmitter {
 
     /**
      * @readonly
-     * @type {EBBVHLeafProxy}
+     * @type {BvhClient}
      */
-    bvh_leaf = new EBBVHLeafProxy();
+    bvh_leaf = new BvhClient();
 
 
     /**

package/src/engine/graphics/render/forward_plus/LightManager.js

@@ -1,4 +1,4 @@
-import { LightRenderMetadata } from "./LightRenderMetadata.js";
+import { mat4 } from "gl-matrix";
 import {
     ClampToEdgeWrapping,
     DataTexture,
@@ -12,45 +12,43 @@ import {
     UnsignedByteType,
     UnsignedShortType
 } from "three";
-import Vector3 from "../../../../core/geom/Vector3.js";
-import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
-import { computeFrustumCorners } from "./computeFrustumCorners.js";
-import { read_plane_pair } from "./cluster/read_plane_pair.js";
-import { read_frustum_planes_to_array } from "../../../../core/geom/3d/frustum/read_frustum_planes_to_array.js";
-import { compute_cluster_planes_from_points } from "./cluster/compute_cluster_planes_from_points.js";
-import { TextureBackedMemoryRegion } from "../../texture/TextureBackedMemoryRegion.js";
 import { assert } from "../../../../core/assert.js";
+import { computeBinaryDataTypeByPrecision } from "../../../../core/binary/type/computeBinaryDataTypeByPrecision.js";
 import {
     DataType2TypedArrayConstructorMapping
 } from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
-import { NumericType } from "../../../../core/math/NumericType.js";
-import { computeBinaryDataTypeByPrecision } from "../../../../core/binary/type/computeBinaryDataTypeByPrecision.js";
-import { computeThreeTextureTypeFromDataType } from "../../texture/computeThreeTextureTypeFromDataType.js";
-import {
-    computeThreeTextureInternalFormatFromDataType
-} from "../../texture/computeThreeTextureInternalFormatFromDataType.js";
 import { BinaryUint32BVH } from "../../../../core/bvh2/binary/2/BinaryUint32BVH.js";
-import { mat4 } from "gl-matrix";
-import { TextureAtlas } from "../../texture/atlas/TextureAtlas.js";
-import { CachingTextureAtlas } from "../../texture/atlas/CachingTextureAtlas.js";
-import { writeSample2DDataToDataTexture } from "../../texture/sampler/writeSampler2DDataToDataTexture.js";
-import { Decal } from "./model/Decal.js";
-import { ReferencedTextureAtlas } from "../../texture/atlas/ReferencedTextureAtlas.js";
-import { v3_morton_encode_transformed } from "../../../../core/geom/3d/morton/v3_morton_encode_transformed.js";
-import { v3_distance } from "../../../../core/geom/vec3/v3_distance.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";
 import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import { arrayQuickSort } from "../../../../core/collection/array/arrayQuickSort.js";
-import { frustum_from_camera } from "../../ecs/camera/frustum_from_camera.js";
 import { arraySwapElements } from "../../../../core/collection/array/arraySwapElements.js";
-import { slice_frustum_linear_to_points } from "../../../../core/geom/3d/frustum/slice_frustum_linear_to_points.js";
 import { read_cluster_frustum_corners } from "../../../../core/geom/3d/frustum/read_cluster_frustum_corners.js";
-import { assign_cluster, LOOKUP_CACHE, scratch_corners, scratch_frustum_planes } from "./assign_cluster.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import { read_frustum_planes_to_array } from "../../../../core/geom/3d/frustum/read_frustum_planes_to_array.js";
+import { slice_frustum_linear_to_points } from "../../../../core/geom/3d/frustum/slice_frustum_linear_to_points.js";
+import { v3_morton_encode_transformed } from "../../../../core/geom/3d/morton/v3_morton_encode_transformed.js";
+import { v3_distance } from "../../../../core/geom/vec3/v3_distance.js";
+import Vector3 from "../../../../core/geom/Vector3.js";
+import { NumericType } from "../../../../core/math/NumericType.js";
+import { frustum_from_camera } from "../../ecs/camera/frustum_from_camera.js";
+import { CachingTextureAtlas } from "../../texture/atlas/CachingTextureAtlas.js";
+import { ReferencedTextureAtlas } from "../../texture/atlas/ReferencedTextureAtlas.js";
+import { TextureAtlas } from "../../texture/atlas/TextureAtlas.js";
 import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+    computeThreeTextureInternalFormatFromDataType
+} from "../../texture/computeThreeTextureInternalFormatFromDataType.js";
+import { computeThreeTextureTypeFromDataType } from "../../texture/computeThreeTextureTypeFromDataType.js";
+import { writeSample2DDataToDataTexture } from "../../texture/sampler/writeSampler2DDataToDataTexture.js";
+import { TextureBackedMemoryRegion } from "../../texture/TextureBackedMemoryRegion.js";
+import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
+import { assign_cluster, LOOKUP_CACHE, scratch_corners, scratch_frustum_planes } from "./assign_cluster.js";
+import { compute_cluster_planes_from_points } from "./cluster/compute_cluster_planes_from_points.js";
+import { read_plane_pair } from "./cluster/read_plane_pair.js";
+import { computeFrustumCorners } from "./computeFrustumCorners.js";
+import { LightRenderMetadata } from "./LightRenderMetadata.js";
+import { Decal } from "./model/Decal.js";
 import { point_light_inside_volume } from "./query/point_light_inside_volume.js";
 
 
@@ -137,9 +135,9 @@ export class LightManager {
 
     /**
      * @readonly
-     * @type {ExplicitBinaryBoundingVolumeHierarchy}
+     * @type {BVH}
      */
-    #light_data_bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+    #light_data_bvh = new BVH();
 
     /**
      * Mapping from a light/decal object ID internal metadata

package/src/engine/graphics/render/forward_plus/LightRenderMetadata.js

@@ -1,4 +1,4 @@
-import { EBBVHLeafProxy } from "../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 
 export class LightRenderMetadata {
 
@@ -20,7 +20,7 @@ export class LightRenderMetadata {
          */
         this.address = 0;
 
-        this.bvh_leaf = new EBBVHLeafProxy();
+        this.bvh_leaf = new BvhClient();
     }
 
     /**
@@ -42,7 +42,7 @@ export class LightRenderMetadata {
 
     /**
      *
-     * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+     * @param {BVH} bvh
      */
     link(bvh) {
         this.bvh_leaf.link(bvh, this.light.id);

package/src/engine/graphics/sh3/LightProbeVolume.js

@@ -1,13 +1,3 @@
-import { TetrahedralMesh } from "../../../core/geom/3d/tetrahedra/TetrahedralMesh.js";
-import {
-    compute_delaunay_tetrahedral_mesh
-} from "../../../core/geom/3d/tetrahedra/delaunay/compute_delaunay_tetrahedral_mesh.js";
-import { visualise_probe } from "./visualise_probe.js";
-import {
-    build_tetrahedral_mesh_buffer_geometry
-} from "../../../core/geom/3d/tetrahedra/build_tetrahedral_mesh_buffer_geometry.js";
-import Entity from "../../ecs/Entity.js";
-import { ShadedGeometry } from "../ecs/mesh-v2/ShadedGeometry.js";
 import {
     CubeCamera,
     LinearEncoding,
@@ -17,19 +7,29 @@ import {
     Scene,
     WebGLCubeRenderTarget
 } from "three";
-import { DrawMode } from "../ecs/mesh-v2/DrawMode.js";
-import { Transform } from "../../ecs/transform/Transform.js";
 import { array_copy } from "../../../core/collection/array/array_copy.js";
+import { sh3_basis_at } from "../../../core/geom/3d/sphere/harmonics/sh3_basis_at.js";
+import { sh3_dering_optimize_positive } from "../../../core/geom/3d/sphere/harmonics/sh3_dering_optimize_positive.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
-import { Light } from "../ecs/light/Light.js";
+import {
+    build_tetrahedral_mesh_buffer_geometry
+} from "../../../core/geom/3d/tetrahedra/build_tetrahedral_mesh_buffer_geometry.js";
+import {
+    compute_delaunay_tetrahedral_mesh
+} from "../../../core/geom/3d/tetrahedra/delaunay/compute_delaunay_tetrahedral_mesh.js";
+import { TetrahedralMesh } from "../../../core/geom/3d/tetrahedra/TetrahedralMesh.js";
+import { v3_length_sqr } from "../../../core/geom/vec3/v3_length_sqr.js";
+import Entity from "../../ecs/Entity.js";
+import { Transform } from "../../ecs/transform/Transform.js";
 import { threeMakeLight } from "../ecs/light/binding/three/threeMakeLight.js";
+import { Light } from "../ecs/light/Light.js";
 import { ThreeLightCache } from "../ecs/light/three/ThreeLightCache.js";
-import { applyTransformToThreeObject } from "../ecs/mesh/applyTransformToThreeObject.js";
 import { build_three_object } from "../ecs/mesh-v2/build_three_object.js";
+import { DrawMode } from "../ecs/mesh-v2/DrawMode.js";
+import { ShadedGeometry } from "../ecs/mesh-v2/ShadedGeometry.js";
 import { ShadedGeometryFlags } from "../ecs/mesh-v2/ShadedGeometryFlags.js";
-import { v3_length_sqr } from "../../../core/geom/vec3/v3_length_sqr.js";
-import { sh3_dering_optimize_positive } from "../../../core/geom/3d/sphere/harmonics/sh3_dering_optimize_positive.js";
-import { sh3_basis_at } from "../../../core/geom/3d/sphere/harmonics/sh3_basis_at.js";
+import { applyTransformToThreeObject } from "../ecs/mesh/applyTransformToThreeObject.js";
+import { visualise_probe } from "./visualise_probe.js";
 
 const TEMP_CONTACT = new SurfacePoint3();
 
@@ -333,7 +333,7 @@ class Baker {
 
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy|null}
+         * @type {BVH|null}
          * @private
          */
         this.__bvh = null;
@@ -345,7 +345,7 @@ class Baker {
     }
 
     /**
-     * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
+     * @param {BVH} bvh
      */
     set_bvh(bvh) {
         this.__bvh = bvh;

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

@@ -1,11 +1,9 @@
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
+import { ebvh_build_for_geometry_morton } from "../../../../core/bvh2/bvh3/ebvh_build_for_geometry_morton.js";
 import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
 import {
     aabb3_signed_distance_sqr_to_point
 } from "../../../../core/geom/3d/aabb/aabb3_signed_distance_sqr_to_point.js";
-import { ebvh_build_for_geometry_morton } from "../../../../core/bvh2/bvh3/ebvh_build_for_geometry_morton.js";
 import {
     computeTriangleRayIntersectionBarycentric
 } from "../../../../core/geom/3d/triangle/computeTriangleRayIntersectionBarycentric.js";
@@ -28,10 +26,10 @@ export class GeometryBVHBatched {
     constructor() {
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          * @private
          */
-        this.__bvh = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.__bvh = new BVH();
 
         /**
          *

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

@@ -1,15 +1,4 @@
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
-import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
-import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { array_copy } from "../../../../core/collection/array/array_copy.js";
 import { mat4, vec3 } from "gl-matrix";
-import { ensureGeometryBoundingBox } from "../../util/ensureGeometryBoundingBox.js";
-import { GeometryBVHBatched } from "./GeometryBVHBatched.js";
-import { PathTracedMesh } from "./PathTracedMesh.js";
-import { TextureAttachmentsByMaterialType } from "../../../asset/loaders/material/TextureAttachmensByMaterialType.js";
-import { convertTexture2Sampler2D } from "../../texture/sampler/convertTexture2Sampler2D.js";
 import {
     LinearEncoding,
     LinearFilter,
@@ -19,16 +8,25 @@ import {
     sRGBEncoding,
     UnsignedByteType
 } from "three";
-import { linear_to_sRGB } from "../../../../core/color/sRGB/linear_to_sRGB.js";
-import { sample_triangle_attribute } from "./sample_triangle_attribute.js";
-import { vec3_uint8_to_float } from "./vec3_uint8_to_float.js";
-import { apply_texture_clamping_to_coordinate } from "./apply_texture_clamping_to_coordinate.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { ebvh_sort_for_traversal_depth_first } from "../../../../core/bvh2/bvh3/ebvh_sort_for_traversal_depth_first.js";
+import { bvh_query_leaves_ray } from "../../../../core/bvh2/bvh3/query/bvh_query_leaves_ray.js";
+import { array_copy } from "../../../../core/collection/array/array_copy.js";
+import { linear_to_sRGB } from "../../../../core/color/sRGB/linear_to_sRGB.js";
+import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
+import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
 import { v3_dot } from "../../../../core/geom/vec3/v3_dot.js";
+import { TextureAttachmentsByMaterialType } from "../../../asset/loaders/material/TextureAttachmensByMaterialType.js";
+import { convertTexture2Sampler2D } from "../../texture/sampler/convertTexture2Sampler2D.js";
+import { ensureGeometryBoundingBox } from "../../util/ensureGeometryBoundingBox.js";
+import { apply_texture_clamping_to_coordinate } from "./apply_texture_clamping_to_coordinate.js";
+import { GeometryBVHBatched } from "./GeometryBVHBatched.js";
+import { getBiasedNormalSample } from "./getBiasedNormalSample.js";
 import { make_one_vector3 } from "./make_one_vector3.js";
+import { PathTracedMesh } from "./PathTracedMesh.js";
 import { transform_normal_m4 } from "./ray_hit_apply_transform.js";
-import { ray3_array_compose } from "../../../../core/geom/3d/ray/ray3_array_compose.js";
-import { getBiasedNormalSample } from "./getBiasedNormalSample.js";
+import { sample_triangle_attribute } from "./sample_triangle_attribute.js";
+import { vec3_uint8_to_float } from "./vec3_uint8_to_float.js";
 
 /*
  Ray hit data layout:
@@ -69,9 +67,9 @@ export class PathTracer {
 
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          */
-        this.bvh_top_level = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.bvh_top_level = new BVH();
 
         /**
          *