@woosh/meep-engine 2.36.28 → 2.37.0

package/engine/intelligence/behavior/ecs/DieBehavior.js

@@ -16,16 +16,11 @@ export class DieBehavior extends EntityBehavior {
         if (!ecd.entityExists(entity)) {
             //entity doesn't exist, count as success
 
-            this.__status = BehaviorStatus.Succeeded;
-
-            return this.__status;
+            return BehaviorStatus.Succeeded;
         }
 
         ecd.removeEntity(entity);
 
-        this.__status = BehaviorStatus.Succeeded;
-
-        return this.__status;
-
+        return BehaviorStatus.Succeeded;
     }
 }

package/engine/intelligence/behavior/ecs/WaitForEventBehavior.js

@@ -1,6 +1,5 @@
 import { EntityBehavior } from "./EntityBehavior.js";
 import { BehaviorStatus } from "../BehaviorStatus.js";
-import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import { assert } from "../../../../core/assert.js";
 
 export class WaitForEventBehavior extends EntityBehavior {
@@ -48,10 +47,10 @@ export class WaitForEventBehavior extends EntityBehavior {
 
     tick(timeDelta) {
         if (this.detected) {
-            this.__status = BehaviorStatus.Succeeded;
+            return BehaviorStatus.Succeeded;
         }
 
-        return this.__status;
+        return BehaviorStatus.Running;
     }
 
     /**
@@ -89,29 +88,3 @@ export class WaitForEventBehavior extends EntityBehavior {
  */
 WaitForEventBehavior.typeName = "WaitForEventBehavior";
 
-export class WaitForEventBehaviorSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = WaitForEventBehavior;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {WaitForEventBehavior} value
-     */
-    serialize(buffer, value) {
-        buffer.writeUTF8String(value.event);
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {WaitForEventBehavior} value
-     */
-    deserialize(buffer, value) {
-        value.event = buffer.readUTF8String();
-    }
-}

package/engine/intelligence/behavior/ecs/WaitForEventBehaviorSerializationAdapter.js

@@ -0,0 +1,29 @@
+import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
+import { WaitForEventBehavior } from "./WaitForEventBehavior.js";
+
+export class WaitForEventBehaviorSerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = WaitForEventBehavior;
+        this.version = 0;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {WaitForEventBehavior} value
+     */
+    serialize(buffer, value) {
+        buffer.writeUTF8String(value.event);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {WaitForEventBehavior} value
+     */
+    deserialize(buffer, value) {
+        value.event = buffer.readUTF8String();
+    }
+}

package/engine/intelligence/behavior/primitive/ActionBehavior.js

@@ -19,24 +19,17 @@ export class ActionBehavior extends Behavior {
 
     tick(timeDelta) {
 
-        if (this.__status === BehaviorStatus.Running) {
+        try {
+            this.__action.call(this.__context, timeDelta);
 
-            try {
-                this.__action.call(this.__context, timeDelta);
+            return BehaviorStatus.Succeeded;
 
-                this.setStatus(BehaviorStatus.Succeeded);
+        } catch (e) {
 
-            } catch (e) {
+            console.warn(e);
 
-                console.warn(e);
-
-                this.setStatus(BehaviorStatus.Failed);
-
-            }
+            return BehaviorStatus.Failed;
 
         }
-
-
-        return this.__status;
     }
 }

package/engine/intelligence/behavior/primitive/FailingBehavior.js

@@ -1,6 +1,5 @@
 import { Behavior } from "../Behavior.js";
 import { BehaviorStatus } from "../BehaviorStatus.js";
-import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 
 export class FailingBehavior extends Behavior {
     constructor(delayTicks = 0) {
@@ -9,9 +8,8 @@ export class FailingBehavior extends Behavior {
         this.delayTicks = delayTicks;
     }
 
-    tick() {
+    tick(td) {
         if (this.delayTicks === 0) {
-            this.__status = BehaviorStatus.Failed;
 
             return BehaviorStatus.Failed;
         } else {
@@ -24,29 +22,3 @@ export class FailingBehavior extends Behavior {
 
 FailingBehavior.typeName = "FailingBehavior";
 
-export class FailingBehaviorSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = FailingBehavior;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {FailingBehavior} value
-     */
-    serialize(buffer, value) {
-        buffer.writeUintVar(value.delayTicks);
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {FailingBehavior} value
-     */
-    deserialize(buffer, value) {
-        value.delayTicks = buffer.readUintVar();
-    }
-}

package/engine/intelligence/behavior/primitive/FailingBehaviorSerializationAdapter.js

@@ -0,0 +1,29 @@
+import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
+import { FailingBehavior } from "./FailingBehavior.js";
+
+export class FailingBehaviorSerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = FailingBehavior;
+        this.version = 0;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {FailingBehavior} value
+     */
+    serialize(buffer, value) {
+        buffer.writeUintVar(value.delayTicks);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {FailingBehavior} value
+     */
+    deserialize(buffer, value) {
+        value.delayTicks = buffer.readUintVar();
+    }
+}

package/engine/intelligence/behavior/primitive/PromiseBehavior.js

@@ -2,30 +2,42 @@ import { Behavior } from "../Behavior.js";
 import { BehaviorStatus } from "../BehaviorStatus.js";
 
 export class PromiseBehavior extends Behavior {
+    /**
+     *
+     * @param {()=>Promise} factory
+     */
     constructor(factory) {
         super();
 
+        /**
+         *
+         * @type {function(): Promise}
+         * @private
+         */
         this.__factory = factory;
 
         this.__promise = null;
+
+        this.__promise_state = BehaviorStatus.Running;
     }
 
     initialize(context) {
         super.initialize(context);
 
         this.__promise = this.__factory();
+        this.__promise_state = BehaviorStatus.Running;
 
         this.__promise.then(
             () => {
-                this.setStatus(BehaviorStatus.Succeeded);
+                this.__promise_state = BehaviorStatus.Succeeded;
             },
             () => {
-                this.setStatus(BehaviorStatus.Failed);
+                this.__promise_state = BehaviorStatus.Failed;
             }
         );
     }
 
     tick(timeDelta) {
-        return this.__status;
+        return this.__promise_state;
     }
 }

package/engine/intelligence/behavior/selector/WeightedRandomBehavior.js

@@ -105,10 +105,6 @@ export class WeightedRandomBehavior extends Behavior {
     }
 
     tick(timeDelta) {
-        const s = this.__selected.tick(timeDelta);
-
-        this.setStatus(s);
-
-        return s;
+        return this.__selected.tick(timeDelta);
     }
 }

package/engine/intelligence/behavior/util/ConditionBehavior.js

@@ -22,8 +22,6 @@ export class ConditionBehavior extends Behavior {
 
         const s = v ? BehaviorStatus.Succeeded : BehaviorStatus.Failed;
 
-        this.__status = s;
-
         return s;
     }
-}
+}

package/engine/intelligence/behavior/util/ConditionBehavior.spec.js

@@ -5,8 +5,6 @@ test('initialize', () => {
     const b = new ConditionBehavior(() => true);
 
     b.initialize();
-
-    expect(b.getStatus()).toBe(BehaviorStatus.Running);
 });
 
 test('positive', () => {
@@ -15,8 +13,6 @@ test('positive', () => {
     b.initialize();
 
     expect(b.tick(0)).toBe(BehaviorStatus.Succeeded);
-
-    expect(b.getStatus()).toBe(BehaviorStatus.Succeeded);
 });
 
 test('negative', () => {
@@ -25,6 +21,4 @@ test('negative', () => {
     b.initialize();
 
     expect(b.tick(0)).toBe(BehaviorStatus.Failed);
-
-    expect(b.getStatus()).toBe(BehaviorStatus.Failed);
-});
+});

package/engine/intelligence/behavior/util/ConditionalBehavior.js

@@ -33,19 +33,18 @@ export class ConditionalBehavior extends AbstractDecoratorBehavior {
 
             const s1 = this.__source.tick(timeDelta);
 
-            this.__status = s1;
+            return s1;
 
         } else if (s === BehaviorStatus.Failed) {
             condition.finalize();
 
-            this.__status = s;
+            return  s;
 
         } else {
             //waiting?
-            this.__status = s;
+            return s;
         }
 
-        return this.__status;
 
     }
 
@@ -54,9 +53,7 @@ export class ConditionalBehavior extends AbstractDecoratorBehavior {
 
         const condition = this.condition;
 
-        if (condition.getStatus() === BehaviorStatus.Running) {
             condition.finalize();
-        }
     }
 
     /**

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

@@ -52,8 +52,6 @@ export class DelayBehavior extends Behavior {
     }
 
     initialize() {
-        super.initialize();
-
         this.elapsed = 0;
     }
 
@@ -61,9 +59,9 @@ export class DelayBehavior extends Behavior {
         this.elapsed += timeDelta;
 
         if (this.elapsed >= this.value) {
-            this.__status = BehaviorStatus.Succeeded;
+            return BehaviorStatus.Succeeded;
         }
 
-        return this.__status;
+        return BehaviorStatus.Running;
     }
 }

package/engine/intelligence/behavior/util/SelectorBehavior.js

@@ -22,15 +22,21 @@ export class SelectorBehavior extends CompositeBehavior {
     }
 
     tick(timeDelta) {
+        const children = this.__children;
+        const child_count = children.length;
 
-        for (;;) {
-            const child = this.__children[this.__index];
+        if (child_count === 0) {
+            // arbitrarily decide success
+            return BehaviorStatus.Succeeded;
+        }
+
+        for (; ;) {
+            const child = children[this.__index];
 
             const s = child.tick(timeDelta);
 
             //if child succeeds or keeps running, do the same
             if (s !== BehaviorStatus.Failed) {
-                this.__status = s;
                 return s;
             }
 
@@ -38,21 +44,19 @@ export class SelectorBehavior extends CompositeBehavior {
             //continue search for fallback behavior until the last child
             this.__index++;
 
-            if (this.__index >= this.__children.length) {
-                this.__status = BehaviorStatus.Failed;
-                return this.__status;
+            if (this.__index >= child_count) {
+                return BehaviorStatus.Failed;
             }
 
             //initialize new child
-            const next = this.__children[this.__index];
+            const next = children[this.__index];
 
             child.finalize();
             next.initialize(this.context);
         }
 
         //we should never reach this point
-        this.__status = BehaviorStatus.Invalid;
-        return this.__status;
+        return BehaviorStatus.Invalid;
     }
 
     finalize() {
@@ -73,9 +77,6 @@ export class SelectorBehavior extends CompositeBehavior {
 
         if (this.__children.length > 0) {
             this.__children[0].initialize(context);
-        } else {
-            //empty, resolve as succeeded straight away
-            this.__status = BehaviorStatus.Succeeded;
         }
     }
 

package/engine/intelligence/blackboard/AbstractBlackboard.js

@@ -24,6 +24,15 @@ export class AbstractBlackboard {
         throw new Error('Not implemented');
     }
 
+    /**
+     * Release reference to a value
+     * @param {string} name
+     * @returns {void}
+     */
+    release(name) {
+
+    }
+
     /**
      *
      * @param {string} name
@@ -51,10 +60,15 @@ export class AbstractBlackboard {
     /**
      *
      * @param {string} name
+     * @param {number} [value=1]
      * @returns {void}
      */
-    incrementNumber(name) {
-        this.acquireNumber(name).increment();
+    incrementNumber(name, value = 1) {
+        const vector1 = this.acquireNumber(name);
+
+        vector1._add(value);
+
+        this.release(name);
     }
 
     /**

package/engine/plugin/EnginePluginManager.js

@@ -259,17 +259,7 @@ export class EnginePluginManager extends BaseProcess {
 
         const engine = this.engine;
 
-        if (manager_state_value === ProcessState.Initialized) {
-
-            await instance.initialize(engine);
-
-        } else if (manager_state_value === ProcessState.Running) {
-
-            await instance.initialize(engine);
-
-            await instance.startup();
-        }
-
+        await ctx.transition(manager_state_value,engine);
 
         return reference;
 
@@ -289,9 +279,9 @@ export class EnginePluginManager extends BaseProcess {
     }
 
     /**
-     *
-     * @param {Class<EnginePlugin>} PluginClass
-     * @returns {EnginePlugin|undefined}
+     * @template T
+     * @param {Class<T>} PluginClass
+     * @returns {T|undefined}
      */
     getPlugin(PluginClass) {
 

package/engine/sound/ecs/emitter/SoundEmitter.js

@@ -37,6 +37,9 @@ function volume2dB(volume) {
     return 20 * Math.log10(volume);
 }
 
+/**
+ * @class
+ */
 export class SoundEmitter {
     /**
      *

package/generation/filtering/numeric/math/CellFilterSaturate.js

@@ -1,10 +1,10 @@
 import { CellFilterUnaryOperation } from "../../core/CellFilterUnaryOperation.js";
-import { clamp } from "../../../../core/math/clamp.js";
 import { assert } from "../../../../core/assert.js";
+import { clamp01 } from "../../../../core/math/clamp01.js";
 
 export class CellFilterSaturate extends CellFilterUnaryOperation {
     operation(v) {
-        return clamp(v, 0, 1);
+        return clamp01(v);
     }
 
     /**

package/generation/grid/generation/GridTaskDensityMarkerDistribution.js

@@ -11,6 +11,7 @@ import { computeStatisticalMean } from "../../../core/math/statistics/computeSta
 import TaskGroup from "../../../core/process/task/TaskGroup.js";
 import { actionTask } from "../../../core/process/task/TaskUtils.js";
 import { ArrayIteratorRandom } from "../../../core/collection/array/ArrayIteratorRandom.js";
+import { clamp01 } from "../../../core/math/clamp01.js";
 
 
 /**
@@ -123,7 +124,7 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
 
             const densityValue = this.density.execute(grid, x, y, 0);
 
-            const density = clamp(densityValue, 0, 1);
+            const density = clamp01(densityValue);
 
             samplesDensity.push(density);
 
@@ -305,7 +306,7 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
                     return 0;
                 }
 
-                return clamp(iteration / iterationLimit, 0, 1);
+                return clamp01(iteration / iterationLimit);
             }
         });
     }

package/generation/markers/transform/MarkerNodeTransformerYRotateByFilterGradient.spec.js

@@ -4,8 +4,8 @@ import { GridDataLayer } from "../../grid/layers/GridDataLayer.js";
 import { CellFilterReadGridLayer } from "../../filtering/numeric/CellFilterReadGridLayer.js";
 import { MarkerNode } from "../MarkerNode.js";
 import Vector3 from "../../../core/geom/Vector3.js";
+import { RAD_TO_DEG } from "../../../core/math/RAD_TO_DEG.js";
 
-const RAD_TO_DEG = 180 / Math.PI;
 
 test('constructor does not throw', () => {
     const t = new MarkerNodeTransformerYRotateByFilterGradient();

package/generation/rules/CellMatcherLayerBitMaskTest.js

@@ -1,6 +1,6 @@
 import { assert } from "../../core/assert.js";
-import { clamp } from "../../core/math/clamp.js";
 import { GridLayerCellMatcher } from "./GridLayerCellMatcher.js";
+import { clamp01 } from "../../core/math/clamp01.js";
 
 export class CellMatcherLayerBitMaskTest extends GridLayerCellMatcher {
     constructor() {
@@ -30,13 +30,13 @@ export class CellMatcherLayerBitMaskTest extends GridLayerCellMatcher {
         if (x_max === 0) {
             u = 0;
         } else {
-            u = clamp(x / x_max, 0, 1);
+            u = clamp01(x / x_max);
         }
 
         if (y_max === 0) {
             v = 0;
         } else {
-            v = clamp(y / y_max, 0, 1);
+            v = clamp01(y / y_max);
         }
 
         const _x = Math.round(u * (sampler.width - 1));

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.36.28",
+  "version": "2.37.0",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",

package/view/elements/progress/SmoothProgressBar.js

@@ -1,10 +1,10 @@
-import { clamp } from "../../../core/math/clamp.js";
 import View from "../../View.js";
 import dom from "../../DOM.js";
 
 import BoundedValue from "../../../core/model/BoundedValue.js";
 import { frameThrottle } from "../../../engine/graphics/FrameThrottle.js";
 import { passThrough } from "../../../core/function/Functions.js";
+import { clamp01 } from "../../../core/math/clamp01.js";
 
 function makeTextPercentage(value, max, process) {
     const r = (value / max) * 100;
@@ -147,7 +147,7 @@ class ProgressBarView extends View {
         const style = this.__el_fill.style;
         //sanitize input to be in range 0 to 1
 
-        const fill = clamp(value / max, 0, 1);
+        const fill = clamp01(value / max);
 
         const fill_percent_string = (fill * 100) + "%";
 

package/view/elements/progress/segmented/SegmentedResourceBarView.js

@@ -1,4 +1,3 @@
-import { clamp } from "../../../../core/math/clamp.js";
 import View from "../../../View.js";
 import Vector1 from "../../../../core/geom/Vector1.js";
 import { CanvasView } from "../../CanvasView.js";
@@ -7,6 +6,7 @@ import { DomSizeObserver } from "../../../util/DomSizeObserver.js";
 import { RESOURCE_BAR_SEGMENTS } from "./RESOURCE_BAR_SEGMENTS.js";
 import List from "../../../../core/collection/list/List.js";
 import ListView from "../../../common/ListView.js";
+import { clamp01 } from "../../../../core/math/clamp01.js";
 
 export class SegmentedResourceBarView extends View {
     /**
@@ -283,7 +283,7 @@ export class SegmentedResourceBarView extends View {
 
             total_current += value;
 
-            const v_fraction = clamp(v / m, 0, 1);
+            const v_fraction = clamp01(v / m);
 
             const fill_view = this.__value_fills[i];
 
@@ -291,7 +291,7 @@ export class SegmentedResourceBarView extends View {
         }
 
 
-        const f = clamp(total_current / m, 0, 1);
+        const f = clamp01(total_current / m);
 
         const width = `${f * 100}%`;
 

package/view/elements/radial/RadialProgressView.js

@@ -3,12 +3,12 @@
  */
 
 
-import { clamp } from "../../../core/math/clamp.js";
 import View from "../../View.js";
 import SVG from '../../SVG.js';
 
 import ObservedValue from "../../../core/model/ObservedValue.js";
 import BoundedValue from "../../../core/model/BoundedValue.js";
+import { clamp01 } from "../../../core/math/clamp01.js";
 
 class RadialProgressView extends View {
     constructor(model, options) {
@@ -46,7 +46,7 @@ class RadialProgressView extends View {
                 limit = value;
             }
 
-            const n0 = clamp(value / limit, 0, 1);
+            const n0 = clamp01(value / limit);
 
             const a0 = 0;
             const a1 = n0 * Math.PI * 2;