@woosh/meep-engine 2.65.0 → 2.67.0

package/src/engine/graphics/ecs/camera/CameraSystem.js

@@ -3,20 +3,20 @@
  */
 
 
-import { System } from '../../../ecs/System.js';
-import { Camera } from './Camera.js';
-import { Transform } from '../../../ecs/transform/Transform.js';
 import { Frustum as ThreeFrustum, } from 'three';
 import { assert } from "../../../../core/assert.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
-import { set_camera_aspect_ratio } from "./set_camera_aspect_ratio.js";
-import { build_three_camera_object } from "./build_three_camera_object.js";
-import { update_camera_transform } from "./update_camera_transform.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { System } from '../../../ecs/System.js';
+import { Transform } from '../../../ecs/transform/Transform.js';
 import { auto_set_camera_clipping_planes } from "./auto_set_camera_clipping_planes.js";
+import { build_three_camera_object } from "./build_three_camera_object.js";
+import { Camera } from './Camera.js';
 import { frustum_from_camera } from "./frustum_from_camera.js";
 import { invertQuaternionOrientation } from "./InvertQuaternionOrientation.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { set_camera_aspect_ratio } from "./set_camera_aspect_ratio.js";
+import { update_camera_transform } from "./update_camera_transform.js";
 
 export class CameraSystem extends System {
     /**
@@ -32,7 +32,7 @@ export class CameraSystem extends System {
         this.dependencies = [Camera, Transform];
 
         this.components_used = [
-            ResourceAccessSpecification.from(Camera,ResourceAccessKind.Write)
+            ResourceAccessSpecification.from(Camera, ResourceAccessKind.Write)
         ];
 
         /**

package/src/engine/graphics/ecs/camera/auto_set_camera_clipping_planes.js

@@ -1,32 +1,12 @@
-import { CameraClippingPlaneComputer } from "./CameraClippingPlaneComputer.js";
-
-const cameraClippingPlaneComputer = new CameraClippingPlaneComputer();
-
 /**
  *
  * @param {Camera} c
  * @param {RenderLayerManager} layers
  */
 export function auto_set_camera_clipping_planes(c, layers) {
-    const camera = c.object;
-
-    /**
-     *
-     * @type {number}
-     */
-    const hysteresis = c.autoClipHysteresis;
-
-    cameraClippingPlaneComputer.hysteresis = hysteresis;
-    cameraClippingPlaneComputer.camera = camera;
-    cameraClippingPlaneComputer.layers = layers;
-
-    cameraClippingPlaneComputer.compute();
-
-    if (camera.near !== cameraClippingPlaneComputer.near || camera.far !== cameraClippingPlaneComputer.far) {
-        camera.near = cameraClippingPlaneComputer.near;
-        camera.far = cameraClippingPlaneComputer.far;
+    // TODO implement
 
-        camera.updateProjectionMatrix();
-    }
+    c.object.far = c.clip_far;
+    c.object.near = c.clip_near;
 
 }

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/light/LightSystem.js

@@ -3,23 +3,22 @@
  */
 
 
+import { assert } from "../../../../core/assert.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
+import { AbstractContextSystem } from "../../../ecs/system/AbstractContextSystem.js";
 import { Transform } from '../../../ecs/transform/Transform.js';
-import { Light } from './Light.js';
+import { ForwardPlusRenderingPlugin } from "../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
 import { Camera } from '../camera/Camera.js';
 
 import FrustumProjector from '../camera/FrustumProjector.js';
-import { LightType } from "./LightType.js";
-import { CameraClippingPlaneComputer } from "../camera/CameraClippingPlaneComputer.js";
-import { assert } from "../../../../core/assert.js";
-import { ForwardPlusRenderingPlugin } from "../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
-import { ThreeLightCache } from "./three/ThreeLightCache.js";
-import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
-import { ShadowManager } from "./shadow/ShadowManager.js";
-import { AbstractContextSystem } from "../../../ecs/system/AbstractContextSystem.js";
+import { Light } from './Light.js';
 import { LightContext } from "./LightContext.js";
+import { LightType } from "./LightType.js";
 import { setShadowCameraDimensionsDiscrete } from "./shadow/setShadowCameraDimensionsDiscrete.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ShadowManager } from "./shadow/ShadowManager.js";
+import { ThreeLightCache } from "./three/ThreeLightCache.js";
 
 class LightSystem extends AbstractContextSystem {
     /**
@@ -265,8 +264,6 @@ class LightSystem extends AbstractContextSystem {
     }
 }
 
-const cameraClippingPlaneComputer = new CameraClippingPlaneComputer();
-
 const scratch_aabb3 = new AABB3();
 
 /**
@@ -278,10 +275,6 @@ const scratch_aabb3 = new AABB3();
  */
 function updateShadowMap(camera, light, graphics) {
 
-    /**
-     * @type {RenderLayerManager}
-     */
-    const layers = graphics.layers;
 
     // Fit shadow camera's ortho frustum to camera frustum
     const shadow = light.shadow;
@@ -310,43 +303,14 @@ function updateShadowMap(camera, light, graphics) {
 
     // collect all visible objects
 
-    cameraClippingPlaneComputer.hysteresis = 0.33;
-
-    cameraClippingPlaneComputer.camera = shadowCamera;
-    cameraClippingPlaneComputer.layers = layers;
-
-    cameraClippingPlaneComputer.compute();
-
-    shadowCamera.near = cameraClippingPlaneComputer.near;
-    shadowCamera.far = cameraClippingPlaneComputer.far;
+    shadowCamera.near = 0.1;
+    shadowCamera.far = 100;
 
     shadowCamera.updateProjectionMatrix();
 
     // small bias to prevent shadow acne
     shadow.bias = -0.0001;
 
-    //
-    // const frustum = new Frustum();
-    // frustumFromCamera(shadowCamera, frustum);
-    // visitor.setFrustums([frustum]);
-    // visitor.collector = collector;
-    //
-    // shadow_scene.children = [];
-    //
-    // const layers_list = layers.layers;
-    // const layer_count = layers_list.length;
-    //
-    // for (let i = 0; i < layer_count; i++) {
-    //     const renderLayer = layers_list.get(i);
-    //
-    //     collector.callbackContext = shadow_scene.children;
-    //     collector.callback = Array.prototype.push;
-    //     collector.reader = renderLayer.extractRenderable;
-    //
-    //     traverseBinaryNodeUsingVisitor(renderLayer.bvh, visitor);
-    // }
-    //
-    // graphics.shadowmap_renderer.update(graphics.renderer, light.shadow, shadow_scene, camera, light);
 }
 
 export default LightSystem;

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

@@ -6,9 +6,6 @@
 import { BoxBufferGeometry, MeshLambertMaterial } from "three";
 import { assert } from "../../../../core/assert.js";
 import { BVH } from "../../../../core/bvh2/bvh3/BVH.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";
@@ -17,6 +14,7 @@ import { ResourceAccessSpecification } from "../../../../core/model/ResourceAcce
 import { GLTFAssetLoader } from "../../../asset/loaders/GLTFAssetLoader.js";
 import { System } from "../../../ecs/System.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
+import { make_bvh_visibility_builder } from "../../render/make_bvh_visibility_builder.js";
 
 import checkerTexture from "../../texture/CheckersTexture.js";
 
@@ -34,8 +32,6 @@ const PLACEHOLDER_TEXTURE = checkerTexture.create();
 
 const PLACEHOLDER_MATERIAL = new MeshLambertMaterial({ map: PLACEHOLDER_TEXTURE });
 
-const scratch_array = [];
-
 export class MeshSystem extends System {
     /**
      *
@@ -152,37 +148,19 @@ export class MeshSystem extends System {
         const graphics = this.graphics;
         this.renderLayer = graphics.layers.create("mesh-system");
 
-        this.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.__bvh_binary, view_frustum);
-
-            let added = 0;
-
-            for (let i = 0; i < hit_count; i++) {
-                const entity = scratch_array[i];
-
+        this.renderLayer.buildVisibleSet = make_bvh_visibility_builder(
+            this.entityManager, this.__bvh_binary,
+            (destination, offset, entity, ecd) => {
                 const component = ecd.getComponent(entity, Mesh);
 
-                const object3D = component.mesh;
-
-                if (object3D === null) {
-                    continue;
+                if (component.mesh === null) {
+                    return 0;
                 }
 
-                destination[destination_offset + added] = object3D;
-                added++;
+                destination[offset] = component.mesh;
+                return 1;
             }
-
-            return added;
-        };
+        )
 
         const visibleSet = this.renderLayer.visibleSet;
 

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

@@ -1,54 +1,14 @@
 import { aabb3_matrix4_project } from "../../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
 
-/**
- * Common buffer for scratch objects for better cache locality
- * @type {ArrayBuffer}
- */
-const scratch_buffer = new ArrayBuffer(28 * 4);
-
-/**
- *
- * @type {Float32Array}
- */
-const scratch_matrix4 = new Float32Array(scratch_buffer, 0, 16);
-
-/**
- *
- * @type {Float32Array}
- */
-const scratch_aabb_0 = new Float32Array(scratch_buffer, 64, 6);
-
-/**
- *
- * @type {Float32Array}
- */
-const scratch_aabb_1 = new Float32Array(scratch_buffer, 88, 6);
-
 /**
  *
- * @param {LeafNode} bvh
+ * @param {BvhClient} bvh
  * @param {AABB3} boundingBox
  * @param {Transform} transform
  */
 export function updateNodeByTransformAndBBB(bvh, boundingBox, transform) {
-    transform.toMatrix4(scratch_matrix4);
-
-    updateNodeByMatrix4AndBBB(bvh, boundingBox, scratch_matrix4);
-}
-
-/**
- *
- * @param {LeafNode} bvh
- * @param {AABB3} boundingBox
- * @param {ArrayLike<number>|number[]|Float32Array} matrix4
- */
-export function updateNodeByMatrix4AndBBB(bvh, boundingBox, matrix4) {
-    boundingBox.writeToArray(scratch_aabb_1, 0);
-
-    aabb3_matrix4_project(scratch_aabb_0, scratch_aabb_1, matrix4);
-
-    bvh.readFromArray(scratch_aabb_0, 0);
+    aabb3_matrix4_project(bvh.bounds, boundingBox, transform.matrix);
 
-    bvh.bubbleRefit();
+    bvh.write_bounds();
 }
 

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({