@woosh/meep-engine 2.65.0 → 2.66.0

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/trail2d/Trail2D.js

@@ -3,13 +3,13 @@
  */
 
 
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 import Vector3 from "../../../../core/geom/Vector3.js";
 import Vector4 from "../../../../core/geom/Vector4.js";
+import ThreeFactory from "../../three/ThreeFactory.js";
+import { RibbonX } from "../../trail/x/RibbonX.js";
 import { RibbonXMaterialSpec } from "../../trail/x/RibbonXMaterialSpec.js";
-import { LeafNode } from "../../../../core/bvh2/LeafNode.js";
 import { makeGradientTrail } from "./makeGradientTrail.js";
-import { RibbonX } from "../../trail/x/RibbonX.js";
-import ThreeFactory from "../../three/ThreeFactory.js";
 
 /**
  * @readonly
@@ -21,80 +21,80 @@ export const Trail2DFlags = {
     Built: 4,
 };
 
+const DEFAULT_FLAGS = Trail2DFlags.Spawning | Trail2DFlags.Aging;
+
+const DEFAULT_MAX_AGE = 5;
+
+const DEFAULT_WIDTH = 1;
+
 class Trail2D {
-    constructor() {
-
-        /**
-         * Age at which trail segment disappears, in seconds
-         * @type {number}
-         */
-        this.maxAge = 5;
-
-        /**
-         * Trail width
-         * @type {number}
-         */
-        this.width = 1;
-
-        /**
-         * Current simulated time since trail birth
-         * @type {number}
-         */
-        this.time = 0;
-
-        /**
-         *
-         * @type {number}
-         */
-        this.trailingIndex = 0;
-
-        /**
-         * Time elapsed since last update
-         * @type {number}
-         */
-        this.timeSinceLastUpdate = 0;
-
-        /**
-         * @readonly
-         * @type {Vector4}
-         */
-        this.color = new Vector4(1, 1, 1, 1);
-
-        /**
-         * World offset
-         * @readonly
-         * @type {Vector3}
-         */
-        this.offset = new Vector3();
-
-        /**
-         * transient
-         * @type {RibbonX|null}
-         */
-        this.ribbon = null;
-
-        /**
-         * transient
-         * @type {RibbonXMaterialSpec}
-         */
-        this.material = new RibbonXMaterialSpec();
-
-        /**
-         * transient
-         * @type {LeafNode|null}
-         */
-        this.bvhLeaf = new LeafNode(
-            this,
-            0, 0, 0,
-            0, 0, 0
-        );
-
-        /**
-         * @private
-         * @type {Trail2DFlags|number}
-         */
-        this.flags = Trail2DFlags.Spawning | Trail2DFlags.Aging;
-    }
+
+    /**
+     * Age at which trail segment disappears, in seconds
+     * @type {number}
+     */
+    maxAge = DEFAULT_MAX_AGE;
+
+    /**
+     * Trail width
+     * @type {number}
+     */
+    width = DEFAULT_WIDTH;
+
+    /**
+     * Current simulated time since trail birth
+     * @type {number}
+     */
+    time = 0;
+
+    /**
+     *
+     * @type {number}
+     */
+    trailingIndex = 0;
+
+    /**
+     * Time elapsed since last update
+     * @type {number}
+     */
+    timeSinceLastUpdate = 0;
+
+    /**
+     * @readonly
+     * @type {Vector4}
+     */
+    color = new Vector4(1, 1, 1, 1);
+
+    /**
+     * World offset
+     * @readonly
+     * @type {Vector3}
+     */
+    offset = new Vector3();
+
+    /**
+     * transient
+     * @type {RibbonX|null}
+     */
+    ribbon = null;
+
+    /**
+     * transient
+     * @type {RibbonXMaterialSpec}
+     */
+    material = new RibbonXMaterialSpec();
+
+    /**
+     * @readonly
+     * @type {BvhClient}
+     */
+    bvh = new BvhClient();
+
+    /**
+     * @private
+     * @type {Trail2DFlags|number}
+     */
+    flags = DEFAULT_FLAGS;
 
     dispose() {
         if (this.ribbon !== null) {
@@ -150,36 +150,10 @@ class Trail2D {
         return (this.flags & flag) === flag;
     }
 
-    static fromJSON(json) {
-        const r = new Trail2D();
-
-        r.fromJSON(json);
-
-        return r;
-    }
-
-    fromJSON(json) {
-        if (typeof json.maxAge === "number") {
-            this.maxAge = json.maxAge;
-        }
-
-        if (typeof json.width === "number") {
-            this.width = json.width;
-        }
-
-        if (typeof json.textureURL === "string") {
-            this.textureURL = json.textureURL;
-        }
-
-        if (json.offset !== undefined) {
-            this.offset.fromJSON(json.offset);
-        }
-
-        if (json.color !== undefined) {
-            this.color.fromJSON(json.color);
-        }
-    }
-
+    /**
+     *
+     * @param {number} segment_count
+     */
     build(segment_count) {
 
         const ribbon = new RibbonX();
@@ -195,6 +169,31 @@ class Trail2D {
         this.mesh = mesh;
     }
 
+    static fromJSON(json) {
+        const r = new Trail2D();
+
+        r.fromJSON(json);
+
+        return r;
+    }
+
+    fromJSON({
+                 maxAge = DEFAULT_MAX_AGE,
+                 width = DEFAULT_WIDTH,
+                 textureURL,
+                 offset = Vector3.zero,
+                 color = { x: 1, y: 1, z: 1, w: 1 }
+             }) {
+
+        this.maxAge = maxAge;
+        this.width = width;
+        this.textureURL = textureURL;
+
+        this.offset.fromJSON(offset);
+        this.color.fromJSON(color);
+    }
+
+
     toJSON() {
         return {
             maxAge: this.maxAge,

package/src/engine/graphics/ecs/trail2d/Trail2DSystem.js

@@ -3,31 +3,66 @@
  */
 
 
+import { assert } from "../../../../core/assert.js";
+import { BVH } from "../../../../core/bvh2/bvh3/BVH.js";
+import Vector3 from '../../../../core/geom/Vector3.js';
 import { clamp } from "../../../../core/math/clamp.js";
 import { max2 } from "../../../../core/math/max2.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 Vector3 from '../../../../core/geom/Vector3.js';
-
-import Trail2D, { Trail2DFlags } from './Trail2D.js';
+import { Reference } from "../../../reference/v2/Reference.js";
 import { GraphicsEngine } from "../../GraphicsEngine.js";
-import { RibbonXFixedPhysicsSimulator } from "../../trail/x/simulator/RibbonXFixedPhysicsSimulator.js";
-import { RibbonX } from "../../trail/x/RibbonX.js";
+import { make_bvh_visibility_builder } from "../../render/make_bvh_visibility_builder.js";
 import {
     RIBBON_ATTRIBUTE_ADDRESS_AGE,
     RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET
 } from "../../trail/x/ribbon_attributes_spec.js";
-import { Reference } from "../../../reference/v2/Reference.js";
+import { RibbonX } from "../../trail/x/RibbonX.js";
 import { RibbonXPlugin } from "../../trail/x/RibbonXPlugin.js";
-import { assert } from "../../../../core/assert.js";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { RibbonXFixedPhysicsSimulator } from "../../trail/x/simulator/RibbonXFixedPhysicsSimulator.js";
+
+import Trail2D, { Trail2DFlags } from './Trail2D.js';
 
 const v3Temp1 = new Vector3();
 
 const v3_array = [];
 
 class Trail2DSystem extends System {
+    dependencies = [Trail2D, Transform];
+
+    components_used = [
+        ResourceAccessSpecification.from(Trail2D, ResourceAccessKind.Write)
+    ];
+
+    /**
+     *
+     * @type {RibbonXFixedPhysicsSimulator}
+     */
+    simulator = new RibbonXFixedPhysicsSimulator();
+
+    /**
+     *
+     * @type {Reference<RibbonXPlugin>}
+     * @private
+     */
+    __ribbon_plugin = Reference.NULL;
+
+
+    /**
+     *
+     * @type {number}
+     * @private
+     */
+    __timeDelta = 0;
+
+    /**
+     * @private
+     * @type {BVH}
+     */
+    bvh = new BVH();
+
     /**
      * @param {Engine} engine
      * @constructor
@@ -39,12 +74,6 @@ class Trail2DSystem extends System {
         assert.notNull(engine, 'engine');
         assert.equal(engine.isEngine, true, 'engine.isEngine !== true');
 
-        this.dependencies = [Trail2D, Transform];
-
-        this.components_used = [
-            ResourceAccessSpecification.from(Trail2D, ResourceAccessKind.Write)
-        ];
-
 
         /**
          *
@@ -53,13 +82,11 @@ class Trail2DSystem extends System {
          */
         this.__engine = engine;
 
-        const graphics = engine.graphics;
-
         /**
          *
          * @type {GraphicsEngine}
          */
-        this.graphics = graphics;
+        this.graphics = engine.graphics;
 
         /**
          *
@@ -67,45 +94,21 @@ class Trail2DSystem extends System {
          */
         this.renderLayer = null;
 
-        /**
-         *
-         * @type {BinaryNode}
-         */
-        this.bvh = null;
-
-        /**
-         *
-         * @type {RibbonXFixedPhysicsSimulator}
-         */
-        this.simulator = new RibbonXFixedPhysicsSimulator();
 
-        /**
-         *
-         * @type {Reference<RibbonXPlugin>}
-         * @private
-         */
-        this.__ribbon_plugin = Reference.NULL;
-
-
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__timeDelta = 0;
     }
 
     async startup(entityManager, readyCallback, errorCallback) {
         this.entityManager = entityManager;
 
         this.renderLayer = this.graphics.layers.create('trail-2d-system');
-        // this.renderLayer.renderPass = RenderPassType.Transparent;
-
-        this.renderLayer.extractRenderable = function (trail) {
-            return trail.mesh;
-        };
 
-        this.bvh = this.renderLayer.bvh;
+        this.renderLayer.buildVisibleSet = make_bvh_visibility_builder(
+            this.entityManager, this.bvh,
+            (destination, offset, entity, ecd) => {
+                destination[offset] = ecd.getComponent(entity, Trail2D).mesh
+                return 1;
+            }
+        );
 
         this.__ribbon_plugin = await this.__engine.plugins.acquire(RibbonXPlugin);
 
@@ -172,9 +175,9 @@ class Trail2DSystem extends System {
 
         }
 
-        trail.bvhLeaf.resize(
-            position_x, position_y, position_z,
-            position_x, position_y, position_z
+        trail.bvh.resize(
+            position_x,position_y,position_z,
+            position_x,position_y,position_z
         );
 
         trail.setFlag(Trail2DFlags.Built);
@@ -196,7 +199,7 @@ class Trail2DSystem extends System {
         }
 
 
-        this.bvh.insertNode(trail.bvhLeaf);
+        trail.bvh.link(this.bvh, entityId);
     }
 
     /**
@@ -207,10 +210,11 @@ class Trail2DSystem extends System {
      */
     unlink(component, transform, entity) {
 
+        component.bvh.unlink();
+
         // release resources
         component.dispose();
 
-        component.bvhLeaf.disconnect();
     }
 
     /**
@@ -265,14 +269,9 @@ class Trail2DSystem extends System {
             ribbon.setPointAttribute_Scalar(head_index, RIBBON_ATTRIBUTE_ADDRESS_AGE, ageOffset);
 
         }
-        const bvh = trail.bvhLeaf;
-
-        ribbon.computeBoundingBox(bvh);
-
-        if (bvh.parentNode !== null) {
-            bvh.parentNode.bubbleRefit();
-        }
 
+        ribbon.computeBoundingBox(trail.bvh.bounds);
+        trail.bvh.write_bounds();
 
         this.simulator.update(ribbon, trail.maxAge, timeDelta);
     }