@woosh/meep-engine 2.58.0 → 2.59.1

package/src/engine/ecs/binding/ComponentPropertyBinding.js

@@ -1,18 +1,18 @@
-import { resolvePath } from "../../../core/json/resolvePath.js";
+import {resolvePath} from "../../../core/json/resolvePath.js";
 
 export class ComponentPropertyBinding {
-    constructor() {
-        /**
-         * @type {ComponentPropertyPath}
-         */
-        this.path = null;
-
-        /**
-         *
-         * @type {Vector1|Vector2|Vector3|ObservedBoolean}
-         */
-        this.value = null;
-    }
+
+    /**
+     * @type {ComponentPropertyPath}
+     */
+    path = null;
+
+    /**
+     *
+     * @type {Vector1|Vector2|Vector3|ObservedBoolean}
+     */
+    value = null;
+
 
     /**
      * @template T

package/src/engine/ecs/dynamic_actions/RuleExecution.js

@@ -8,7 +8,7 @@ export class RuleExecution {
         this.rule = null;
         /**
          *
-         * @type {EntityBuilder}
+         * @type {Entity}
          */
         this.executor = null
 

package/src/engine/ecs/parent/EntityNode.js

@@ -236,7 +236,7 @@ export class EntityNode {
                 throw new Error('Parent entity is not built');
             }
 
-            const parent_entity_id = parent_entity_builder.entity;
+            const parent_entity_id = parent_entity_builder.id;
             parent_entity.entity = parent_entity_id;
 
             // add component back
@@ -361,7 +361,7 @@ export class EntityNode {
                 throw new Error('Parent entity is not built');
             }
 
-            const parent_entity_id = parent_entity_builder.entity;
+            const parent_entity_id = parent_entity_builder.id;
             parent_entity.entity = parent_entity_id;
 
             assert.ok(parent.entity.hasComponent(Transform), "parent node must have a transform but doesn't. Transform is required for attachment transform hierarchy to work correctly");

package/src/engine/ecs/parent/EntityNode.spec.js

@@ -83,7 +83,7 @@ test("build empty", () => {
 
     expect(node.isBuilt).toBe(true);
     expect(node.entity.isBuilt).toBe(true);
-    expect(dataset.entityExists(node.entity.entity)).toBe(true);
+    expect(dataset.entityExists(node.entity.id)).toBe(true);
 });
 
 test("destroy empty", () => {
@@ -93,7 +93,7 @@ test("destroy empty", () => {
 
     node.build(dataset);
 
-    const entity = node.entity.entity;
+    const entity = node.entity.id;
 
     node.destroy();
 

package/src/engine/ecs/tooltip/testTooltipComponentSystem.js

@@ -83,7 +83,7 @@ function main(engine) {
         pitch: -0.7
     });
 
-    EngineHarness.buildOrbitalCameraController({ cameraEntity: camera.entity, engine });
+    EngineHarness.buildOrbitalCameraController({ cameraEntity: camera.id, engine });
 
     const ecd = engine.entityManager.dataset;
 

package/src/engine/ecs/util/hideEntityGracefully.js

@@ -25,14 +25,14 @@ const SHUTDOWN_GRACE_PERIOD = 60;
 
 /**
  *
- * @type {Map<Class|function, function(T,entity?:EntityBuilder,createEntity?:function,createEntityContext?:*):number>}
+ * @type {Map<Class|function, function(T,entity?:Entity,createEntity?:function,createEntityContext?:*):number>}
  */
 const component_shutdown = new Map();
 
 /**
  * @template T
  * @param {Class<T>} type
- * @param {function(T,entity?:EntityBuilder,createEntity?:function,createEntityContext?:*):number} method
+ * @param {function(T,entity?:Entity,createEntity?:function,createEntityContext?:*):number} method
  */
 function addShutdown(type, method) {
     component_shutdown.set(type, method);
@@ -109,7 +109,7 @@ addShutdown(Light, (light, builder, createEntity, createEntityThisArg) => {
             path: 'intensity',
             target: [0],
             duration: delay,
-            entity: builder.entity
+            entity: builder.id
         }),
         DieBehavior.create()
     ])));
@@ -161,8 +161,8 @@ addShutdown(SoundEmitter, (soundEmitter, builder, createEntity, createEntityThis
 
 /**
  *
- * @param {EntityBuilder} builder
- * @param {function():EntityBuilder} createEntity
+ * @param {Entity} builder
+ * @param {function():Entity} createEntity
  * @param {*} [createEntityThisArg]
  * @return {number} duration in seconds until the entity is completely hidden
  */
@@ -174,7 +174,7 @@ export function hideEntityGracefully(builder, createEntity, createEntityThisArg)
 
     let delay = 0;
 
-    const components = builder.element;
+    const components = builder.components;
 
     const component_count = components.length;
 

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

@@ -39,6 +39,7 @@ const scratch_ray_0 = new Float32Array(6);
 
 /**
  * Represents a primitive 3d object, a combination of a material and geometry
+ * This is roughly equivalent to single draw call, note that his is not a hierarchical data structure, if you want that - you will need to combine multiple entities, each with a `ShadedGeometry` component
  */
 export class ShadedGeometry {
     constructor() {

package/src/engine/graphics/ecs/mesh-v2/render/SGThreeObjectCache.js

@@ -1,10 +1,17 @@
-import { build_three_object } from "../build_three_object.js";
+import {build_three_object} from "../build_three_object.js";
+import {ShadedGeometry} from "../ShadedGeometry.js";
+
+class CacheValue {
+    object = null
+    key = null
+}
+
 
 export class SGThreeObjectCache {
     constructor() {
         /**
          *
-         * @type {WeakMap<ShadedGeometry, THREE.Object3D>}
+         * @type {Map<ShadedGeometry, CacheValue>}
          * @private
          */
         this.__object_cache = new WeakMap();
@@ -17,15 +24,31 @@ export class SGThreeObjectCache {
      */
     get(sg) {
 
-        const existing_object = this.__object_cache.get(sg);
+        const existing_value = this.__object_cache.get(sg);
+
+        if (existing_value !== undefined) {
+            const object = existing_value.object;
 
-        if (existing_object !== undefined) {
-            return existing_object;
+            // validate that the object is still the same
+            if (existing_value.key.equals(sg)) {
+                return object;
+            } else {
+                // object has changed, dispose of cached version and let it be rebuilt
+                // object.dispose();
+            }
         }
 
-        const new_object = build_three_object(sg);
+        // replace scratch key as it's being used inside the cache now
+        const key = sg.clone();
+
+        const new_object = build_three_object(key);
+
+        const cacheValue = new CacheValue();
+
+        cacheValue.key = key;
+        cacheValue.object = new_object;
 
-        this.__object_cache.set(sg, new_object);
+        this.__object_cache.set(sg, cacheValue);
 
         return new_object;
     }

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

@@ -69,7 +69,7 @@ async function load_gltf(path, engine) {
     // console.log(composition);
     // console.log(three_object);
     //
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Mesh.fromJSON({
     //         url: path
     //     }))

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

@@ -1,26 +1,31 @@
-import { EngineHarness } from "../../../../EngineHarness.js";
-import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
+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 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 ButtonView from "../../../../../view/elements/button/ButtonView.js";
 import Entity from "../../../../ecs/Entity.js";
-import { Transform } from "../../../../ecs/transform/Transform.js";
-import { ShadedGeometry } from "../ShadedGeometry.js";
-import { BoxBufferGeometry, MeshStandardMaterial, OctahedronGeometry } from "three";
-import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.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 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 { 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 Vector2 from "../../../../../core/geom/Vector2.js";
-import {downloadAsFile} from "../../../../../core/binary/downloadAsFile.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";
 
 const eh = new EngineHarness();
 
@@ -33,7 +38,7 @@ function makeMovingShadedGeometry() {
     b.radius = 2;
     b.rate = 1;
 
-    const sg = ShadedGeometry.from(new OctahedronGeometry(0.5, 5), new MeshStandardMaterial({ color: 0xFF0000 }));
+    const sg = ShadedGeometry.from(new OctahedronGeometry(0.5, 5), new MeshStandardMaterial({color: 0xFF0000}));
 
     sg.draw_method = DRAW_METHOD_INSTANCED;
 
@@ -89,31 +94,60 @@ async function main(engine) {
         geometries.push(new BoxBufferGeometry());
     }
 
+    const entities = [];
+
     for (let i = 0; i < INSTANCE_COUNT; i++) {
         const geometry = randomFromArray(random, geometries);
         const sg = ShadedGeometry.from(geometry, material);
 
-        // sg.draw_method = DRAW_METHOD_PLAIN;
-        sg.draw_method = DRAW_METHOD_INSTANCED;
+        sg.draw_method = DRAW_METHOD_PLAIN;
+        sg.setFlag(ShadedGeometryFlags.DrawMethodLocked);
+        // sg.draw_method = DRAW_METHOD_INSTANCED;
         // sg.draw_method = 2;
         // sg.draw_method = DRAW_METHOD_INSTANCED;
         // sg.draw_method = random() > 0.5 ? DRAW_METHOD_INSTANCED : 2;
         sg.clearFlag(ShadedGeometryFlags.CastShadow | ShadedGeometryFlags.ReceiveShadow);
 
-        new Entity()
-            .add(Transform.fromJSON({
-                position: {
-                    x: randomFloatBetween(random, 0, TERRAIN_SIZE),
-                    y: randomFloatBetween(random, 0, 10),
-                    z: randomFloatBetween(random, 0, TERRAIN_SIZE)
-                },
-                rotation: Quaternion.random(random),
-                scale: 0.1
-            }))
+        const entity = new Entity();
+
+        entity.add(Transform.fromJSON({
+            position: {
+                x: randomFloatBetween(random, 0, TERRAIN_SIZE),
+                y: randomFloatBetween(random, 0, 10),
+                z: randomFloatBetween(random, 0, TERRAIN_SIZE)
+            },
+            rotation: Quaternion.random(random),
+            scale: 0.1
+        }))
             .add(sg)
             .build(ecd);
+
+        entities.push(entity);
     }
 
+    let iterator = 0;
+
+    new Entity()
+        .add(BehaviorComponent.fromOne(
+            RepeatBehavior.from(SequenceBehavior.from([
+                DelayBehavior.from(0.001),
+                RepeatBehavior.from(new ActionBehavior(() => {
+                    const index = (iterator++) % entities.length;
+                    const entity = entities[index];
+
+                    const sg = entity.getComponent(ShadedGeometry);
+
+                    const color = new Color();
+                    color.setHSV(random(), 0.7, 1);
+
+                    sg.material = new MeshStandardMaterial({
+                        color: color.toUint()
+                    });
+                }), 1000)
+            ]))
+        ))
+        .build(ecd);
+
     // makeMovingShadedGeometry().build(ecd);
 
     debug_button(engine, () => {
@@ -158,4 +192,7 @@ function debug_button(engine, action, name = "Button", ecd = entityManager.datas
         .build(ecd);
 }
 
-eh.initialize().then(main);
+eh.initialize({
+    configuration(config, engine) {
+    }
+}).then(main);

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

@@ -168,7 +168,7 @@ async function main(engine) {
         const sp = new SurfacePoint3();
 
         sgm.raycastNearest(sp, ray_origin.x, ray_origin.y, ray_origin.z, ray_direction.x, ray_direction.y, ray_direction.z, ((entity, mesh) => {
-            return (entity !== raycast_marker.entity);
+            return (entity !== raycast_marker.id);
         }));
 
         const t = raycast_marker.getComponent(Transform);

package/src/engine/graphics/ecs/path/PathDisplaySystem.js

@@ -27,7 +27,7 @@ const builders = {
      * @param {EntityPathStyle} style
      * @param {Path} _p
      * @param {PathDisplaySystem} system
-     * @param {EntityBuilder[]} result
+     * @param {Entity[]} result
      */
     [PathDisplayType.Entity]: function (style, path, system, result) {
 
@@ -54,7 +54,7 @@ const builders = {
      * @param {RibbonPathStyle} style
      * @param {Path} path
      * @param {PathDisplaySystem} system
-     * @param {EntityBuilder[]} result
+     * @param {Entity[]} result
      */
     [PathDisplayType.Ribbon]: function (style, path, system, result) {
         const builder = new RibbonPathBuilder();
@@ -72,7 +72,7 @@ const builders = {
      * @param {TubePathStyle} style
      * @param {Path} path
      * @param {PathDisplaySystem} system
-     * @param {EntityBuilder[]} result
+     * @param {Entity[]} result
      */
     [PathDisplayType.Tube]: function (style, path, system, result) {
         const builder = new TubePathBuilder();
@@ -103,7 +103,7 @@ class PathDisplayContext extends SystemEntityContext {
 
         /**
          *
-         * @type {EntityBuilder[]}
+         * @type {Entity[]}
          * @private
          */
         this.__owned_entities = [];

package/src/engine/graphics/ecs/path/entity/EntityPathMarker.js

@@ -14,7 +14,7 @@ export class EntityPathMarker {
 
         /**
          *
-         * @type {EntityBuilder}
+         * @type {Entity}
          */
         this.entity = null;
     }

package/src/engine/graphics/ecs/path/highlight/PathDisplayHighlightSystem.js

@@ -63,7 +63,7 @@ export class PathDisplayHighlightSystem extends System {
 
         /**
          *
-         * @type {EntityBuilder[]}
+         * @type {Entity[]}
          */
         const ownedEntities = ctx.__owned_entities;
 
@@ -72,7 +72,7 @@ export class PathDisplayHighlightSystem extends System {
 
             if (eb.hasComponent(Highlight)) {
                 //already has a highlight
-                console.warn(`Owned entity ${eb.entity} of PathDisplay entity ${entity} already has a Highlight component attached. Keeping existing Highlight.`);
+                console.warn(`Owned entity ${eb.id} of PathDisplay entity ${entity} already has a Highlight component attached. Keeping existing Highlight.`);
                 continue;
             }
 
@@ -105,7 +105,7 @@ export class PathDisplayHighlightSystem extends System {
 
         /**
          *
-         * @type {EntityBuilder[]}
+         * @type {Entity[]}
          */
         const ownedEntities = ctx.__owned_entities;
 

package/src/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -270,7 +270,7 @@ function main(engine) {
 
     const ecd = engine.entityManager.dataset;
 
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Transform.fromJSON({
     //         position: {
     //             x: 100,
@@ -290,7 +290,7 @@ function main(engine) {
     //     }))
     //     .build(ecd);
 
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Transform.fromJSON({
     //         position: {
     //             x: 107,
@@ -335,7 +335,7 @@ function main(engine) {
         }
     }
     //
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Transform.fromJSON({
     //         position: {
     //             x: 107,
@@ -355,7 +355,7 @@ function main(engine) {
     //     }))
     //     .build(ecd);
 
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Transform.fromJSON({
     //         position: {
     //             x: 107,
@@ -377,7 +377,7 @@ function main(engine) {
 
     // const canvasView = makeCameraClippingDebug(engine);
     //
-    // new EntityBuilder()
+    // new Entity()
     //     .add(ViewportPosition.fromJSON({
     //         offset: new Vector2(10, 10)
     //     }))

package/src/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -549,7 +549,7 @@ function setup_scene_3(engine, ecd) {
     // key_light_transform.position.set(10, 10, 0);
     // key_light_transform.lookAt(new Vector3(0, 0, 0));
     //
-    // new EntityBuilder()
+    // new Entity()
     //     .add(light_key)
     //     .add(key_light_transform)
     //     .build(ecd);
@@ -1150,7 +1150,7 @@ function main(engine) {
     //     pointerEvents: 'auto'
     // });
 
-    // new EntityBuilder()
+    // new Entity()
     //     .add(ViewportPosition.fromJSON({
     //         anchor: Vector2.one,
     //         offset: new Vector2(-0, -0),

package/src/engine/graphics/render/visibility/hiz/prototypeHiZ.js

@@ -367,7 +367,7 @@ function main(engine) {
     // for (let i = 0; i < 10; i++) {
     //     for (let j = 0; j < 10; j++) {
     //
-    //         new EntityBuilder()
+    //         new Entity()
     //             .add(Transform.fromJSON({
     //                 position: {
     //                     x: 60 + i * 10,

package/src/engine/graphics/sh3/prototypeSH3Probe.js

@@ -284,7 +284,7 @@ async function main(engine) {
     ];
 
     //
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Transform.fromJSON({
     //         position: {
     //             x: mesh_asset.boundingBox.x0,
@@ -300,7 +300,7 @@ async function main(engine) {
     //     }))
     //     .build(ecd);
     //
-    // new EntityBuilder()
+    // new Entity()
     //     .add(Transform.fromJSON({
     //         position: {
     //             x: mesh_asset.boundingBox.x1,

package/src/engine/intelligence/behavior/ecs/EntityBehavior.js

@@ -1,28 +1,25 @@
-import { Behavior } from "../Behavior.js";
-import { assert } from "../../../../core/assert.js";
+import {Behavior} from "../Behavior.js";
+import {assert} from "../../../../core/assert.js";
 
 export class EntityBehavior extends Behavior {
 
-    constructor() {
-        super();
 
-        /**
-         * Entity ID
-         * @type {number}
-         */
-        this.entity = -1;
+    /**
+     * Entity ID
+     * @type {number}
+     */
+    entity = -1;
 
-        /**
-         *
-         * @type {EntityComponentDataset}
-         */
-        this.ecd = null;
-    }
+    /**
+     *
+     * @type {EntityComponentDataset}
+     */
+    ecd = null;
 
     initialize(context) {
-        const { entity, ecd, engine } = context;
+        const {entity, ecd, engine} = context;
 
-        assert.typeOf(entity, 'number', 'entity');
+        assert.isNumber(entity, 'entity');
         assert.defined(ecd);
         assert.defined(engine);
 

package/src/engine/intelligence/behavior/util/DelayBehavior.js

@@ -41,17 +41,17 @@ export class DelayBehavior extends Behavior {
 
     /**
      *
-     * @param {number} value in seconds
+     * @param {number} seconds in seconds
      * @return {DelayBehavior}
      */
-    static from(value) {
-        assert.isNumber(value, 'value');
-        assert.notNaN(value, 'value');
-        assert.isFiniteNumber(value, 'value');
+    static from(seconds) {
+        assert.isNumber(seconds, 'value');
+        assert.notNaN(seconds, 'value');
+        assert.isFiniteNumber(seconds, 'value');
 
         const r = new DelayBehavior();
 
-        r.value = value;
+        r.value = seconds;
 
         return r;
     }