@woosh/meep-engine 2.61.0 → 2.63.0

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

package/src/engine/graphics/particles/particular/engine/utils/volume/prototypeParticleVolume.js

@@ -1,14 +1,14 @@
-import {mat4} from "gl-matrix";
-import {LineBasicMaterial} from "three";
-import {TransformControls} from "three/examples/jsm/controls/TransformControls.js";
-import {makeEngineOptionsModel} from "../../../../../../../../../model/game/options/makeEngineOptionsModel.js";
-import {enableEditor} from "../../../../../../../../editor/enableEditor.js";
-import {makeHelperBoxGeometry} from "../../../../../../../../editor/process/symbolic/makeHelperBoxGeometry.js";
-import {AABB3} from "../../../../../../../core/geom/3d/aabb/AABB3.js";
-import {TransformedShape3D} from "../../../../../../../core/geom/3d/shape/TransformedShape3D.js";
-import {UnionShape3D} from "../../../../../../../core/geom/3d/shape/UnionShape3D.js";
-import {UnitCubeShape3D} from "../../../../../../../core/geom/3d/shape/UnitCubeShape3D.js";
-import {UnitSphereShape3D} from "../../../../../../../core/geom/3d/shape/UnitSphereShape3D.js";
+import { mat4 } from "gl-matrix";
+import { LineBasicMaterial } from "three";
+import { TransformControls } from "three/examples/jsm/controls/TransformControls.js";
+import { makeEngineOptionsModel } from "../../../../../../../../../model/game/options/makeEngineOptionsModel.js";
+import { enableEditor } from "../../../../../../../../editor/enableEditor.js";
+import { makeHelperBoxGeometry } from "../../../../../../../../editor/process/symbolic/makeHelperBoxGeometry.js";
+import { AABB3 } from "../../../../../../../core/geom/3d/aabb/AABB3.js";
+import { TransformedShape3D } from "../../../../../../../core/geom/3d/shape/TransformedShape3D.js";
+import { UnionShape3D } from "../../../../../../../core/geom/3d/shape/UnionShape3D.js";
+import { UnitCubeShape3D } from "../../../../../../../core/geom/3d/shape/UnitCubeShape3D.js";
+import { UnitSphereShape3D } from "../../../../../../../core/geom/3d/shape/UnitSphereShape3D.js";
 import {
     shape_to_visual_entity,
     SHAPE_VISUAL_ENTITY_TAG
@@ -16,19 +16,18 @@ import {
 import Vector1 from "../../../../../../../core/geom/Vector1.js";
 import Vector2 from "../../../../../../../core/geom/Vector2.js";
 import Vector3 from "../../../../../../../core/geom/Vector3.js";
-import {clamp01} from "../../../../../../../core/math/clamp01.js";
-import {pingpong} from "../../../../../../../core/math/pingpong.js";
-import {randomFloatBetween} from "../../../../../../../core/math/random/randomFloatBetween.js";
-import {randomFromArray} from "../../../../../../../core/math/random/randomFromArray.js";
-import {seededRandom} from "../../../../../../../core/math/random/seededRandom.js";
-import {computeStatisticalMean} from "../../../../../../../core/math/statistics/computeStatisticalMean.js";
+import { clamp01 } from "../../../../../../../core/math/clamp01.js";
+import { pingpong } from "../../../../../../../core/math/pingpong.js";
+import { randomFloatBetween } from "../../../../../../../core/math/random/randomFloatBetween.js";
+import { randomFromArray } from "../../../../../../../core/math/random/randomFromArray.js";
+import { seededRandom } from "../../../../../../../core/math/random/seededRandom.js";
+import { computeStatisticalMean } from "../../../../../../../core/math/statistics/computeStatisticalMean.js";
 import ButtonView from "../../../../../../../view/elements/button/ButtonView.js";
-import {CanvasView} from "../../../../../../../view/elements/CanvasView.js";
+import { CanvasView } from "../../../../../../../view/elements/CanvasView.js";
 import EmptyView from "../../../../../../../view/elements/EmptyView.js";
-import {AttachmentSystem} from "../../../../../../ecs/attachment/AttachmentSystem.js";
+import { AttachmentSystem } from "../../../../../../ecs/attachment/AttachmentSystem.js";
 import Entity from "../../../../../../ecs/Entity.js";
-import {Foliage2System} from "../../../../../../ecs/foliage/ecs/Foliage2System.js";
-import {pick} from "../../../../../../ecs/grid/pick.js";
+import { pick } from "../../../../../../ecs/grid/pick.js";
 import GUIElement from "../../../../../../ecs/gui/GUIElement.js";
 import GUIElementSystem from "../../../../../../ecs/gui/GUIElementSystem.js";
 import HeadsUpDisplay from "../../../../../../ecs/gui/hud/HeadsUpDisplay.js";
@@ -41,44 +40,44 @@ import RenderSystem from "../../../../../../ecs/systems/RenderSystem.js";
 import TagSystem from "../../../../../../ecs/systems/TagSystem.js";
 import ClingToTerrainSystem from "../../../../../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../../../../../ecs/terrain/ecs/TerrainSystem.js";
-import {obtainTerrain} from "../../../../../../ecs/terrain/util/obtainTerrain.js";
-import {Transform} from "../../../../../../ecs/transform/Transform.js";
-import {EngineConfiguration} from "../../../../../../EngineConfiguration.js";
-import {EngineHarness} from "../../../../../../EngineHarness.js";
+import { obtainTerrain } from "../../../../../../ecs/terrain/util/obtainTerrain.js";
+import { Transform } from "../../../../../../ecs/transform/Transform.js";
+import { EngineConfiguration } from "../../../../../../EngineConfiguration.js";
+import { EngineHarness } from "../../../../../../EngineHarness.js";
 import InputController from "../../../../../../input/ecs/components/InputController.js";
 import InputControllerSystem from "../../../../../../input/ecs/systems/InputControllerSystem.js";
-import {InputSystem} from "../../../../../../input/ecs/systems/InputSystem.js";
-import {RepeatBehavior} from "../../../../../../intelligence/behavior/decorator/RepeatBehavior.js";
-import {BehaviorComponent} from "../../../../../../intelligence/behavior/ecs/BehaviorComponent.js";
-import {BehaviorSystem} from "../../../../../../intelligence/behavior/ecs/BehaviorSystem.js";
-import {ActionBehavior} from "../../../../../../intelligence/behavior/primitive/ActionBehavior.js";
-import {SoundEmitterSystem} from "../../../../../../sound/ecs/emitter/SoundEmitterSystem.js";
+import { InputSystem } from "../../../../../../input/ecs/systems/InputSystem.js";
+import { RepeatBehavior } from "../../../../../../intelligence/behavior/decorator/RepeatBehavior.js";
+import { BehaviorComponent } from "../../../../../../intelligence/behavior/ecs/BehaviorComponent.js";
+import { BehaviorSystem } from "../../../../../../intelligence/behavior/ecs/BehaviorSystem.js";
+import { ActionBehavior } from "../../../../../../intelligence/behavior/primitive/ActionBehavior.js";
+import { SoundEmitterSystem } from "../../../../../../sound/ecs/emitter/SoundEmitterSystem.js";
 import SoundControllerSystem from "../../../../../../sound/ecs/SoundControllerSystem.js";
 import SoundListenerSystem from "../../../../../../sound/ecs/SoundListenerSystem.js";
-import {CameraSystem} from "../../../../../ecs/camera/CameraSystem.js";
+import { CameraSystem } from "../../../../../ecs/camera/CameraSystem.js";
 import TopDownCameraController from "../../../../../ecs/camera/topdown/TopDownCameraController.js";
 import TopDownCameraControllerSystem from "../../../../../ecs/camera/topdown/TopDownCameraControllerSystem.js";
 import MeshHighlightSystem from "../../../../../ecs/highlight/system/MeshHighlightSystem.js";
 import LightSystem from "../../../../../ecs/light/LightSystem.js";
-import {DrawMode} from "../../../../../ecs/mesh-v2/DrawMode.js";
-import {ShadedGeometry} from "../../../../../ecs/mesh-v2/ShadedGeometry.js";
-import {ShadedGeometrySystem} from "../../../../../ecs/mesh-v2/ShadedGeometrySystem.js";
+import { DrawMode } from "../../../../../ecs/mesh-v2/DrawMode.js";
+import { ShadedGeometry } from "../../../../../ecs/mesh-v2/ShadedGeometry.js";
+import { ShadedGeometrySystem } from "../../../../../ecs/mesh-v2/ShadedGeometrySystem.js";
 import Mesh from "../../../../../ecs/mesh/Mesh.js";
-import {MeshSystem} from "../../../../../ecs/mesh/MeshSystem.js";
-import {PathDisplaySystem} from "../../../../../ecs/path/PathDisplaySystem.js";
+import { MeshSystem } from "../../../../../ecs/mesh/MeshSystem.js";
+import { PathDisplaySystem } from "../../../../../ecs/path/PathDisplaySystem.js";
 import Trail2DSystem from "../../../../../ecs/trail2d/Trail2DSystem.js";
-import {load_and_set_cubemap_v0} from "../../../../../load_and_set_cubemap_v0.js";
+import { load_and_set_cubemap_v0 } from "../../../../../load_and_set_cubemap_v0.js";
 import {
     AmbientOcclusionPostProcessEffect
 } from "../../../../../render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 import convertSampler2D2Canvas from "../../../../../texture/sampler/Sampler2D2Canvas.js";
-import {threeUpdateTransform} from "../../../../../util/threeUpdateTransform.js";
-import {ParticleEmitterSystem} from "../../../../ecs/ParticleEmitterSystem.js";
-import {ParameterLookupTable} from "../../parameter/ParameterLookupTable.js";
-import {RGBA_LUT_HEATMAP_IR} from "../../parameter/sample/RGBA_LUT_HEATMAP_IR.js";
-import {lut_to_sampler} from "./lut_to_sampler.js";
-import {ParticleVolume} from "./ParticleVolume.js";
-import {SamplingFunctionKind} from "./SamplingFunctionKind.js";
+import { threeUpdateTransform } from "../../../../../util/threeUpdateTransform.js";
+import { ParticleEmitterSystem } from "../../../../ecs/ParticleEmitterSystem.js";
+import { ParameterLookupTable } from "../../parameter/ParameterLookupTable.js";
+import { RGBA_LUT_HEATMAP_IR } from "../../parameter/sample/RGBA_LUT_HEATMAP_IR.js";
+import { lut_to_sampler } from "./lut_to_sampler.js";
+import { ParticleVolume } from "./ParticleVolume.js";
+import { SamplingFunctionKind } from "./SamplingFunctionKind.js";
 
 const engineHarness = new EngineHarness();
 
@@ -112,7 +111,6 @@ function makeConfig(engine) {
         new ClingToTerrainSystem(),
         new TerrainSystem(graphics, assetManager),
         new Trail2DSystem(engine),
-        new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new InputControllerSystem(devices),
         new InputSystem(devices),

package/src/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -9,22 +9,21 @@ import {
     UniformsUtils,
     WebGLRenderTarget
 } from "three";
-import {CopyShader} from "three/examples/jsm/shaders/CopyShader.js";
+import { CopyShader } from "three/examples/jsm/shaders/CopyShader.js";
 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 Vector2 from "../../../../../core/geom/Vector2.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
-import {CanvasView} from "../../../../../view/elements/CanvasView.js";
-import {AttachmentSystem} from "../../../../ecs/attachment/AttachmentSystem.js";
+import { CanvasView } from "../../../../../view/elements/CanvasView.js";
+import { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import Entity from "../../../../ecs/Entity.js";
-import {Foliage2System} from "../../../../ecs/foliage/ecs/Foliage2System.js";
-import {FogOfWarRevealerSystem} from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
-import {FogOfWarSystem} from "../../../../ecs/fow/FogOfWarSystem.js";
+import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
+import { FogOfWarSystem } from "../../../../ecs/fow/FogOfWarSystem.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 RenderSystem from "../../../../ecs/systems/RenderSystem.js";
@@ -34,34 +33,34 @@ 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 {BehaviorSystem} from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
+import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
+import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.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 AnimationControllerSystem from "../../../ecs/animation/AnimationControllerSystem.js";
-import {AnimationGraphSystem} from "../../../ecs/animation/animator/AnimationGraphSystem.js";
-import {CameraSystem} from "../../../ecs/camera/CameraSystem.js";
+import { AnimationGraphSystem } from "../../../ecs/animation/animator/AnimationGraphSystem.js";
+import { CameraSystem } from "../../../ecs/camera/CameraSystem.js";
 import TopDownCameraControllerSystem from "../../../ecs/camera/topdown/TopDownCameraControllerSystem.js";
-import {TopDownCameraLanderSystem} from "../../../ecs/camera/topdown/TopDownCameraLanderSystem.js";
+import { TopDownCameraLanderSystem } from "../../../ecs/camera/topdown/TopDownCameraLanderSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";
 import LightSystem from "../../../ecs/light/LightSystem.js";
 import Mesh from "../../../ecs/mesh/Mesh.js";
-import {MeshSystem} from "../../../ecs/mesh/MeshSystem.js";
-import {PathDisplaySystem} from "../../../ecs/path/PathDisplaySystem.js";
+import { MeshSystem } from "../../../ecs/mesh/MeshSystem.js";
+import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import WaterSystem from "../../../ecs/water/WaterSystem.js";
-import {load_and_set_cubemap_v0} from "../../../load_and_set_cubemap_v0.js";
-import {StandardFrameBuffers} from "../../../StandardFrameBuffers.js";
-import {AmbientOcclusionPostProcessEffect} from "../simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
+import { load_and_set_cubemap_v0 } from "../../../load_and_set_cubemap_v0.js";
+import { StandardFrameBuffers } from "../../../StandardFrameBuffers.js";
+import { AmbientOcclusionPostProcessEffect } from "../simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 
 const engineHarness = new EngineHarness();
 
@@ -103,7 +102,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/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -8,31 +8,30 @@ import {
     TorusKnotBufferGeometry
 } from "three";
 import FacingDirectionSystem from "../../../../../../../model/game/ecs/system/FacingDirectionSystem.js";
-import {makeEngineOptionsModel} from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
-import {OrbitingBehavior} from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
-import {enableEditor} from "../../../../../../editor/enableEditor.js";
-import {makeHelperSphereGeometry} from "../../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
-import {parse_color} from "../../../../../core/color/parse_color.js";
+import { makeEngineOptionsModel } from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
+import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
+import { enableEditor } from "../../../../../../editor/enableEditor.js";
+import { makeHelperSphereGeometry } from "../../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
+import { parse_color } from "../../../../../core/color/parse_color.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
-import {randomFloatBetween} from "../../../../../core/math/random/randomFloatBetween.js";
-import {seededRandom} from "../../../../../core/math/random/seededRandom.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 {AttachmentSystem} from "../../../../ecs/attachment/AttachmentSystem.js";
+import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
+import { seededRandom } from "../../../../../core/math/random/seededRandom.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 { AttachmentSystem } from "../../../../ecs/attachment/AttachmentSystem.js";
 import Entity from "../../../../ecs/Entity.js";
-import {Foliage2System} from "../../../../ecs/foliage/ecs/Foliage2System.js";
-import {FogOfWar} from "../../../../ecs/fow/FogOfWar.js";
-import {FogOfWarRevealer} from "../../../../ecs/fow/FogOfWarRevealer.js";
-import {FogOfWarRevealerSystem} from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
-import {FogOfWarSystem} from "../../../../ecs/fow/FogOfWarSystem.js";
+import { FogOfWar } from "../../../../ecs/fow/FogOfWar.js";
+import { FogOfWarRevealer } from "../../../../ecs/fow/FogOfWarRevealer.js";
+import { FogOfWarRevealerSystem } from "../../../../ecs/fow/FogOfWarRevealerSystem.js";
+import { FogOfWarSystem } from "../../../../ecs/fow/FogOfWarSystem.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 Renderable from "../../../../ecs/renderable/Renderable.js";
 import AnimationSystem from "../../../../ecs/systems/AnimationSystem.js";
 import MotionSystem from "../../../../ecs/systems/MotionSystem.js";
@@ -44,42 +43,42 @@ import TimerSystem from "../../../../ecs/systems/TimerSystem.js";
 import Team from "../../../../ecs/team/Team.js";
 import ClingToTerrainSystem from "../../../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../../../ecs/terrain/ecs/TerrainSystem.js";
-import {obtainTerrain} from "../../../../ecs/terrain/util/obtainTerrain.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 { obtainTerrain } from "../../../../ecs/terrain/util/obtainTerrain.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 { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
+import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
+import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.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 AnimationControllerSystem from "../../../ecs/animation/AnimationControllerSystem.js";
-import {AnimationGraphSystem} from "../../../ecs/animation/animator/AnimationGraphSystem.js";
-import {CameraSystem} from "../../../ecs/camera/CameraSystem.js";
+import { AnimationGraphSystem } from "../../../ecs/animation/animator/AnimationGraphSystem.js";
+import { CameraSystem } from "../../../ecs/camera/CameraSystem.js";
 import TopDownCameraController from "../../../ecs/camera/topdown/TopDownCameraController.js";
 import TopDownCameraControllerSystem from "../../../ecs/camera/topdown/TopDownCameraControllerSystem.js";
-import {TopDownCameraLanderSystem} from "../../../ecs/camera/topdown/TopDownCameraLanderSystem.js";
+import { TopDownCameraLanderSystem } from "../../../ecs/camera/topdown/TopDownCameraLanderSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";
-import {Light} from "../../../ecs/light/Light.js";
+import { Light } from "../../../ecs/light/Light.js";
 import LightSystem from "../../../ecs/light/LightSystem.js";
-import {LightType} from "../../../ecs/light/LightType.js";
-import {ShadedGeometrySystem} from "../../../ecs/mesh-v2/ShadedGeometrySystem.js";
+import { LightType } from "../../../ecs/light/LightType.js";
+import { ShadedGeometrySystem } from "../../../ecs/mesh-v2/ShadedGeometrySystem.js";
 import Mesh from "../../../ecs/mesh/Mesh.js";
-import {MeshSystem} from "../../../ecs/mesh/MeshSystem.js";
-import {PathDisplaySystem} from "../../../ecs/path/PathDisplaySystem.js";
+import { MeshSystem } from "../../../ecs/mesh/MeshSystem.js";
+import { PathDisplaySystem } from "../../../ecs/path/PathDisplaySystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import WaterSystem from "../../../ecs/water/WaterSystem.js";
-import {ParticleEmitterSystem} from "../../../particles/ecs/ParticleEmitterSystem.js";
-import {ParticleEmitter} from "../../../particles/particular/engine/emitter/ParticleEmitter.js";
+import { ParticleEmitterSystem } from "../../../particles/ecs/ParticleEmitterSystem.js";
+import { ParticleEmitter } from "../../../particles/particular/engine/emitter/ParticleEmitter.js";
 import ThreeFactory from "../../../three/ThreeFactory.js";
-import {AmbientOcclusionPostProcessEffect} from "../../buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
-import {ForwardPlusRenderingPlugin} from "./ForwardPlusRenderingPlugin.js";
+import { AmbientOcclusionPostProcessEffect } from "../../buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
+import { ForwardPlusRenderingPlugin } from "./ForwardPlusRenderingPlugin.js";
 
 const geo_light_center_octahedron = new BoxBufferGeometry(0.1, 0.1, 0.1);
 const engineHarness = new EngineHarness();
@@ -131,7 +130,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(),