@woosh/meep-engine 2.66.0 → 2.67.0

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.66.0",
+  "version": "2.67.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/graphics/GraphicsEngine.js

@@ -13,30 +13,28 @@ import {
     VSMShadowMap,
     WebGLRenderer
 } from "three";
-import {assert} from "../../core/assert.js";
-
-import {BinaryNode} from "../../core/bvh2/BinaryNode.js";
+import { assert } from "../../core/assert.js";
 
 import Signal from "../../core/events/signal/Signal.js";
 import Vector1 from "../../core/geom/Vector1.js";
-import {max2} from "../../core/math/max2.js";
+import { max2 } from "../../core/math/max2.js";
 import EmptyView from "../../view/elements/EmptyView.js";
-import {globalMetrics} from "../metrics/GlobalMetrics.js";
-import {MetricsCategory} from "../metrics/MetricsCategory.js";
-import {CompositingStages} from "./composit/CompositingStages.js";
+import { globalMetrics } from "../metrics/GlobalMetrics.js";
+import { MetricsCategory } from "../metrics/MetricsCategory.js";
+import { CompositingStages } from "./composit/CompositingStages.js";
 
 import LayerCompositer from "./composit/LayerCompositer.js";
-import {Camera} from "./ecs/camera/Camera.js";
-import {MaterialManager} from "./material/manager/MaterialManager.js";
-import {ColorAndDepthFrameBuffer} from "./render/buffer/buffers/ColorAndDepthFrameBuffer.js";
-import {NormalFrameBuffer} from "./render/buffer/buffers/NormalFrameBuffer.js";
-import {FrameBufferManager} from "./render/buffer/FrameBufferManager.js";
-import {RenderLayerManager} from "./render/layers/RenderLayerManager.js";
-import {RenderPassType} from "./render/RenderPassType.js";
-import {renderTextureToScreenQuad} from "./render/utils/renderTextureToScreenQuad.js";
-import {CameraViewManager} from "./render/view/CameraViewManager.js";
-import {ShadowMapRenderer} from "./shadows/ShadowMapRenderer.js";
-import {StandardFrameBuffers} from "./StandardFrameBuffers.js";
+import { Camera } from "./ecs/camera/Camera.js";
+import { MaterialManager } from "./material/manager/MaterialManager.js";
+import { ColorAndDepthFrameBuffer } from "./render/buffer/buffers/ColorAndDepthFrameBuffer.js";
+import { NormalFrameBuffer } from "./render/buffer/buffers/NormalFrameBuffer.js";
+import { FrameBufferManager } from "./render/buffer/FrameBufferManager.js";
+import { RenderLayerManager } from "./render/layers/RenderLayerManager.js";
+import { RenderPassType } from "./render/RenderPassType.js";
+import { renderTextureToScreenQuad } from "./render/utils/renderTextureToScreenQuad.js";
+import { CameraViewManager } from "./render/view/CameraViewManager.js";
+import { ShadowMapRenderer } from "./shadows/ShadowMapRenderer.js";
+import { StandardFrameBuffers } from "./StandardFrameBuffers.js";
 
 /**
  *
@@ -120,13 +118,6 @@ export class GraphicsEngine {
          */
         this.layers = new RenderLayerManager();
 
-        /**
-         *
-         * @type {BinaryNode}
-         */
-        this.bvh = new BinaryNode();
-        this.bvh.setNegativelyInfiniteBounds();
-
         //renderer setup
         const scene = new ThreeScene();
         //prevent automatic updates to all descendants of the scene, such updates are very wasteful

package/src/engine/graphics/camera/testClippingPlaneComputation.js

@@ -265,11 +265,11 @@ function makeCameraClippingDebug(engine) {
         drawConvexHull(vertices_up, 'rgb(255,111,0,0.1)', 'rgb(255,111,0,0.8)');
     }
 
-    function drawBVH() {
-        engine.graphics.layers.traverse(layer => {
-            layer.bvh.traverseLeavesPreOrderUsingStack(drawAABB);
-        });
-    }
+    // function drawBVH() {
+    //     engine.graphics.layers.traverse(layer => {
+    //         layer.bvh.traverseLeavesPreOrderUsingStack(drawAABB);
+    //     });
+    // }
 
     const special_hits_0 = [];
     const special_hits_1 = [];

package/src/engine/graphics/ecs/compileAllMaterials.js

@@ -1,8 +1,8 @@
 import { Mesh, PlaneBufferGeometry } from "three";
-import Task from "../../../core/process/task/Task.js";
-import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
 import { collectIteratorValueToArray } from "../../../core/collection/collectIteratorValueToArray.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
+import Task from "../../../core/process/task/Task.js";
+import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
 
 /**
  * Compile all materials found in the dataset
@@ -61,19 +61,12 @@ export function compileAllMaterials({ graphics, timeout = 0, includeHiddenLayers
                     return;
                 }
 
-                /**
-                 *
-                 * @param {LeafNode} node
-                 */
-                function visitLeaf(node) {
-                    const object3D = renderLayer.extractRenderable(node.object);
-
-                    extractMaterialFromObject(object3D);
-                }
 
                 const n0 = materials.size;
 
-                renderLayer.bvh.traverseLeavesPreOrderUsingStack(visitLeaf);
+                // TODO extract materials
+
+                console.warn('No-op');
 
                 const n1 = materials.size;
 

package/src/engine/graphics/ecs/mesh-v2/sample/prototypeShadedGeometry.js

@@ -1,31 +1,29 @@
-import {BoxBufferGeometry, MeshStandardMaterial, OctahedronGeometry} from "three";
-import {OrbitingBehavior} from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
-import {downloadAsFile} from "../../../../../core/binary/downloadAsFile.js";
-import {convert_bvh_to_dot_format_string} from "../../../../../core/bvh2/visual/convert_bvh_to_dot_format_string.js";
-import {Color} from "../../../../../core/color/Color.js";
+import { BoxBufferGeometry, MeshStandardMaterial, OctahedronGeometry } from "three";
+import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
+import { Color } from "../../../../../core/color/Color.js";
 import Quaternion from "../../../../../core/geom/Quaternion.js";
 import Vector2 from "../../../../../core/geom/Vector2.js";
 import Vector3 from "../../../../../core/geom/Vector3.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 { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
+import { randomFromArray } from "../../../../../core/math/random/randomFromArray.js";
+import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
 import ButtonView from "../../../../../view/elements/button/ButtonView.js";
 import Entity from "../../../../ecs/Entity.js";
 import GUIElement from "../../../../ecs/gui/GUIElement.js";
 import GUIElementSystem from "../../../../ecs/gui/GUIElementSystem.js";
 import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import {Transform} from "../../../../ecs/transform/Transform.js";
-import {EngineHarness} from "../../../../EngineHarness.js";
-import {SequenceBehavior} from "../../../../intelligence/behavior/composite/SequenceBehavior.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 {DelayBehavior} from "../../../../intelligence/behavior/util/DelayBehavior.js";
-import {ShadedGeometry} from "../ShadedGeometry.js";
-import {ShadedGeometryFlags} from "../ShadedGeometryFlags.js";
-import {ShadedGeometrySystem} from "../ShadedGeometrySystem.js";
+import { Transform } from "../../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../../EngineHarness.js";
+import { SequenceBehavior } from "../../../../intelligence/behavior/composite/SequenceBehavior.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 { DelayBehavior } from "../../../../intelligence/behavior/util/DelayBehavior.js";
+import { ShadedGeometry } from "../ShadedGeometry.js";
+import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
+import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
 
 const eh = new EngineHarness();
 
@@ -150,11 +148,11 @@ async function main(engine) {
 
     // makeMovingShadedGeometry().build(ecd);
 
-    debug_button(engine, () => {
-        const dot = convert_bvh_to_dot_format_string(engine.graphics.layers.getLayerByName('shaded-geometry').bvh);
-        downloadAsFile(dot, 'bvh.dot', 'text');
-
-    }, 'save dot file');
+    // debug_button(engine, () => {
+    //     const dot = convert_bvh_to_dot_format_string(engine.graphics.layers.getLayerByName('shaded-geometry').bvh);
+    //     downloadAsFile(dot, 'bvh.dot', 'text');
+    //
+    // }, 'save dot file');
 
 }
 

package/src/engine/graphics/ecs/mesh-v2/sample/prototype_sg_raycast.js

@@ -1,8 +1,3 @@
-import { EngineHarness } from "../../../../EngineHarness.js";
-import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
-import Entity from "../../../../ecs/Entity.js";
-import { Transform } from "../../../../ecs/transform/Transform.js";
-import { ShadedGeometry } from "../ShadedGeometry.js";
 import {
     BoxBufferGeometry,
     MeshBasicMaterial,
@@ -10,29 +5,32 @@ import {
     OctahedronGeometry,
     SphereBufferGeometry
 } from "three";
+import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
+import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
+import Quaternion from "../../../../../core/geom/Quaternion.js";
+import Vector2 from "../../../../../core/geom/Vector2.js";
+import Vector3 from "../../../../../core/geom/Vector3.js";
 import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
+import { randomFromArray } from "../../../../../core/math/random/randomFromArray.js";
+import { randomIntegerBetween } from "../../../../../core/math/random/randomIntegerBetween.js";
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
-import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
-import GUIElement from "../../../../ecs/gui/GUIElement.js";
 import ButtonView from "../../../../../view/elements/button/ButtonView.js";
-import { convert_bvh_to_dot_format_string } from "../../../../../core/bvh2/visual/convert_bvh_to_dot_format_string.js";
-import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
+import Entity from "../../../../ecs/Entity.js";
+import GUIElement from "../../../../ecs/gui/GUIElement.js";
 import GUIElementSystem from "../../../../ecs/gui/GUIElementSystem.js";
-import Vector3 from "../../../../../core/geom/Vector3.js";
-import Quaternion from "../../../../../core/geom/Quaternion.js";
-import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
-import { randomFromArray } from "../../../../../core/math/random/randomFromArray.js";
+import ViewportPosition from "../../../../ecs/gui/position/ViewportPosition.js";
+import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
+import { Transform } from "../../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../../EngineHarness.js";
 import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
-import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
 import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
 import {
     MicronShadedGeometryRenderAdapter
 } from "../../../micron/plugin/shaded_geometry/MicronShadedGeometryRenderAdapter.js";
 import { MicronRenderContext } from "../../../micron/render/v1/MicronRenderContext.js";
-import { randomIntegerBetween } from "../../../../../core/math/random/randomIntegerBetween.js";
-import Vector2 from "../../../../../core/geom/Vector2.js";
-import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
-import {downloadAsFile} from "../../../../../core/binary/downloadAsFile.js";
+import { ShadedGeometry } from "../ShadedGeometry.js";
+import { ShadedGeometryFlags } from "../ShadedGeometryFlags.js";
+import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
 
 const eh = new EngineHarness();
 
@@ -134,11 +132,11 @@ async function main(engine) {
 
     // makeMovingShadedGeometry().build(ecd);
 
-    debug_button(engine, () => {
-        const dot = convert_bvh_to_dot_format_string(engine.graphics.layers.getLayerByName('shaded-geometry').bvh);
-        downloadAsFile(dot, 'bvh.dot', 'text');
-
-    }, 'save dot file');
+    // debug_button(engine, () => {
+    //     const dot = convert_bvh_to_dot_format_string(engine.graphics.layers.getLayerByName('shaded-geometry').bvh);
+    //     downloadAsFile(dot, 'bvh.dot', 'text');
+    //
+    // }, 'save dot file');
 
     const raycast_marker = new Entity()
         .add(ShadedGeometry.from(new SphereBufferGeometry(1), new MeshBasicMaterial({

package/src/engine/graphics/render/layers/RenderLayer.d.ts

@@ -1,13 +1,8 @@
 import {Object3D} from "three";
-import {BinaryNode} from "../../../../core/bvh2/BinaryNode";
 import {IncrementalDeltaSet} from "../visibility/IncrementalDeltaSet";
 import {RenderLayerState} from "./RenderLayerState";
 
 export class RenderLayer {
-    /**
-     * @deprecated
-     */
-    bvh: BinaryNode
     name: string
     state: RenderLayerState
 

package/src/engine/graphics/render/layers/RenderLayer.js

@@ -3,61 +3,45 @@
  */
 
 
-import { BinaryNode } from '../../../../core/bvh2/BinaryNode.js';
 import { passThrough } from "../../../../core/function/Functions.js";
 import { compare_three_objects } from "../../three/compare_three_objects.js";
 import { IncrementalDeltaSet } from "../visibility/IncrementalDeltaSet.js";
 import { RenderLayerState } from "./RenderLayerState.js";
 
-
-/**
- *
- * @type {*[]}
- */
-const scratch_array = [];
-
 export class RenderLayer {
-    constructor() {
-        /**
-         * @deprecated
-         * @type {BinaryNode}
-         */
-        this.bvh = new BinaryNode();
-        this.bvh.setNegativelyInfiniteBounds();
 
-        /**
-         *
-         * @type {RenderLayerState}
-         */
-        this.state = new RenderLayerState();
+    /**
+     *
+     * @type {RenderLayerState}
+     */
+    state = new RenderLayerState();
 
-        /**
-         *
-         * @type {String|null}
-         */
-        this.name = null;
+    /**
+     *
+     * @type {String|null}
+     */
+    name = null;
 
-        /**
-         * Layer is managed externally, visibility will not be updated in the rendering engine
-         * @deprecated
-         * @type {boolean}
-         */
-        this.managed = false;
+    /**
+     * Layer is managed externally, visibility will not be updated in the rendering engine
+     * @deprecated
+     * @type {boolean}
+     */
+    managed = false;
 
-        /**
-         *
-         * @type {function(*): Object3D}
-         */
-        this.extractRenderable = passThrough;
+    /**
+     *
+     * @type {function(*): Object3D}
+     */
+    extractRenderable = passThrough;
 
-        /**
-         * @deprecated use CameraView's visible set instead
-         * Contains visible elements across all views, if element is in at least one view - it will be here
-         * @deprecated
-         * @type {IncrementalDeltaSet<THREE.Object3D>}
-         */
-        this.visibleSet = new IncrementalDeltaSet(compare_three_objects);
-    }
+    /**
+     * @deprecated use CameraView's visible set instead
+     * Contains visible elements across all views, if element is in at least one view - it will be here
+     * @deprecated
+     * @type {IncrementalDeltaSet<THREE.Object3D>}
+     */
+    visibleSet = new IncrementalDeltaSet(compare_three_objects);
 
     /**
      * @deprecated
@@ -90,7 +74,7 @@ export class RenderLayer {
     }
 
     /**
-     @deprecated
+     * @deprecated
      * @param {THREE.Object3D[]} destination
      * @param {number} destination_offset
      * @param {CameraView} view