@woosh/meep-engine 2.69.0 → 2.71.0

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

@@ -1,29 +1,29 @@
-import { DynamicActor } from "./DynamicActor.js";
-import { AbstractContextSystem } from "../system/AbstractContextSystem.js";
-import { SystemEntityContext } from "../system/SystemEntityContext.js";
 import { DataScope } from "../../../../../model/game/unit/actions/data/DataScope.js";
-import { Blackboard } from "../../intelligence/blackboard/Blackboard.js";
+import { OverrideContextBehavior } from "../../../../../model/game/util/behavior/OverrideContextBehavior.js";
+import { assert } from "../../../core/assert.js";
+import { randomMultipleFromArray } from "../../../core/collection/array/randomMultipleFromArray.js";
+import { HashMap } from "../../../core/collection/map/HashMap.js";
 import { returnTrue } from "../../../core/function/Functions.js";
-import { EntityProxyScope } from "../binding/EntityProxyScope.js";
-import Entity from "../Entity.js";
-import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
+import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
+import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
+import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
+import { number_compare_descending } from "../../../core/primitives/numbers/number_compare_descending.js";
+import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
 import { SequenceBehavior } from "../../intelligence/behavior/composite/SequenceBehavior.js";
+import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
 import { DieBehavior } from "../../intelligence/behavior/ecs/DieBehavior.js";
+import { Blackboard } from "../../intelligence/blackboard/Blackboard.js";
+import { EntityProxyScope } from "../binding/EntityProxyScope.js";
 import { SerializationMetadata } from "../components/SerializationMetadata.js";
 import Tag from "../components/Tag.js";
-import { OverrideContextBehavior } from "../../../../../model/game/util/behavior/OverrideContextBehavior.js";
-import { HashMap } from "../../../core/collection/map/HashMap.js";
-import { assert } from "../../../core/assert.js";
+import Entity from "../Entity.js";
+import { EntityFlags } from "../EntityFlags.js";
+import { AbstractContextSystem } from "../system/AbstractContextSystem.js";
+import { SystemEntityContext } from "../system/SystemEntityContext.js";
+import { DynamicActor } from "./DynamicActor.js";
 import { RuleExecution } from "./RuleExecution.js";
 import { computeContextualDynamicRuleDebugString } from "./rules/computeContextualDynamicRuleDebugString.js";
-import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
-import { randomFromArray } from "../../../core/math/random/randomFromArray.js";
-import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
-import { randomMultipleFromArray } from "../../../core/collection/array/randomMultipleFromArray.js";
-import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
-import { EntityFlags } from "../EntityFlags.js";
-import { number_compare_descending } from "../../../core/primitives/numbers/number_compare_descending.js";
 
 /**
  * In seconds
@@ -39,21 +39,13 @@ const IDLE_EVENT_TIMEOUT_MAX = 5;
 
 class Context extends SystemEntityContext {
 
-    constructor() {
-        super();
+    execution = new RuleExecution();
 
-        this.execution = new RuleExecution();
-
-        /**
-         *
-         * @type {number}
-         */
-        this.next_idle_event_time = 0;
-    }
-
-    process(entity, scope) {
-
-    }
+    /**
+     *
+     * @type {number}
+     */
+    next_idle_event_time = 0;
 
     /**
      *
@@ -99,77 +91,78 @@ class Context extends SystemEntityContext {
 
 
 export class DynamicActorSystem extends AbstractContextSystem {
+    dependencies = [DynamicActor];
+
+    components_used = [
+        ResourceAccessSpecification.from(Blackboard, ResourceAccessKind.Read)
+    ];
+
     /**
      *
-     * @param {Engine} engine
+     * @type {DynamicRuleDescriptionTable}
      */
-    constructor(engine) {
-        super(Context);
-
-        this.dependencies = [DynamicActor];
+    database = null;
 
-        this.components_used = [
-            ResourceAccessSpecification.from(Blackboard, ResourceAccessKind.Read)
-        ];
+    /**
+     * Scope used for dispatching actions
+     * @type {DataScope}
+     */
+    scope = new DataScope();
 
-        /**
-         *
-         * @type {Engine}
-         */
-        this.engine = engine;
+    /**
+     * When precisely each rule was last used
+     * @type {HashMap<DynamicRuleDescription, number>}
+     * @private
+     */
+    __global_last_used_times = new HashMap({
+        keyEqualityFunction(a, b) {
+            return a.id === b.id;
+        },
+        keyHashFunction(k) {
+            return computeStringHash(k.id);
+        }
+    });
 
-        /**
-         *
-         * @type {DynamicRuleDescriptionTable}
-         */
-        this.database = null;
+    /**
+     * Time when a group with an ID will be cooled down
+     * @type {Map<string, number>}
+     * @private
+     */
+    __global_cooldown_ready = new Map();
 
-        /**
-         * Scope used for dispatching actions
-         * @type {DataScope}
-         */
-        this.scope = new DataScope();
+    /**
+     *
+     * @type {MultiPredicateEvaluator}
+     */
+    evaluator = null;
 
-        /**
-         * When precisely each rule was last used
-         * @type {HashMap<DynamicRuleDescription, number>}
-         * @private
-         */
-        this.__global_last_used_times = new HashMap({
-            keyEqualityFunction(a, b) {
-                return a.id === b.id;
-            },
-            keyHashFunction(k) {
-                return computeStringHash(k.id);
-            }
-        });
+    /**
+     *
+     * @type {number}
+     * @private
+     */
+    __current_time = 0;
 
-        /**
-         * Time when a group with an ID will be cooled down
-         * @type {Map<string, number>}
-         * @private
-         */
-        this.__global_cooldown_ready = new Map();
+    /**
+     * Print debug output into console
+     * @type {boolean}
+     * @private
+     */
+    __debug = false;
 
-        /**
-         *
-         * @type {MultiPredicateEvaluator}
-         */
-        this.evaluator = null;
+    /**
+     *
+     * @param {Engine} engine
+     */
+    constructor(engine) {
+        super(Context);
 
         /**
          *
-         * @type {number}
-         * @private
+         * @type {Engine}
          */
-        this.__current_time = 0;
+        this.engine = engine;
 
-        /**
-         * Print debug output into console
-         * @type {boolean}
-         * @private
-         */
-        this.__debug = false;
     }
 
     /**
@@ -369,7 +362,7 @@ export class DynamicActorSystem extends AbstractContextSystem {
 
         evaluator.initialize(context);
 
-        for (;;) {
+        for (; ;) {
             const predicate = evaluator.next();
 
             if (predicate === undefined) {

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

@@ -1,16 +1,14 @@
 export class RuleExecution {
-    constructor() {
 
-        /**
-         *
-         * @type {DynamicRuleDescription}
-         */
-        this.rule = null;
-        /**
-         *
-         * @type {Entity}
-         */
-        this.executor = null
+    /**
+     *
+     * @type {DynamicRuleDescription}
+     */
+    rule = null;
+    /**
+     *
+     * @type {Entity}
+     */
+    executor = null
 
-    }
 }

package/src/engine/ecs/gui/GUIElement.js

@@ -1,13 +1,12 @@
 /**
  * Created by Alex on 09/02/2015.
  */
-import Vector2 from '../../../core/geom/Vector2.js';
-import ObservedBoolean from "../../../core/model/ObservedBoolean.js";
-import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "../storage/COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
 import { assert } from "../../../core/assert.js";
+import { computeHashIntegerArray } from "../../../core/collection/array/computeHashIntegerArray.js";
+import Vector2 from '../../../core/geom/Vector2.js';
 import { objectDeepEquals } from "../../../core/model/object/objectDeepEquals.js";
+import ObservedBoolean from "../../../core/model/ObservedBoolean.js";
 import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
-import { computeHashIntegerArray } from "../../../core/collection/array/computeHashIntegerArray.js";
 
 /**
  *
@@ -27,64 +26,48 @@ export const GUIElementFlag = {
 class GUIElement {
     /**
      *
-     * @param {View} [view] parameter is deprecated
-     * @constructor
-     */
-    constructor(view) {
-        /**
-         *
-         * @type {View}
-         */
-        this.view = null;
-
-        /**
-         *
-         * @type {String}
-         */
-        this.klass = null;
-
-        /**
-         *
-         * @type {Object}
-         */
-        this.parameters = {};
-
-        /**
-         * ranges from 0..1 in both X and Y, controls anchor point of element positioning
-         * @type {Vector2}
-         */
-        this.anchor = new Vector2(0, 0);
-
-        /**
-         * Used for visual grouping of elements, system will create and manage named containers to group elements together
-         * @readonly
-         * @type {String|null}
-         */
-        this.group = null;
-
-        /**
-         * @private
-         * @type {number}
-         */
-        this.flags = GUIElementFlag.Managed;
-
-
-        /**
-         *
-         * @type {ObservedBoolean}
-         */
-        this.visible = new ObservedBoolean(true);
-
-
-        if (view !== undefined) {
-            console.warn('constructor parameters are deprecated');
-            this.view = view;
-
-            //set non-serializable flag
-            this[COMPONENT_SERIALIZATION_TRANSIENT_FIELD] = true;
-        }
+     * @type {View}
+     */
+    view = null;
+
+    /**
+     *
+     * @type {String}
+     */
+    klass = null;
+
+    /**
+     *
+     * @type {Object}
+     */
+    parameters = {};
+
+    /**
+     * ranges from 0..1 in both X and Y, controls anchor point of element positioning
+     * @type {Vector2}
+     */
+    anchor = new Vector2(0, 0);
+
+    /**
+     * Used for visual grouping of elements, system will create and manage named containers to group elements together
+     * @readonly
+     * @type {String|null}
+     */
+    group = null;
+
+    /**
+     * @private
+     * @type {number}
+     */
+    flags = GUIElementFlag.Managed;
+
+
+    /**
+     *
+     * @type {ObservedBoolean}
+     */
+    visible = new ObservedBoolean(true);
 
-    }
 
     /**
      *

package/src/engine/ecs/gui/GUIElementSystem.js

@@ -2,11 +2,10 @@
  * Created by Alex on 09/02/2015.
  */
 
-import { System } from '../System.js';
-import GUIElement, { GUIElementFlag } from './GUIElement.js';
 import EmptyView from "../../../view/elements/EmptyView.js";
-import domify from "../../../view/DOM.js";
 import View from "../../../view/View.js";
+import { System } from '../System.js';
+import GUIElement, { GUIElementFlag } from './GUIElement.js';
 import { GUIElementEvent } from "./GUIElementEvent.js";
 
 /**
@@ -38,6 +37,30 @@ function handleComponentVisibilityChange(v) {
 export const EVENT_VIEW_INSTANTIATED = 'component.gui-element.view.instantiated';
 
 class GUIElementSystem extends System {
+
+    view = new EmptyView({
+        classList: ["gui-system-root"],
+        css: {
+
+            position: "absolute",
+            top: 0,
+            left: 0,
+            zIndex: 100,
+            width: "inherit",
+            height: "inherit",
+            userSelect: "none",
+            pointerEvents: "none"
+        }
+    });
+
+    dependencies = [GUIElement];
+
+    /**
+     *
+     * @type {Object<View>}
+     */
+    groups = {};
+
     /**
      *
      * @param {View} containerView
@@ -65,22 +88,6 @@ class GUIElementSystem extends System {
         super();
         this.containerView = containerView;
 
-        this.view = new EmptyView();
-
-        domify(this.view.el)
-            .addClass("gui-system-root")
-            .css({
-                position: "absolute",
-                top: 0,
-                left: 0,
-                zIndex: 100,
-                width: "inherit",
-                height: "inherit",
-                userSelect: "none",
-                pointerEvents: "none"
-            });
-
-        this.dependencies = [GUIElement];
 
         /**
          * @type {ModuleRegistry}
@@ -93,11 +100,6 @@ class GUIElementSystem extends System {
          */
         this.engine = engine;
 
-        /**
-         *
-         * @type {Object<View>}
-         */
-        this.groups = {};
     }
 
     shutdown(em, cmOk, cbFailure) {

package/src/engine/ecs/gui/hud/HeadsUpDisplay.js

@@ -5,27 +5,24 @@
  */
 
 
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import Vector3 from '../../../../core/geom/Vector3.js';
 import { HeadsUpDisplayFlag } from "./HeadsUpDisplayFlag.js";
-import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 
 class HeadsUpDisplay {
+
     /**
      *
+     * @type {Vector3}
      */
-    constructor() {
-        /**
-         *
-         * @type {Vector3}
-         */
-        this.worldOffset = new Vector3();
-
-        /**
-         *
-         * @type {number}
-         */
-        this.flags = HeadsUpDisplayFlag.TransformWorldOffset;
-    }
+    worldOffset = new Vector3();
+
+    /**
+     *
+     * @type {number}
+     */
+    flags = HeadsUpDisplayFlag.TransformWorldOffset;
+
 
     /**
      *
@@ -103,7 +100,7 @@ class HeadsUpDisplay {
         this.writeFlag(HeadsUpDisplayFlag.PerspectiveRotation, perspectiveRotation);
     }
 
-    static fromJSON(j){
+    static fromJSON(j) {
         const r = new HeadsUpDisplay();
 
         r.fromJSON(j);

package/src/engine/ecs/gui/hud/HeadsUpDisplaySystem.js

@@ -3,17 +3,17 @@
  * Date: 22/6/2014
  * Time: 22:07
  */
-import { System } from '../../System.js';
-import HeadsUpDisplay from './HeadsUpDisplay.js';
-import { Transform } from '../../transform/Transform.js';
+import { mat4 } from "gl-matrix";
+import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
 import { GraphicsEngine } from "../../../graphics/GraphicsEngine.js";
 import { FogOfWarVisibilityPredicate } from "../../fow/FogOfWarVisibilityPredicate.js";
-import ViewportPosition from "../position/ViewportPosition.js";
+import { System } from '../../System.js';
+import { Transform } from '../../transform/Transform.js';
 import GUIElement from "../GUIElement.js";
+import ViewportPosition from "../position/ViewportPosition.js";
+import HeadsUpDisplay from './HeadsUpDisplay.js';
 import { HeadsUpDisplayFlag } from "./HeadsUpDisplayFlag.js";
-import { mat4 } from "gl-matrix";
-import { ResourceAccessSpecification } from "../../../../core/model/ResourceAccessSpecification.js";
-import { ResourceAccessKind } from "../../../../core/model/ResourceAccessKind.js";
 
 const projection = new Float32Array(16);
 
@@ -25,6 +25,14 @@ const projection = new Float32Array(16);
  * @constructor
  */
 class HeadsUpDisplaySystem extends System {
+    dependencies = [HeadsUpDisplay];
+
+
+    components_used = [
+        ResourceAccessSpecification.from(GUIElement, ResourceAccessKind.Read | ResourceAccessKind.Write),
+        ResourceAccessSpecification.from(ViewportPosition, ResourceAccessKind.Read | ResourceAccessKind.Write),
+    ];
+
     /**
      *
      * @param {GraphicsEngine} graphicsEngine
@@ -32,14 +40,6 @@ class HeadsUpDisplaySystem extends System {
     constructor(graphicsEngine) {
         super();
 
-        this.dependencies = [HeadsUpDisplay];
-
-
-        this.components_used = [
-            ResourceAccessSpecification.from(GUIElement, ResourceAccessKind.Read | ResourceAccessKind.Write),
-            ResourceAccessSpecification.from(ViewportPosition, ResourceAccessKind.Read | ResourceAccessKind.Write),
-        ];
-
         if (!(graphicsEngine instanceof GraphicsEngine)) {
             throw new TypeError(`graphicsEngine is not an instance of GraphicsEngine`);
         }

package/src/engine/ecs/gui/parallax/GuiElementParallax.js

@@ -1,7 +1,7 @@
 export class GuiElementParallax {
-    constructor() {
-        this.angle = 10;
-    }
+
+    angle = 10;
+
 
     static from({ angle = 10 } = {}) {
         const r = new GuiElementParallax();

package/src/engine/ecs/gui/parallax/GuiElementParallaxSystem.js

@@ -1,8 +1,9 @@
 import { System } from "../../System.js";
-import { GuiElementParallax } from "./GuiElementParallax.js";
 import GUIElement from "../GUIElement.js";
+import { GuiElementParallax } from "./GuiElementParallax.js";
 
 export class GuiElementParallaxSystem extends System {
+    dependencies = [GuiElementParallax, GUIElement];
 
     /**
      *
@@ -12,7 +13,6 @@ export class GuiElementParallaxSystem extends System {
     constructor({ viewport, pointer }) {
         super();
 
-        this.dependencies = [GuiElementParallax, GUIElement];
 
         /**
          *

package/src/engine/ecs/gui/position/ViewportPosition.js

@@ -2,10 +2,9 @@
  * Created by Alex on 28/01/2015.
  */
 
+import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import ObservedBoolean from "../../../../core/model/ObservedBoolean.js";
-import { BinaryClassSerializationAdapter } from "../../storage/binary/BinaryClassSerializationAdapter.js";
-import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
 import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
 
 /**
@@ -20,11 +19,9 @@ export const ViewportPositionFlags = {
 class ViewportPosition {
     /**
      *
-     * @param {Vector2} [position]
-     * @param {Vector2} [offset]
      * @constructor
      */
-    constructor({ position, offset } = {}) {
+    constructor(options) {
         /**
          * Clip-scale position, on-screen values are in range of 0 to 1
          * @type {Vector2}
@@ -70,12 +67,9 @@ class ViewportPosition {
          */
         this.enabled = new ObservedBoolean(true);
 
-        if (position !== void 0) {
-            this.position.copy(position);
-        }
-
-        if (offset !== void 0) {
-            this.offset.copy(offset);
+        if (options !== undefined) {
+            console.warn("ViewportPosition constructor options is deprecated, please use static fromJSON method instead if you need similar functionality");
+            this.fromJSON(options);
         }
     }
 
@@ -150,42 +144,3 @@ ViewportPosition.serializable = true;
 
 export default ViewportPosition;
 
-export class ViewportPositionSerializationAdapter extends BinaryClassSerializationAdapter {
-
-    version = 0;
-    klass = ViewportPosition;
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {ViewportPosition} value
-     */
-    serialize(buffer, value) {
-        value.position.toBinaryBufferFloat32(buffer);
-        value.offset.toBinaryBufferFloat32(buffer);
-        value.anchor.toBinaryBufferFloat32(buffer);
-
-        buffer.writeFloat32(value.screenEdgeWidth);
-
-        buffer.writeUint8(value.resolveGuiCollisions ? 1 : 0);
-        buffer.writeUint8(value.stickToScreenEdge ? 1 : 0);
-        buffer.writeUint8(value.enabled.getValue() ? 1 : 0);
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {ViewportPosition} value
-     */
-    deserialize(buffer, value) {
-        value.position.fromBinaryBufferFloat32(buffer);
-        value.offset.fromBinaryBufferFloat32(buffer);
-        value.anchor.fromBinaryBufferFloat32(buffer);
-
-        value.screenEdgeWidth = buffer.readFloat32();
-
-        value.resolveGuiCollisions = buffer.readUint8() !== 0;
-        value.stickToScreenEdge = buffer.readUint8() !== 0;
-        value.enabled.set(buffer.readUint8() !== 0);
-    }
-}