@woosh/meep-engine 2.61.0 → 2.63.0

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

@@ -4,9 +4,19 @@
 
 
 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 { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
 
 import Vector3 from "../../../../core/geom/Vector3.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { System } from "../../../ecs/System.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 
@@ -15,26 +25,16 @@ import checkerTexture from "../../texture/CheckersTexture.js";
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { assetTypeByPath } from "./assetTypeByPath.js";
 import Mesh, { MeshFlags } from "./Mesh.js";
-import { applyComponentPropertiesToThreeObject, setMesh } from "./setMesh.js";
-import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { MeshEvents } from "./MeshEvents.js";
-import { assert } from "../../../../core/assert.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.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 { setMesh } from "./setMesh.js";
 
-const placeholderGeometry = new BoxBufferGeometry(1, 1, 1);
+const PLACEHOLDER_GEOMETRY = new BoxBufferGeometry(1, 1, 1);
 
-placeholderGeometry.computeBoundingSphere();
+PLACEHOLDER_GEOMETRY.computeBoundingSphere();
 
-const placeholderTexture = checkerTexture.create();
+const PLACEHOLDER_TEXTURE = checkerTexture.create();
 
-const placeholderMaterial = new MeshLambertMaterial({ map: placeholderTexture });
+const PLACEHOLDER_MATERIAL = new MeshLambertMaterial({ map: PLACEHOLDER_TEXTURE });
 
 const scratch_array = [];
 
@@ -134,13 +134,6 @@ export class MeshSystem extends System {
 
         component.setFlag(MeshFlags.Loaded);
 
-        // override
-        if (asset.override_mesh !== undefined) {
-            component.override_mesh = asset.override_mesh.clone();
-
-            applyComponentPropertiesToThreeObject(component, component.override_mesh, entity);
-        }
-
         setMesh(dataset, entity, component, mesh);
 
 
@@ -318,8 +311,6 @@ export class MeshSystem extends System {
             bScale
         ];
 
-        apply_transform();
-
         model.__bvh_leaf.link(this.__bvh_binary, entity);
     }
 
@@ -375,38 +366,6 @@ export class MeshSystem extends System {
 
         const dataset = em.dataset;
 
-        /**
-         *
-         * @param {Asset<Object3D>} asset
-         */
-        const assetLoaded = (asset) => {
-            if (!dataset.entityExists(entity)) {
-                //entity no longer exists, probably dataset has been switched, abort
-                return;
-            }
-
-            //check that component is still actual
-            const actualComponent = dataset.getComponent(entity, Mesh);
-
-            if (actualComponent === component) {
-                // scene.remove(component.mesh);
-                this.__set_mesh_from_asset(entity, dataset, asset, component);
-
-            } else {
-                //component is no longer in the manager. do nothing.
-                //console.warn("component is no longer in the manager");
-            }
-        }
-
-
-        function assetFailure(error) {
-            console.error("failed to load model " + component.url, error);
-
-            dataset.sendEvent(entity, MeshEvents.AssetLoadFailed, {
-                reason: error
-            });
-        }
-
         if (component.hasMesh()) {
             //do not re-run if mesh is set
             setMesh(dataset, entity, component, component.mesh);
@@ -425,28 +384,59 @@ export class MeshSystem extends System {
         if (asset !== null) {
             // asset is already loaded, use it
             this.__set_mesh_from_asset(entity, dataset, asset, component);
-        } else {
+            return;
+        }
+
+        // mesh was not found, use temp mesh and submit a request
+
+        if (this.__use_placeholder_mesh) {
+            // set placeholder mesh
+            const mesh = ThreeFactory.createMesh(PLACEHOLDER_GEOMETRY, PLACEHOLDER_MATERIAL);
+
+            setMesh(dataset, entity, component, mesh);
+        }
+
+        function assetFailure(error) {
+            console.error("failed to load model " + component.url, error);
+
+            dataset.sendEvent(entity, MeshEvents.AssetLoadFailed, {
+                reason: error
+            });
+        }
 
-            // mesh was not found, use temp mesh and submit a request
+        if (assetType === null) {
+            // couldn't figure out what the asset type is
+            assetFailure("no asset type deduced");
+            return;
+        }
 
-            if (this.__use_placeholder_mesh) {
-                // set placeholder mesh
-                const mesh = ThreeFactory.createMesh(placeholderGeometry, placeholderMaterial);
 
-                setMesh(dataset, entity, component, mesh);
+        /**
+         *
+         * @param {Asset<Object3D>} asset
+         */
+        const assetLoaded = (asset) => {
+            if (!dataset.entityExists(entity)) {
+                //entity no longer exists, probably dataset has been switched, abort
+                return;
             }
 
-            if (assetType === null) {
+            //check that component is still actual
+            const actualComponent = dataset.getComponent(entity, Mesh);
 
-                assetFailure("no asset type deduced");
+            if (actualComponent === component) {
+                // scene.remove(component.mesh);
+                this.__set_mesh_from_asset(entity, dataset, asset, component);
 
             } else {
-                // load the asset
-                am.get({ path: component.url, type: assetType, callback: assetLoaded, failure: assetFailure });
+                //component is no longer in the manager. do nothing.
+                //console.warn("component is no longer in the manager");
             }
         }
 
-        dataset.getComponentAsync(entity, Transform, component.internalApplyTransform, component);
+        // load the asset
+        am.get({ path: component.url, type: assetType, callback: assetLoaded, failure: assetFailure });
+
     }
 
     update(timeDelta) {

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;
     }