@woosh/meep-engine 2.64.0 → 2.66.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/light/LightSystem.js

@@ -3,23 +3,22 @@
  */
 
 
+import { assert } from "../../../../core/assert.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { AbstractContextSystem } from "../../../ecs/system/AbstractContextSystem.js";
 import { Transform } from '../../../ecs/transform/Transform.js';
-import { Light } from './Light.js';
+import { ForwardPlusRenderingPlugin } from "../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
 import { Camera } from '../camera/Camera.js';
 
 import FrustumProjector from '../camera/FrustumProjector.js';
-import { LightType } from "./LightType.js";
-import { CameraClippingPlaneComputer } from "../camera/CameraClippingPlaneComputer.js";
-import { assert } from "../../../../core/assert.js";
-import { ForwardPlusRenderingPlugin } from "../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
-import { ThreeLightCache } from "./three/ThreeLightCache.js";
-import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
-import { ShadowManager } from "./shadow/ShadowManager.js";
-import { AbstractContextSystem } from "../../../ecs/system/AbstractContextSystem.js";
+import { Light } from './Light.js';
 import { LightContext } from "./LightContext.js";
+import { LightType } from "./LightType.js";
 import { setShadowCameraDimensionsDiscrete } from "./shadow/setShadowCameraDimensionsDiscrete.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ShadowManager } from "./shadow/ShadowManager.js";
+import { ThreeLightCache } from "./three/ThreeLightCache.js";
 
 class LightSystem extends AbstractContextSystem {
     /**
@@ -265,8 +264,6 @@ class LightSystem extends AbstractContextSystem {
     }
 }
 
-const cameraClippingPlaneComputer = new CameraClippingPlaneComputer();
-
 const scratch_aabb3 = new AABB3();
 
 /**
@@ -278,10 +275,6 @@ const scratch_aabb3 = new AABB3();
  */
 function updateShadowMap(camera, light, graphics) {
 
-    /**
-     * @type {RenderLayerManager}
-     */
-    const layers = graphics.layers;
 
     // Fit shadow camera's ortho frustum to camera frustum
     const shadow = light.shadow;
@@ -310,43 +303,14 @@ function updateShadowMap(camera, light, graphics) {
 
     // collect all visible objects
 
-    cameraClippingPlaneComputer.hysteresis = 0.33;
-
-    cameraClippingPlaneComputer.camera = shadowCamera;
-    cameraClippingPlaneComputer.layers = layers;
-
-    cameraClippingPlaneComputer.compute();
-
-    shadowCamera.near = cameraClippingPlaneComputer.near;
-    shadowCamera.far = cameraClippingPlaneComputer.far;
+    shadowCamera.near = 0.1;
+    shadowCamera.far = 100;
 
     shadowCamera.updateProjectionMatrix();
 
     // small bias to prevent shadow acne
     shadow.bias = -0.0001;
 
-    //
-    // const frustum = new Frustum();
-    // frustumFromCamera(shadowCamera, frustum);
-    // visitor.setFrustums([frustum]);
-    // visitor.collector = collector;
-    //
-    // shadow_scene.children = [];
-    //
-    // const layers_list = layers.layers;
-    // const layer_count = layers_list.length;
-    //
-    // for (let i = 0; i < layer_count; i++) {
-    //     const renderLayer = layers_list.get(i);
-    //
-    //     collector.callbackContext = shadow_scene.children;
-    //     collector.callback = Array.prototype.push;
-    //     collector.reader = renderLayer.extractRenderable;
-    //
-    //     traverseBinaryNodeUsingVisitor(renderLayer.bvh, visitor);
-    // }
-    //
-    // graphics.shadowmap_renderer.update(graphics.renderer, light.shadow, shadow_scene, camera, light);
 }
 
 export default LightSystem;

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,12 +5,7 @@
 
 import { BoxBufferGeometry, MeshLambertMaterial } from "three";
 import { assert } from "../../../../core/assert.js";
-import {
-    ExplicitBinaryBoundingVolumeHierarchy
-} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
-import {
-    bvh_query_user_data_overlaps_frustum
-} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
 
 import Vector3 from "../../../../core/geom/Vector3.js";
@@ -19,6 +14,7 @@ import { ResourceAccessSpecification } from "../../../../core/model/ResourceAcce
 import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { System } from "../../../ecs/System.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
+import { make_bvh_visibility_builder } from "../../render/make_bvh_visibility_builder.js";
 
 import checkerTexture from "../../texture/CheckersTexture.js";
 
@@ -36,8 +32,6 @@ const PLACEHOLDER_TEXTURE = checkerTexture.create();
 
 const PLACEHOLDER_MATERIAL = new MeshLambertMaterial({ map: PLACEHOLDER_TEXTURE });
 
-const scratch_array = [];
-
 export class MeshSystem extends System {
     /**
      *
@@ -97,10 +91,10 @@ export class MeshSystem extends System {
 
         /**
          *
-         * @type {ExplicitBinaryBoundingVolumeHierarchy}
+         * @type {BVH}
          * @private
          */
-        this.__bvh_binary = new ExplicitBinaryBoundingVolumeHierarchy();
+        this.__bvh_binary = new BVH();
     }
 
     /**
@@ -154,37 +148,19 @@ export class MeshSystem extends System {
         const graphics = this.graphics;
         this.renderLayer = graphics.layers.create("mesh-system");
 
-        this.renderLayer.buildVisibleSet = (destination, destination_offset, view) => {
-
-            const ecd = entityManager.dataset;
-
-            if (ecd === null) {
-                return 0;
-            }
-
-            const view_frustum = view.frustum;
-
-            const hit_count = bvh_query_user_data_overlaps_frustum(scratch_array, 0, this.__bvh_binary, view_frustum);
-
-            let added = 0;
-
-            for (let i = 0; i < hit_count; i++) {
-                const entity = scratch_array[i];
-
+        this.renderLayer.buildVisibleSet = make_bvh_visibility_builder(
+            this.entityManager, this.__bvh_binary,
+            (destination, offset, entity, ecd) => {
                 const component = ecd.getComponent(entity, Mesh);
 
-                const object3D = component.mesh;
-
-                if (object3D === null) {
-                    continue;
+                if (component.mesh === null) {
+                    return 0;
                 }
 
-                destination[destination_offset + added] = object3D;
-                added++;
+                destination[offset] = component.mesh;
+                return 1;
             }
-
-            return added;
-        };
+        )
 
         const visibleSet = this.renderLayer.visibleSet;
 

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

@@ -1,54 +1,14 @@
 import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
 
-/**
- * Common buffer for scratch objects for better cache locality
- * @type {ArrayBuffer}
- */
-const scratch_buffer = new ArrayBuffer(28 * 4);
-
-/**
- *
- * @type {Float32Array}
- */
-const scratch_matrix4 = new Float32Array(scratch_buffer, 0, 16);
-
-/**
- *
- * @type {Float32Array}
- */
-const scratch_aabb_0 = new Float32Array(scratch_buffer, 64, 6);
-
-/**
- *
- * @type {Float32Array}
- */
-const scratch_aabb_1 = new Float32Array(scratch_buffer, 88, 6);
-
 /**
  *
- * @param {LeafNode} bvh
+ * @param {BvhClient} bvh
  * @param {AABB3} boundingBox
  * @param {Transform} transform
  */
 export function updateNodeByTransformAndBBB(bvh, boundingBox, transform) {
-    transform.toMatrix4(scratch_matrix4);
-
-    updateNodeByMatrix4AndBBB(bvh, boundingBox, scratch_matrix4);
-}
-
-/**
- *
- * @param {LeafNode} bvh
- * @param {AABB3} boundingBox
- * @param {ArrayLike<number>|number[]|Float32Array} matrix4
- */
-export function updateNodeByMatrix4AndBBB(bvh, boundingBox, matrix4) {
-    boundingBox.writeToArray(scratch_aabb_1, 0);
-
-    aabb3_matrix4_project(scratch_aabb_0, scratch_aabb_1, matrix4);
-
-    bvh.readFromArray(scratch_aabb_0, 0);
+    aabb3_matrix4_project(bvh.bounds, boundingBox, transform.matrix);
 
-    bvh.bubbleRefit();
+    bvh.write_bounds();
 }
 

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) {