@woosh/meep-engine 2.65.0 → 2.67.0

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

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

@@ -1,11 +1,11 @@
-import Trail2D, { Trail2DFlags } from "./Trail2D.js";
+import { assert } from "../../../../core/assert.js";
 import {
     RIBBON_ATTRIBUTE_ADDRESS_AGE,
     RIBBON_ATTRIBUTE_ADDRESS_COLOR,
     RIBBON_ATTRIBUTE_ADDRESS_THICKNESS,
     RIBBON_ATTRIBUTE_ADDRESS_UV_OFFSET
 } from "../../trail/x/ribbon_attributes_spec.js";
-import { assert } from "../../../../core/assert.js";
+import Trail2D, { Trail2DFlags } from "./Trail2D.js";
 
 /**
  *
@@ -62,7 +62,7 @@ export function makeGradientTrail({
     trail2D.clearFlag(Trail2DFlags.Spawning);
     trail2D.setFlag(Trail2DFlags.Built);
 
-    ribbon.computeBoundingBox(trail2D.bvhLeaf);
+    ribbon.computeBoundingBox(trail2D.bvh.bounds);
 
     return trail2D;
 }

package/src/engine/graphics/ecs/water/WATER_SIZE.js

@@ -0,0 +1 @@
+export const WATER_SIZE = 800;

package/src/engine/graphics/ecs/water/Water.js

@@ -3,62 +3,69 @@
  */
 
 
-import Vector1 from "../../../../core/geom/Vector1.js";
 import { ClampToEdgeWrapping, DataTexture, FloatType, LinearFilter, RedFormat } from "three";
-import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
+import { BvhClient } from "../../../../core/bvh2/bvh3/BvhClient.js";
 import { Color } from "../../../../core/color/Color.js";
+import Vector1 from "../../../../core/geom/Vector1.js";
+import { NumericInterval } from "../../../../core/math/interval/NumericInterval.js";
+import { threeUpdateTransform } from "../../util/threeUpdateTransform.js";
+import { WATER_SIZE } from "./WATER_SIZE.js";
 
 class Water {
-    constructor(options) {
-        this.level = new Vector1(0);
+    level = new Vector1(0);
+    /**
+     *
+     * @type {Color}
+     */
+    color = new Color(0, 0.3, 0.5);
 
-        if (options !== undefined) {
-            this.fromJSON(options);
-        }
 
-        /**
-         *
-         * @type {Color}
-         */
-        this.color = new Color(0, 0.3, 0.5);
+    /**
+     * Defines what is considered as shore as well as how long is the transition between shore and deep water
+     * @type {NumericInterval}
+     */
+    shoreDepthTransition = new NumericInterval(0.7, 2);
 
 
-        /**
-         * Defines what is considered as shore as well as how long is the transition between shore and deep water
-         * @type {NumericInterval}
-         */
-        this.shoreDepthTransition = new NumericInterval(0.7, 2);
+    /**
+     * Color of the water at the shore
+     * @type {Color}
+     */
+    shoreColor = new Color(0.584, 0.792, 0.850);
 
+    /**
+     *
+     * @type {Vector1}
+     */
+    waveSpeed = new Vector1(1.8);
 
-        /**
-         * Color of the water at the shore
-         * @type {Color}
-         */
-        this.shoreColor = new Color(0.584, 0.792, 0.850);
+    /**
+     *
+     * @type {Vector1}
+     */
+    waveAmplitude = new Vector1(0.3);
 
-        /**
-         *
-         * @type {Vector1}
-         */
-        this.waveSpeed = new Vector1(1.8);
+    /**
+     *
+     * @type {Vector1}
+     */
+    waveFrequency = new Vector1(1);
 
-        /**
-         *
-         * @type {Vector1}
-         */
-        this.waveAmplitude = new Vector1(0.3);
+    /**
+     * Scattering of light, the higher this value is - the more opaque water will become
+     * @type {Vector1}
+     */
+    scattering = new Vector1(1.2);
 
-        /**
-         *
-         * @type {Vector1}
-         */
-        this.waveFrequency = new Vector1(1);
+    bvh = new BvhClient();
+
+    constructor(options) {
+
+        if (options !== undefined) {
+            console.error('Constructor options are deprecated');
+            this.fromJSON(options);
+        }
 
-        /**
-         * Scattering of light, the higher this value is - the more opaque water will become
-         * @type {Vector1}
-         */
-        this.scattering = new Vector1(1.2);
 
         /**
          *
@@ -83,6 +90,41 @@ class Water {
         this.scattering.onChanged.add(this.writeShaderUniforms, this);
     }
 
+    updateTransform() {
+        const width = WATER_SIZE;
+        const height = WATER_SIZE;
+
+        const mesh = this.__threeObject;
+
+        if (mesh !== null) {
+
+            mesh.rotation.x = Math.PI * 0.5;
+            mesh.position.x = width / 4;
+            mesh.position.z = height / 4;
+            mesh.position.y = this.level.getValue();
+
+            threeUpdateTransform(mesh);
+        }
+
+        this.updateBounds();
+    }
+
+    updateBounds() {
+        const width = WATER_SIZE;
+        const height = WATER_SIZE;
+
+        const level = this.level.getValue();
+
+        this.bvh.resize(
+            -width / 4,
+            level,
+            -height / 4,
+            width * (3 / 4),
+            level,
+            height * (3 / 4)
+        );
+    }
+
     /**
      *
      * @param {Terrain} terrain