@woosh/meep-engine 2.67.0 → 2.68.0

package/build/meep.cjs

@@ -68779,7 +68779,6 @@ class ShadedGeometry {
 
     /**
      * @deprecated
-     * @returns {LeafNode<ShadedGeometry>}
      */
     get bvh() {
         throw new Error('Deprecated, use #getBoundingBox method instead');

package/build/meep.module.js

@@ -68777,7 +68777,6 @@ class ShadedGeometry {
 
     /**
      * @deprecated
-     * @returns {LeafNode<ShadedGeometry>}
      */
     get bvh() {
         throw new Error('Deprecated, use #getBoundingBox method instead');

package/package.json

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

package/src/engine/graphics/ecs/mesh/Mesh.d.ts

@@ -1,6 +1,5 @@
 import {Object3D} from "three";
 import {AABB3} from "../../../../core/geom/3d/aabb/AABB3";
-import {LeafNode} from "../../../../core/bvh2/LeafNode";
 
 export default class Mesh {
     url: string

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.d.ts

@@ -7,11 +7,6 @@ export class ShadedGeometry {
     material: Material
     readonly mode: DrawMode
 
-    /**
-     * @deprecated
-     */
-    readonly bvh: Readonly<AABB3>
-
     getBoundingBox(destination: AABB3): void
 
     from(geometry: BufferGeometry, material: Material, draw_mode?: DrawMode): void

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.js

@@ -215,7 +215,6 @@ export class ShadedGeometry {
 
     /**
      * @deprecated
-     * @returns {LeafNode<ShadedGeometry>}
      */
     get bvh() {
         throw new Error('Deprecated, use #getBoundingBox method instead');

package/src/engine/graphics/material/optimization/prototypeMaterialOptimizer.js

@@ -1,15 +1,12 @@
-import { EngineHarness } from "../../../EngineHarness.js";
-import { EngineConfiguration } from "../../../EngineConfiguration.js";
-import { ShadedGeometrySystem } from "../../ecs/mesh-v2/ShadedGeometrySystem.js";
-import { AttachmentSystem } from "../../../ecs/attachment/AttachmentSystem.js";
-import { TransformAttachmentSystem } from "../../../ecs/transform-attachment/TransformAttachmentSystem.js";
 import { GameAssetType } from "../../../asset/GameAssetType.js";
 import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
+import { AttachmentSystem } from "../../../ecs/attachment/AttachmentSystem.js";
+import { TransformAttachmentSystem } from "../../../ecs/transform-attachment/TransformAttachmentSystem.js";
+import { EngineConfiguration } from "../../../EngineConfiguration.js";
+import { EngineHarness } from "../../../EngineHarness.js";
+import { ShadedGeometrySystem } from "../../ecs/mesh-v2/ShadedGeometrySystem.js";
 import { three_object_to_entity_composition } from "../../ecs/mesh-v2/three_object_to_entity_composition.js";
 import { MaterialOptimizationContext } from "./MaterialOptimizationContext.js";
-import {
-    bvh_traverse_pre_order_using_stack
-} from "../../../../core/bvh2/traversal/bvh_traverse_pre_order_using_stack.js";
 
 const eh = new EngineHarness();
 
@@ -23,17 +20,17 @@ function optimize(engine) {
 
     const optimizer = new MaterialOptimizationContext();
 
-    engine.graphics.layers.layers.forEach(l => {
-        bvh_traverse_pre_order_using_stack(l.bvh, node => {
-            if (node.isLeafNode) {
-                const object = l.extractRenderable(node.object);
-
-                if (object) {
-                    optimizer.addObject(object);
-                }
-            }
-        });
-    });
+    // engine.graphics.layers.layers.forEach(l => {
+    //     bvh_traverse_pre_order_using_stack(l.bvh, node => {
+    //         if (node.isLeafNode) {
+    //             const object = l.extractRenderable(node.object);
+    //
+    //             if (object) {
+    //                 optimizer.addObject(object);
+    //             }
+    //         }
+    //     });
+    // });
 
     optimizer.update();
 

package/src/engine/graphics/render/forward_plus/prototype/prototypeLightManager.js

@@ -1,3 +1,5 @@
+import { mat4 } from "gl-matrix";
+import SimplexNoise from "simplex-noise";
 import {
     AmbientLight,
     BoxBufferGeometry,
@@ -16,56 +18,53 @@ import {
     Vector2,
     WebGLRenderer,
 } from "three";
-import { min2 } from "../../../../../core/math/min2.js";
-import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
-import { PointLight } from "../model/PointLight.js";
-import { makeHelperSphereGeometry } from "../../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
-import { MouseEvents } from "../../../../input/devices/events/MouseEvents.js";
-import { RingBuffer } from "../../../../../core/collection/RingBuffer.js";
-import { query_bvh_frustum_from_objects } from "../query/query_bvh_frustum_from_objects.js";
-import { FPlusDebugMaterial } from "../materials/FPlusDebugMaterial.js";
-import { parse_color } from "../../../../../core/color/parse_color.js";
-import { buildLightClusterWidget } from "../debug/buildLightClusterWidget.js";
-import domify from "../../../../../view/DOM.js";
-import { createScreenGrid } from "../debug/createScreenGrid.js";
-import { createLayerSwitcher } from "../debug/createLayerSwitcher.js";
-import { FPlusStandardMaterial } from "../materials/FPlusStandardMaterial.js";
-import { LightManager } from "../LightManager.js";
-import ButtonView from "../../../../../view/elements/button/ButtonView.js";
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
-import { traverseMaterialTextures } from "../../../../asset/loaders/material/traverseMaterialTextures.js";
-import Vector3 from "../../../../../core/geom/Vector3.js";
-import { MetricCollection } from "../../../../development/performance/MetricCollection.js";
-import { MetricStatistics } from "../../../../development/performance/MetricStatistics.js";
-import { SpotLight } from "../model/SpotLight.js";
-import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
-import Signal from "../../../../../core/events/signal/Signal.js";
-import SimplexNoise from "simplex-noise";
 import Stats from "three/examples/jsm/libs/stats.module.js";
-import { threeUpdateTransform } from "../../../util/threeUpdateTransform.js";
-import { Decal } from "../model/Decal.js";
-import { mat4 } from "gl-matrix";
-import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
+import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
+import { Float32BufferAttribute } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry } from "three/src/core/BufferGeometry.js";
+import { DEG2RAD, smoothstep } from "three/src/math/MathUtils.js";
+import '../../../../../../../../../css/game.scss'
 import { makeHelperBoxGeometry } from "../../../../../../editor/process/symbolic/makeHelperBoxGeometry.js";
+import { makeHelperSphereGeometry } from "../../../../../../editor/process/symbolic/makeHelperSphereGeometry.js";
 import { array_copy } from "../../../../../core/collection/array/array_copy.js";
-import { BufferGeometry } from "three/src/core/BufferGeometry.js";
-import { Float32BufferAttribute } from "three/src/core/BufferAttribute.js";
+import { RingBuffer } from "../../../../../core/collection/RingBuffer.js";
+import { Color } from "../../../../../core/color/Color.js";
+import { parse_color } from "../../../../../core/color/parse_color.js";
+import Signal from "../../../../../core/events/signal/Signal.js";
 import Quaternion from "../../../../../core/geom/Quaternion.js";
 import { v2_distance } from "../../../../../core/geom/Vector2.js";
-import { DEG2RAD, smoothstep } from "three/src/math/MathUtils.js";
+import Vector3 from "../../../../../core/geom/Vector3.js";
+import { Localization } from "../../../../../core/localization/Localization.js";
+import { min2 } from "../../../../../core/math/min2.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 { number_pretty_print } from "../../../../../core/primitives/numbers/number_pretty_print.js";
+import domify from "../../../../../view/DOM.js";
+import ButtonView from "../../../../../view/elements/button/ButtonView.js";
+import { GMLEngine } from "../../../../../view/tooltip/gml/GMLEngine.js";
+import { TooltipManager } from "../../../../../view/tooltip/TooltipManager.js";
 import { AssetManager } from "../../../../asset/AssetManager.js";
 import { ImageRGBADataLoader } from "../../../../asset/loaders/image/ImageRGBADataLoader.js";
-import { Color } from "../../../../../core/color/Color.js";
-import { TooltipManager } from "../../../../../view/tooltip/TooltipManager.js";
-import { GMLEngine } from "../../../../../view/tooltip/gml/GMLEngine.js";
+import { traverseMaterialTextures } from "../../../../asset/loaders/material/traverseMaterialTextures.js";
+import { MetricCollection } from "../../../../development/performance/MetricCollection.js";
+import { MetricStatistics } from "../../../../development/performance/MetricStatistics.js";
+import { MouseEvents } from "../../../../input/devices/events/MouseEvents.js";
 import { PointerDevice } from "../../../../input/devices/PointerDevice.js";
 import { StaticKnowledgeDatabase } from "../../../../knowledge/database/StaticKnowledgeDatabase.js";
-import { Localization } from "../../../../../core/localization/Localization.js";
-import '../../../../../../../../../css/game.scss'
-import { randomFromArray } from "../../../../../core/math/random/randomFromArray.js";
 import { debugAtlas } from "../../../particles/particular/engine/shader/debugAtlas.js";
-import { number_pretty_print } from "../../../../../core/primitives/numbers/number_pretty_print.js";
+import { Sampler2D } from "../../../texture/sampler/Sampler2D.js";
+import { threeUpdateTransform } from "../../../util/threeUpdateTransform.js";
+import { buildLightClusterWidget } from "../debug/buildLightClusterWidget.js";
+import { createLayerSwitcher } from "../debug/createLayerSwitcher.js";
+import { createScreenGrid } from "../debug/createScreenGrid.js";
+import { LightManager } from "../LightManager.js";
+import { FPlusDebugMaterial } from "../materials/FPlusDebugMaterial.js";
+import { FPlusStandardMaterial } from "../materials/FPlusStandardMaterial.js";
+import { Decal } from "../model/Decal.js";
+import { PointLight } from "../model/PointLight.js";
+import { SpotLight } from "../model/SpotLight.js";
 
 document.body.style.margin = 0;
 
@@ -1532,20 +1531,20 @@ function print_perf_stats() {
 setInterval(print_perf_stats, 2000);
 
 function do_sample() {
-    query_bvh_frustum_from_objects.iteration_count = 0;
-    query_bvh_frustum_from_objects.rejection_count = 0;
-    query_bvh_frustum_from_objects.rejection_sphere_count = 0;
-    query_bvh_frustum_from_objects.plane_tests = 0;
-    query_bvh_frustum_from_objects.plane_tests_early_exits = 0;
+    // query_bvh_frustum_from_objects.iteration_count = 0;
+    // query_bvh_frustum_from_objects.rejection_count = 0;
+    // query_bvh_frustum_from_objects.rejection_sphere_count = 0;
+    // query_bvh_frustum_from_objects.plane_tests = 0;
+    // query_bvh_frustum_from_objects.plane_tests_early_exits = 0;
 
     const t0 = performance.now();
     lm.buildTiles(camera);
     const t1 = performance.now();
 
     metrics.get("time").record(t1 - t0);
-    metrics.get("iterations").record(query_bvh_frustum_from_objects.iteration_count);
-    metrics.get("rejections").record(query_bvh_frustum_from_objects.rejection_count);
-    metrics.get("sphere_rejections").record(query_bvh_frustum_from_objects.rejection_sphere_count);
+    // metrics.get("iterations").record(query_bvh_frustum_from_objects.iteration_count);
+    // metrics.get("rejections").record(query_bvh_frustum_from_objects.rejection_count);
+    // metrics.get("sphere_rejections").record(query_bvh_frustum_from_objects.rejection_sphere_count);
 }
 
 function draw_camera_view_planes() {

package/src/core/bvh2/BVHTasks.js

@@ -1,65 +0,0 @@
-import { RingBuffer } from "../collection/RingBuffer.js";
-import Task from "../process/task/Task.js";
-import { TaskSignal } from "../process/task/TaskSignal.js";
-import { optimize } from "./transform/RotationOptimizer.js";
-
-
-/**
- *
- * @param {BinaryNode} bvh
- * @param {number} iterationLength
- * @returns {Task}
- */
-export function buildTreeOptimizationTask(bvh, iterationLength) {
-
-    const buffer = new RingBuffer(10);
-
-    let cycles = 0;
-    let sameChangeCountCycles = 0;
-
-    //optimize bvh
-    const task = new Task({
-        name: "Optimization of Bounding Volume Hierarchy",
-
-        initializer(task, executor) {
-            cycles = 0;
-            sameChangeCountCycles = 0;
-            buffer.clear();
-        },
-
-        cycleFunction() {
-            const optimizationsDone = optimize(bvh, iterationLength);
-            if (optimizationsDone > 0) {
-                console.log('otimization step.. changes: ', optimizationsDone);
-
-                cycles += optimizationsDone;
-                if (buffer.contains(optimizationsDone)) {
-                    sameChangeCountCycles++;
-                    if (sameChangeCountCycles > 100) {
-                        console.warn("detected optimization oscillation after 100 cycles, terminating");
-                        //stuck in oscillation, probably
-                        return TaskSignal.EndSuccess;
-                    }
-                } else {
-                    //reset counter
-                    sameChangeCountCycles = 0;
-                }
-
-                buffer.push(optimizationsDone);
-
-                return TaskSignal.Continue;
-            } else {
-                return TaskSignal.EndSuccess;
-            }
-        },
-        computeProgress: function () {
-            if (iterationLength <= 0) {
-                return 0;
-            } else {
-                return cycles / iterationLength;
-            }
-        }
-    });
-
-    return task;
-}

package/src/core/bvh2/BinaryNode.d.ts

@@ -1,13 +0,0 @@
-import {Node} from "./Node";
-import {LeafNode} from "./LeafNode";
-
-export class BinaryNode<T = any> extends Node<T> {
-    left: Node<T>
-    right: Node<T>
-
-    traversePreOrderUsingStack(visitor: (node: Node<T>) => boolean, thisArg?: any): void
-
-    insert(x0: number, y0: number, z0: number, x1: number, y1: number, z1: number, value: T): LeafNode<T>
-
-    traverseRayLeafIntersections(startX: number, startY: number, startZ: number, directionX: number, directionY: number, directionZ: number, visitor: (node: LeafNode<T>) => any, thisArg?: any);
-}