@woosh/meep-engine 2.61.0 → 2.62.0

package/src/engine/graphics/ecs/path/testPathDisplaySystem.js

@@ -1,75 +1,73 @@
-import { EngineHarness } from "../../../EngineHarness.js";
+import '../../../../../../../../css/game.scss';
+import FacingDirectionSystem from "../../../../../../model/game/ecs/system/FacingDirectionSystem.js";
 import { makeEngineOptionsModel } from "../../../../../../model/game/options/makeEngineOptionsModel.js";
-import Path from "../../../navigation/ecs/components/Path.js";
+import { enableEditor } from "../../../../../editor/enableEditor.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
-import Highlight from "../highlight/Highlight.js";
-import { EntityPathStyle } from "./entity/EntityPathStyle.js";
-import { EntityPathMarkerDefinition } from "./entity/EntityPathMarkerDefinition.js";
-import { EntityBlueprint } from "../../../ecs/EntityBlueprint.js";
-import { Transform } from "../../../ecs/transform/Transform.js";
-import Mesh from "../mesh/Mesh.js";
+import { CanvasView } from "../../../../view/elements/CanvasView.js";
+import { GameAssetType } from "../../../asset/GameAssetType.js";
+import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
+import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
+import { JsonAssetLoader } from "../../../asset/loaders/JsonAssetLoader.js";
+import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
 import { Animation } from "../../../ecs/animation/Animation.js";
-import { EngineConfiguration } from "../../../EngineConfiguration.js";
+import { AttachmentSystem } from "../../../ecs/attachment/AttachmentSystem.js";
+import Entity from "../../../ecs/Entity.js";
+import { EntityBlueprint } from "../../../ecs/EntityBlueprint.js";
 import GUIElementSystem from "../../../ecs/gui/GUIElementSystem.js";
 import HeadsUpDisplaySystem from "../../../ecs/gui/hud/HeadsUpDisplaySystem.js";
+import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
+import { InverseKinematicsSystem } from "../../../ecs/ik/InverseKinematicsSystem.js";
+import AnimationSystem from "../../../ecs/systems/AnimationSystem.js";
+import MotionSystem from "../../../ecs/systems/MotionSystem.js";
 import ScriptSystem from "../../../ecs/systems/ScriptSystem.js";
-import FacingDirectionSystem from "../../../../../../model/game/ecs/system/FacingDirectionSystem.js";
-import PathFollowingSystem from "../../../navigation/ecs/path_following/PathFollowingSystem.js";
 import SteeringSystem from "../../../ecs/systems/SteeringSystem.js";
-import MotionSystem from "../../../ecs/systems/MotionSystem.js";
 import TagSystem from "../../../ecs/systems/TagSystem.js";
-import { AttachmentSystem } from "../../../ecs/attachment/AttachmentSystem.js";
 import TimerSystem from "../../../ecs/systems/TimerSystem.js";
-import AnimationSystem from "../../../ecs/systems/AnimationSystem.js";
-import TopDownCameraControllerSystem from "../camera/topdown/TopDownCameraControllerSystem.js";
-import { TopDownCameraLanderSystem } from "../camera/topdown/TopDownCameraLanderSystem.js";
-import { CameraSystem } from "../camera/CameraSystem.js";
-import { MeshSystem } from "../mesh/MeshSystem.js";
 import ClingToTerrainSystem from "../../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../../ecs/terrain/ecs/TerrainSystem.js";
-import WaterSystem from "../water/WaterSystem.js";
-import Trail2DSystem from "../trail2d/Trail2DSystem.js";
-import { Foliage2System } from "../../../ecs/foliage/ecs/Foliage2System.js";
-import ViewportPositionSystem from "../../../ecs/gui/position/ViewportPositionSystem.js";
+import { Transform } from "../../../ecs/transform/Transform.js";
+import { EngineConfiguration } from "../../../EngineConfiguration.js";
+import { EngineHarness } from "../../../EngineHarness.js";
 import InputControllerSystem from "../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../input/ecs/systems/InputSystem.js";
-import MeshHighlightSystem from "../highlight/system/MeshHighlightSystem.js";
-import LightSystem from "../light/LightSystem.js";
-import AnimationControllerSystem from "../animation/AnimationControllerSystem.js";
-import { AnimationGraphSystem } from "../animation/animator/AnimationGraphSystem.js";
 import { BehaviorSystem } from "../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import { InverseKinematicsSystem } from "../../../ecs/ik/InverseKinematicsSystem.js";
-import { PathDisplaySystem } from "./PathDisplaySystem.js";
-import { PathDisplay } from "./PathDisplay.js";
-import { PathDisplayType } from "./PathDisplayType.js";
-import Entity from "../../../ecs/Entity.js";
-import { enableEditor } from "../../../../../editor/enableEditor.js";
-import { GameAssetType } from "../../../asset/GameAssetType.js";
-import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
-import { JsonAssetLoader } from "../../../asset/loaders/JsonAssetLoader.js";
-import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
+import { computeCatmullRomSpline } from "../../../navigation/ecs/components/computeCatmullRomSpline.js";
+import { InterpolationType } from "../../../navigation/ecs/components/InterpolationType.js";
+import Path from "../../../navigation/ecs/components/Path.js";
+import PathFollowingSystem from "../../../navigation/ecs/path_following/PathFollowingSystem.js";
 import {
     AmbientOcclusionPostProcessEffect
 } from "../../render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
-import { CanvasView } from "../../../../view/elements/CanvasView.js";
-import { computeCatmullRomSpline } from "../../../navigation/ecs/components/computeCatmullRomSpline.js";
-import { PathDisplaySpec } from "./PathDisplaySpec.js";
-import { InterpolationType } from "../../../navigation/ecs/components/InterpolationType.js";
-import { TubePathStyle } from "./tube/TubePathStyle.js";
-import { TubeMaterialType } from "./tube/TubeMaterialType.js";
-import { MatcapMaterialDefinition } from "./tube/MatcapMaterialDefinition.js";
-import { TextureAssetLoader } from "../../../asset/loaders/texture/TextureAssetLoader.js";
+import { GizmoRenderingPlugin } from "../../render/gizmo/GizmoRenderingPlugin.js";
+import AnimationControllerSystem from "../animation/AnimationControllerSystem.js";
+import { AnimationGraphSystem } from "../animation/animator/AnimationGraphSystem.js";
+import { Camera } from "../camera/Camera.js";
+import { CameraSystem } from "../camera/CameraSystem.js";
+import TopDownCameraControllerSystem from "../camera/topdown/TopDownCameraControllerSystem.js";
+import { TopDownCameraLanderSystem } from "../camera/topdown/TopDownCameraLanderSystem.js";
+import Highlight from "../highlight/Highlight.js";
+import MeshHighlightSystem from "../highlight/system/MeshHighlightSystem.js";
+import { ShadedGeometryHighlightSystem } from "../highlight/system/ShadedGeometryHighlightSystem.js";
+import LightSystem from "../light/LightSystem.js";
 import { ShadedGeometrySystem } from "../mesh-v2/ShadedGeometrySystem.js";
-import { CapType } from "./tube/CapType.js";
-import { StandardMaterialDefinition } from "./tube/StandardMaterialDefinition.js";
+import Mesh from "../mesh/Mesh.js";
+import { MeshSystem } from "../mesh/MeshSystem.js";
+import Trail2DSystem from "../trail2d/Trail2DSystem.js";
+import WaterSystem from "../water/WaterSystem.js";
+import { EntityPathMarkerDefinition } from "./entity/EntityPathMarkerDefinition.js";
+import { EntityPathStyle } from "./entity/EntityPathStyle.js";
 import { PathDisplayHighlightSystem } from "./highlight/PathDisplayHighlightSystem.js";
-import { ShadedGeometryHighlightSystem } from "../highlight/system/ShadedGeometryHighlightSystem.js";
+import { PathDisplay } from "./PathDisplay.js";
+import { PathDisplaySpec } from "./PathDisplaySpec.js";
+import { PathDisplaySystem } from "./PathDisplaySystem.js";
+import { PathDisplayType } from "./PathDisplayType.js";
 import { BasicMaterialDefinition } from "./tube/BasicMaterialDefinition.js";
-
-import '../../../../../../../../css/game.scss';
-import { GizmoRenderingPlugin } from "../../render/gizmo/GizmoRenderingPlugin.js";
+import { CapType } from "./tube/CapType.js";
+import { MatcapMaterialDefinition } from "./tube/MatcapMaterialDefinition.js";
 import { PathNormalType } from "./tube/PathNormalType.js";
-import { Camera } from "../camera/Camera.js";
+import { StandardMaterialDefinition } from "./tube/StandardMaterialDefinition.js";
+import { TubeMaterialType } from "./tube/TubeMaterialType.js";
+import { TubePathStyle } from "./tube/TubePathStyle.js";
 
 const engineHarness = new EngineHarness();
 
@@ -108,7 +106,6 @@ function makeConfig(engine) {
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
         new Trail2DSystem(engine),
-        new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new InputControllerSystem(devices),
         new InputSystem(devices),

package/src/engine/graphics/ecs/path/tube/prototypeAnimatedPathMask.js

@@ -1,23 +1,22 @@
 import FacingDirectionSystem from "../../../../../../../model/game/ecs/system/FacingDirectionSystem.js";
-import {makeEngineOptionsModel} from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
-import {enableEditor} from "../../../../../../editor/enableEditor.js";
+import { makeEngineOptionsModel } from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
+import { enableEditor } from "../../../../../../editor/enableEditor.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
-import {pingpong} from "../../../../../core/math/pingpong.js";
-import {CanvasView} from "../../../../../view/elements/CanvasView.js";
-import {GameAssetType} from "../../../../asset/GameAssetType.js";
-import {GLTFAssetLoader} from "../../../../asset/loaders/GLTFAssetLoader.js";
-import {ImageRGBADataLoader} from "../../../../asset/loaders/image/ImageRGBADataLoader.js";
-import {JsonAssetLoader} from "../../../../asset/loaders/JsonAssetLoader.js";
-import {TextureAssetLoader} from "../../../../asset/loaders/texture/TextureAssetLoader.js";
-import {Animation} from "../../../../ecs/animation/Animation.js";
-import {AttachmentSystem} from "../../../../ecs/attachment/AttachmentSystem.js";
+import { pingpong } from "../../../../../core/math/pingpong.js";
+import { CanvasView } from "../../../../../view/elements/CanvasView.js";
+import { GameAssetType } from "../../../../asset/GameAssetType.js";
+import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
+import { ImageRGBADataLoader } from "../../../../asset/loaders/image/ImageRGBADataLoader.js";
+import { JsonAssetLoader } from "../../../../asset/loaders/JsonAssetLoader.js";
+import { TextureAssetLoader } from "../../../../asset/loaders/texture/TextureAssetLoader.js";
+import { Animation } from "../../../../ecs/animation/Animation.js";
+import { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import Entity from "../../../../ecs/Entity.js";
-import {EntityBlueprint} from "../../../../ecs/EntityBlueprint.js";
-import {Foliage2System} from "../../../../ecs/foliage/ecs/Foliage2System.js";
+import { EntityBlueprint } from "../../../../ecs/EntityBlueprint.js";
 import GUIElementSystem from "../../../../ecs/gui/GUIElementSystem.js";
 import HeadsUpDisplaySystem from "../../../../ecs/gui/hud/HeadsUpDisplaySystem.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import {InverseKinematicsSystem} from "../../../../ecs/ik/InverseKinematicsSystem.js";
+import { InverseKinematicsSystem } from "../../../../ecs/ik/InverseKinematicsSystem.js";
 import AnimationSystem from "../../../../ecs/systems/AnimationSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
 import ScriptSystem from "../../../../ecs/systems/ScriptSystem.js";
@@ -26,50 +25,50 @@ import TagSystem from "../../../../ecs/systems/TagSystem.js";
 import TimerSystem from "../../../../ecs/systems/TimerSystem.js";
 import ClingToTerrainSystem from "../../../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../../../ecs/terrain/ecs/TerrainSystem.js";
-import {Transform} from "../../../../ecs/transform/Transform.js";
-import {EngineConfiguration} from "../../../../EngineConfiguration.js";
-import {EngineHarness} from "../../../../EngineHarness.js";
-import {GridPosition2TransformSystem} from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
+import { Transform } from "../../../../ecs/transform/Transform.js";
+import { EngineConfiguration } from "../../../../EngineConfiguration.js";
+import { EngineHarness } from "../../../../EngineHarness.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
-import {Transform2GridPositionSystem} from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
+import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
-import {InputSystem} from "../../../../input/ecs/systems/InputSystem.js";
-import {BehaviorComponent} from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
-import {BehaviorSystem} from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import {computeCatmullRomSpline} from "../../../../navigation/ecs/components/computeCatmullRomSpline.js";
-import {InterpolationType} from "../../../../navigation/ecs/components/InterpolationType.js";
+import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
+import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
+import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
+import { computeCatmullRomSpline } from "../../../../navigation/ecs/components/computeCatmullRomSpline.js";
+import { InterpolationType } from "../../../../navigation/ecs/components/InterpolationType.js";
 import Path from "../../../../navigation/ecs/components/Path.js";
-import {PathEvents} from "../../../../navigation/ecs/components/PathEvents.js";
+import { PathEvents } from "../../../../navigation/ecs/components/PathEvents.js";
 import PathFollowingSystem from "../../../../navigation/ecs/path_following/PathFollowingSystem.js";
-import {SoundEmitterSystem} from "../../../../sound/ecs/emitter/SoundEmitterSystem.js";
+import { SoundEmitterSystem } from "../../../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../../../sound/ecs/SoundControllerSystem.js";
 import SoundListenerSystem from "../../../../sound/ecs/SoundListenerSystem.js";
 import {
     AmbientOcclusionPostProcessEffect
 } from "../../../render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 import AnimationControllerSystem from "../../animation/AnimationControllerSystem.js";
-import {AnimationGraphSystem} from "../../animation/animator/AnimationGraphSystem.js";
-import {CameraSystem} from "../../camera/CameraSystem.js";
+import { AnimationGraphSystem } from "../../animation/animator/AnimationGraphSystem.js";
+import { CameraSystem } from "../../camera/CameraSystem.js";
 import TopDownCameraControllerSystem from "../../camera/topdown/TopDownCameraControllerSystem.js";
-import {TopDownCameraLanderSystem} from "../../camera/topdown/TopDownCameraLanderSystem.js";
+import { TopDownCameraLanderSystem } from "../../camera/topdown/TopDownCameraLanderSystem.js";
 import Highlight from "../../highlight/Highlight.js";
 import MeshHighlightSystem from "../../highlight/system/MeshHighlightSystem.js";
 import LightSystem from "../../light/LightSystem.js";
-import {ShadedGeometrySystem} from "../../mesh-v2/ShadedGeometrySystem.js";
+import { ShadedGeometrySystem } from "../../mesh-v2/ShadedGeometrySystem.js";
 import Mesh from "../../mesh/Mesh.js";
-import {MeshSystem} from "../../mesh/MeshSystem.js";
+import { MeshSystem } from "../../mesh/MeshSystem.js";
 import Trail2DSystem from "../../trail2d/Trail2DSystem.js";
 import WaterSystem from "../../water/WaterSystem.js";
-import {EntityPathMarkerDefinition} from "../entity/EntityPathMarkerDefinition.js";
-import {EntityPathStyle} from "../entity/EntityPathStyle.js";
-import {PathDisplay} from "../PathDisplay.js";
-import {PathDisplaySpec} from "../PathDisplaySpec.js";
-import {PathDisplaySystem} from "../PathDisplaySystem.js";
-import {PathDisplayType} from "../PathDisplayType.js";
-import {RibbonPathStyle} from "../ribbon/RibbonPathStyle.js";
-import {MatcapMaterialDefinition} from "./MatcapMaterialDefinition.js";
-import {TubeMaterialType} from "./TubeMaterialType.js";
-import {TubePathStyle} from "./TubePathStyle.js";
+import { EntityPathMarkerDefinition } from "../entity/EntityPathMarkerDefinition.js";
+import { EntityPathStyle } from "../entity/EntityPathStyle.js";
+import { PathDisplay } from "../PathDisplay.js";
+import { PathDisplaySpec } from "../PathDisplaySpec.js";
+import { PathDisplaySystem } from "../PathDisplaySystem.js";
+import { PathDisplayType } from "../PathDisplayType.js";
+import { RibbonPathStyle } from "../ribbon/RibbonPathStyle.js";
+import { MatcapMaterialDefinition } from "./MatcapMaterialDefinition.js";
+import { TubeMaterialType } from "./TubeMaterialType.js";
+import { TubePathStyle } from "./TubePathStyle.js";
 
 const engineHarness = new EngineHarness();
 
@@ -111,7 +110,6 @@ function makeConfig(engine) {
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
         new Trail2DSystem(engine),
-        new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),
         new Transform2GridPositionSystem(),

package/src/engine/graphics/particles/ecs/ParticleEmitterSystem.js

@@ -1,14 +1,17 @@
-import { System } from "../../../ecs/System.js";
-import { ParticleEmitter } from "../particular/engine/emitter/ParticleEmitter.js";
-import { ParticularEngine } from "../particular/engine/ParticularEngine.js";
-import { Transform } from "../../../ecs/transform/Transform.js";
-import { ParticleEmitterFlag } from "../particular/engine/emitter/ParticleEmitterFlag.js";
-import { RenderPassType } from "../../render/RenderPassType.js";
-import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
-import { StandardFrameBuffers } from "../../StandardFrameBuffers.js";
-import { assert } from "../../../../core/assert.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import {assert} from "../../../../core/assert.js";
+import {
+    bvh_query_user_data_overlaps_frustum
+} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
+import {ResourceAccessKind} from "../../../../core/model/ResourceAccessKind.js";
+import {ResourceAccessSpecification} from "../../../../core/model/ResourceAccessSpecification.js";
+import {ImageRGBADataLoader} from "../../../asset/loaders/image/ImageRGBADataLoader.js";
+import {System} from "../../../ecs/System.js";
+import {Transform} from "../../../ecs/transform/Transform.js";
+import {RenderPassType} from "../../render/RenderPassType.js";
+import {StandardFrameBuffers} from "../../StandardFrameBuffers.js";
+import {ParticleEmitter} from "../particular/engine/emitter/ParticleEmitter.js";
+import {ParticleEmitterFlag} from "../particular/engine/emitter/ParticleEmitterFlag.js";
+import {ParticularEngine} from "../particular/engine/ParticularEngine.js";
 
 /**
  *
@@ -19,6 +22,7 @@ function extractRenderable(emitter) {
     return emitter.mesh;
 }
 
+const scratch_array = [];
 
 export class ParticleEmitterSystem extends System {
     /**
@@ -63,19 +67,9 @@ export class ParticleEmitterSystem extends System {
          */
         this.renderLayer = null;
 
-        /**
-         *
-         * @type {BinaryNode}
-         */
-        this.bvh = null;
-
         this.__handlers = [];
     }
 
-    get componentClass() {
-        return ParticleEmitter;
-    }
-
     async startup(entityManager, readyCallback, errorCallback) {
         const am = this.assetManager;
 
@@ -95,7 +89,32 @@ export class ParticleEmitterSystem extends System {
 
         renderLayer.renderPass = RenderPassType.Transparent;
 
-        renderLayer.extractRenderable = extractRenderable;
+        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.particleEngine.bvh, view_frustum);
+
+            for (let i = 0; i < hit_count; i++) {
+                const id = scratch_array[i];
+
+                /**
+                 * @type {ParticleEmitter}
+                 */
+                const emitter = ecd.getComponent(id, ParticleEmitter);
+
+                destination[destination_offset + i] = emitter.mesh;
+            }
+
+            return hit_count;
+        };
+
         renderLayer.visibleSet.onAdded.add((points) => {
             /**
              *
@@ -121,9 +140,6 @@ export class ParticleEmitterSystem extends System {
             // console.log('Removed', emitter, renderLayer.visibleSet.version);
         });
 
-        this.bvh = renderLayer.bvh;
-        this.bvh.insertNode(this.particleEngine.bvh);
-
 
         const depthBuffer = graphicsEngine.frameBuffers.getById(StandardFrameBuffers.ColorAndDepth);
 
@@ -236,6 +252,8 @@ export class ParticleEmitterSystem extends System {
         //initialize emitter as suspended to prevent needless updates
         emitter.setFlag(ParticleEmitterFlag.Sleeping);
 
+        emitter.id = entity;
+
         // emitter.bvhLeaf.entity = entity; //this line makes emitter selectable via bounding box in editor
 
         this.particleEngine.add(emitter);

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

@@ -1,4 +1,6 @@
-import {BinaryNode} from "../../../../../core/bvh2/BinaryNode.js";
+import {
+    ExplicitBinaryBoundingVolumeHierarchy
+} from "../../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
 import List from "../../../../../core/collection/list/List.js";
 import {ParticleEmitterFlag} from "./emitter/ParticleEmitterFlag.js";
 import {ShaderManager} from "./shader/ShaderManager.js";
@@ -21,7 +23,11 @@ export class ParticularEngine {
      */
     emitters = new List();
 
-    bvh = new BinaryNode();
+    /**
+     * @readonly
+     * @type {ExplicitBinaryBoundingVolumeHierarchy}
+     */
+    bvh = new ExplicitBinaryBoundingVolumeHierarchy();
 
 
     /**
@@ -43,8 +49,6 @@ export class ParticularEngine {
      */
     constructor(assetManager, material_manager) {
         this.shaderManager = new ShaderManager(assetManager, material_manager);
-
-        this.bvh.setNegativelyInfiniteBounds();
     }
 
     /**
@@ -63,7 +67,7 @@ export class ParticularEngine {
 
         this.shaderManager.register(emitter);
 
-        this.bvh.insertNode(emitter.bvhLeaf);
+        emitter.bvh_leaf.link(this.bvh, emitter.id);
     }
 
     /**
@@ -81,7 +85,7 @@ export class ParticularEngine {
 
         this.shaderManager.deregister(emitter);
 
-        emitter.bvhLeaf.disconnect();
+        emitter.bvh_leaf.unlink();
 
         return true;
     }

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

@@ -1,20 +1,23 @@
-import Vector3 from "../../../../../../core/geom/Vector3.js";
+import {Box3, BufferGeometry, Frustum, Points, PointsMaterial} from 'three';
+import {assert} from "../../../../../../core/assert.js";
+import {EBBVHLeafProxy} from "../../../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
+import {computeHashIntegerArray} from "../../../../../../core/collection/array/computeHashIntegerArray.js";
 import List from "../../../../../../core/collection/list/List.js";
-import { lerp } from "../../../../../../core/math/lerp.js";
-import { max2 } from "../../../../../../core/math/max2.js";
-import { min2 } from "../../../../../../core/math/min2.js";
-import { Box3, BufferGeometry, Frustum, Points, PointsMaterial } from 'three';
-import { ParticlePool } from "./ParticlePool.js";
-import { ParticleParameter } from "../parameter/ParticleParameter.js";
-import { ParameterSet } from "../parameter/ParameterSet.js";
-import { assert } from "../../../../../../core/assert.js";
-import { LeafNode } from "../../../../../../core/bvh2/LeafNode.js";
-import { ParticleLayer } from "./ParticleLayer.js";
-import { ParticleParameters } from "./ParticleParameters.js";
-import { BlendingType } from "../../../../texture/sampler/BlendingType.js";
+import {AABB3} from "../../../../../../core/geom/3d/aabb/AABB3.js";
+import {aabb3_array_combine} from "../../../../../../core/geom/3d/aabb/aabb3_array_combine.js";
+import {compose_matrix4_array} from "../../../../../../core/geom/3d/compose_matrix4_array.js";
 import Quaternion from "../../../../../../core/geom/Quaternion.js";
-import { ParticleEmitterFlag } from "./ParticleEmitterFlag.js";
-import { AABB3 } from "../../../../../../core/geom/3d/aabb/AABB3.js";
+import {v3_dot_array_array} from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
+import Vector3 from "../../../../../../core/geom/Vector3.js";
+import {lerp} from "../../../../../../core/math/lerp.js";
+import {max2} from "../../../../../../core/math/max2.js";
+import {min2} from "../../../../../../core/math/min2.js";
+import {frustum_from_camera} from "../../../../ecs/camera/frustum_from_camera.js";
+import {BlendingType} from "../../../../texture/sampler/BlendingType.js";
+import {ParameterSet} from "../parameter/ParameterSet.js";
+import {ParticleParameter} from "../parameter/ParticleParameter.js";
+import {update_parameters} from "../simulator/update_parameters.js";
+import {computeEmissionFunction} from "./computeEmissionFunction.js";
 import {
     PARTICLE_ATTRIBUTE_AGE,
     PARTICLE_ATTRIBUTE_BLEND,
@@ -28,13 +31,11 @@ import {
     PARTICLE_ATTRIBUTE_UV,
     PARTICLE_ATTRIBUTE_VELOCITY
 } from "./PARTICLE_ATTRIBUTES.js";
-import { update_parameters } from "../simulator/update_parameters.js";
-import { computeEmissionFunction } from "./computeEmissionFunction.js";
-import { PARTICULAR_PARTICLE_SPECIFICATION } from "./PARTICULAR_PARTICLE_SPECIFICATION.js";
-import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
-import { frustum_from_camera } from "../../../../ecs/camera/frustum_from_camera.js";
-import { v3_dot_array_array } from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
-import { compose_matrix4_array } from "../../../../../../core/geom/3d/compose_matrix4_array.js";
+import {ParticleEmitterFlag} from "./ParticleEmitterFlag.js";
+import {ParticleLayer} from "./ParticleLayer.js";
+import {ParticleParameters} from "./ParticleParameters.js";
+import {ParticlePool} from "./ParticlePool.js";
+import {PARTICULAR_PARTICLE_SPECIFICATION} from "./PARTICULAR_PARTICLE_SPECIFICATION.js";
 
 const EMPTY_GEOMETRY = new BufferGeometry();
 
@@ -111,7 +112,13 @@ function write_particle_patch_uv(patch, particles, ref) {
     );
 }
 
+let id_counter = 0;
+
 export class ParticleEmitter {
+    /**
+     * @type {number}
+     */
+    id = id_counter++;
 
     /**
      * @private
@@ -160,13 +167,14 @@ export class ParticleEmitter {
     mesh = null;
 
     /**
-     *
-     * @type {LeafNode}
+     * @readonly
+     * @type {EBBVHLeafProxy}
      */
-    bvhLeaf = new LeafNode(this, 0, 0, 0, 0, 0, 0);
+    bvh_leaf = new EBBVHLeafProxy();
+
 
     /**
-     *
+     * Upper-bound of bounds for an individual particle
      * @type {AABB3}
      */
     particleBounds = new AABB3(Infinity, Infinity, Infinity, -Infinity, -Infinity, -Infinity);
@@ -542,21 +550,9 @@ export class ParticleEmitter {
         const ebb = this.emissionBounds;
         const pbb = this.particleBounds;
 
-        const bounds_x0 = min2(ebb.x0, pbb.x0);
-        const bounds_y0 = min2(ebb.y0, pbb.y0);
-        const bounds_z0 = min2(ebb.z0, pbb.z0);
-
-        const bounds_x1 = max2(ebb.x1, pbb.x1);
-        const bounds_y1 = max2(ebb.y1, pbb.y1);
-        const bounds_z1 = max2(ebb.z1, pbb.z1);
+        aabb3_array_combine(this.bvh_leaf.bounds, ebb, pbb);
 
-        const bvhLeaf = this.bvhLeaf;
-
-        bvhLeaf.setBounds(bounds_x0, bounds_y0, bounds_z0, bounds_x1, bounds_y1, bounds_z1);
-
-        if (bvhLeaf.parentNode !== null) {
-            bvhLeaf.parentNode.bubbleRefit();
-        }
+        this.bvh_leaf.write_bounds();
 
     }
 
@@ -1221,7 +1217,7 @@ ParticleEmitter.SERIALIZABLE_FLAGS = SERIALIZABLE_FLAGS;
 
 const matrix4 = new Float32Array(16);
 
-const defaultPointsMaterial = new PointsMaterial({ color: 0xFFFFFF });
+const defaultPointsMaterial = new PointsMaterial({color: 0xFFFFFF});
 
 const frustum = new Frustum();