@woosh/meep-engine 2.36.26 → 2.36.29

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

@@ -2,18 +2,15 @@ import { assert } from "../../../../core/assert.js";
 import { ClockChannelType } from "./ClockChannelType.js";
 import { RepeatBehavior } from "../decorator/RepeatBehavior.js";
 import { ActionBehavior } from "../primitive/ActionBehavior.js";
+import { SequenceBehavior } from "../composite/SequenceBehavior.js";
 
 export const BehaviorComponentFlag = {
-    AllowSleep: 1
+    AllowSleep: 1,
+    Resolved: 2
 };
 
 export class BehaviorComponent {
     constructor() {
-        /**
-         *
-         * @type {Behavior[]}
-         */
-        this.list = [];
 
         /**
          *
@@ -26,6 +23,97 @@ export class BehaviorComponent {
          * @type {number}
          */
         this.flags = 0;
+
+        /**
+         *
+         * @type {Behavior|null}
+         * @private
+         */
+        this.__behavior = null;
+    }
+
+    /**
+     *
+     * @param {number|BehaviorComponentFlag} flag
+     * @returns {void}
+     */
+    setFlag(flag) {
+        this.flags |= flag;
+    }
+
+    /**
+     *
+     * @param {number|BehaviorComponentFlag} flag
+     * @returns {void}
+     */
+    clearFlag(flag) {
+        this.flags &= ~flag;
+    }
+
+    /**
+     *
+     * @param {number|BehaviorComponentFlag} flag
+     * @param {boolean} value
+     */
+    writeFlag(flag, value) {
+        if (value) {
+            this.setFlag(flag);
+        } else {
+            this.clearFlag(flag);
+        }
+    }
+
+    /**
+     *
+     * @param {number|BehaviorComponentFlag} flag
+     * @returns {boolean}
+     */
+    getFlag(flag) {
+        return (this.flags & flag) === flag;
+    }
+
+    /**
+     *
+     * @returns {Behavior|null}
+     */
+    get behavior() {
+        return this.__behavior;
+    }
+
+    /**
+     *
+     * @param {Behavior} v
+     */
+    set behavior(v) {
+        this.__behavior = v;
+    }
+
+    /**
+     * @deprecated
+     * @returns {Readonly<Behavior[]>}
+     */
+    get list() {
+        if (this.__behavior !== null) {
+            return [this.__behavior];
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * @deprecated
+     * @param {Behavior[]} v
+     */
+    set list(v) {
+        console.warn('.list is deprecated, use SequenceBehavior instead');
+        if (v.length > 1) {
+            console.warn('.list is deprecated, converting to sequence instead');
+            this.__behavior = SequenceBehavior.from(v);
+        } else if (v.length === 1) {
+            this.__behavior = v[0];
+        } else {
+            this.__behavior = null;
+        }
     }
 
 
@@ -53,7 +141,7 @@ export class BehaviorComponent {
 
         const result = new BehaviorComponent();
 
-        result.list.push(b);
+        result.__behavior = b;
 
         return result;
 

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

@@ -1,5 +1,7 @@
 import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import { BehaviorComponent } from "./BehaviorComponent.js";
+import { SequenceBehavior } from "../composite/SequenceBehavior.js";
+import { SucceedingBehavior } from "../primitive/SucceedingBehavior.js";
 
 export class BehaviorComponentSerializationAdapter extends BinaryClassSerializationAdapter {
     constructor() {
@@ -33,15 +35,13 @@ export class BehaviorComponentSerializationAdapter extends BinaryClassSerializat
         buffer.writeUint8(value.clock);
         buffer.writeUint8(value.flags);
 
-        const behaviors = value.list;
-        const n = behaviors.length;
-        buffer.writeUintVar(n);
-
-        for (let i = 0; i < n; i++) {
-            const behavior = behaviors[i];
+        if (value.behavior !== null) {
+            buffer.writeUintVar(1);
 
             //write single behavior
-            this.objectAdapter.serialize(buffer, behavior);
+            this.objectAdapter.serialize(buffer, value.behavior);
+        } else {
+            buffer.writeUintVar(0);
         }
     }
 
@@ -71,6 +71,13 @@ export class BehaviorComponentSerializationAdapter extends BinaryClassSerializat
         //write object fields
         value.clock = clock;
         value.flags = flags;
-        value.list = behaviors;
+
+        if (behaviors.length > 1) {
+            value.behavior = SequenceBehavior.from(behaviors);
+        } else if (behaviors.length === 1) {
+            value.behavior = behaviors[0];
+        } else {
+            value.behavior = SucceedingBehavior.from(0);
+        }
     }
 }

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

@@ -1,25 +1,25 @@
 import { System } from "../../../ecs/System.js";
-import { BehaviorComponent } from "./BehaviorComponent.js";
+import { BehaviorComponent, BehaviorComponentFlag } from "./BehaviorComponent.js";
 import { BehaviorStatus } from "../BehaviorStatus.js";
 import Clock from "../../../Clock.js";
 import { ClockChannelType } from "./ClockChannelType.js";
 
 /**
  *
- * @param {BehaviorStatus} behavior
+ * @param {Behavior} behavior
  * @param {number} timeDelta
+ * @returns {BehaviorStatus}
  */
 function updateBehavior(behavior, timeDelta) {
 
     try {
-        behavior.tick(timeDelta);
+        return behavior.tick(timeDelta);
     } catch (e) {
         console.error('Behavior threw an exception', e);
 
         // Transition behavior into failed state
-        behavior.setStatus(BehaviorStatus.Failed);
+        return BehaviorStatus.Failed;
     }
-
 }
 
 export class BehaviorSystem extends System {
@@ -60,24 +60,18 @@ export class BehaviorSystem extends System {
      * @param {number} entity
      */
     link(component, entity) {
+        const behavior = component.behavior;
+        component.clearFlag(BehaviorComponentFlag.Resolved);
 
-        const list = component.list;
-        const l = list.length;
-
-        for (let i = 0; i < l; i++) {
-            const behavior = list[i];
-
-            if (behavior.getStatus() === BehaviorStatus.Initial) {
-                // initialize behavior
-                const dataset = this.entityManager.dataset;
+        if (behavior !== null) {
 
-                try {
-                    behavior.initialize({ entity, ecd: dataset, engine: this.engine });
-                } catch (e) {
-                    console.warn('Behavior initialization failed:', e);
+            // initialize behavior
+            const dataset = this.entityManager.dataset;
 
-                    behavior.setStatus(BehaviorStatus.Failed);
-                }
+            try {
+                behavior.initialize({ entity, ecd: dataset, engine: this.engine });
+            } catch (e) {
+                console.warn('Behavior initialization failed:', e);
             }
         }
     }
@@ -88,17 +82,12 @@ export class BehaviorSystem extends System {
      * @param {number} entity
      */
     unlink(component, entity) {
+        const behavior = component.behavior;
 
-        const list = component.list;
-        const l = list.length;
-
-        for (let i = 0; i < l; i++) {
-            const behavior = list[i];
+        if (behavior !== null) {
 
-            if (behavior.getStatus() === BehaviorStatus.Running) {
-                // finalize behavior
-                behavior.finalize();
-            }
+            // finalize behavior
+            behavior.finalize();
         }
     }
 
@@ -118,8 +107,9 @@ export class BehaviorSystem extends System {
          * @param {number} entity
          */
         function visitBehavior(b, entity) {
-            const list = b.list;
-            const l = list.length;
+            if (b.getFlag(BehaviorComponentFlag.Resolved)) {
+                return;
+            }
 
             let td;
 
@@ -131,15 +121,16 @@ export class BehaviorSystem extends System {
                 td = systemDelta;
             }
 
-            for (let i = 0; i < l; i++) {
-                const behavior = list[i];
+            const behavior = b.behavior;
 
-                if (behavior.getStatus() !== BehaviorStatus.Running) {
-                    continue;
-                }
+            if (behavior !== null) {
+                const state = updateBehavior(behavior, td);
 
-                updateBehavior(behavior, td);
+                if (state === BehaviorStatus.Failed || state === BehaviorStatus.Succeeded) {
+                    b.setFlag(BehaviorComponentFlag.Resolved);
+                }
             }
+
         }
 
         dataset.traverseComponents(BehaviorComponent, visitBehavior);

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