@woosh/meep-engine 2.51.0 → 2.53.0

package/src/engine/input/devices/PointerDevice.spec.js

@@ -1,5 +1,10 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { PointerDevice } from "./PointerDevice.js";
 
+
 test("constructor does not throw", () => {
     const element = document.createElement('div');
 

package/src/engine/navigation/ecs/components/computeCatmullRomSpline.js

@@ -38,7 +38,11 @@ const p3 = [];
  * @param {number} sample_count number of discrete points to be generated
  * @param {number} [alpha=0.5] parameter for control point weights (see non-parametric catmull-rom for details on "alpha" definition)
  */
-export function computeCatmullRomSpline(result, input, input_length, dimensions, sample_count, alpha = 0.5) {
+export function computeCatmullRomSpline(
+    result,
+    input, input_length,
+    dimensions, sample_count, alpha = 0.5
+) {
     assert.greaterThan(dimensions, 0, 'number of dimensions must be greater than 0');
     assert.isNonNegativeInteger(dimensions, 'dimensions');
 

package/src/engine/navigation/ecs/path_following/PathFollower.js

@@ -19,39 +19,40 @@ const DEFAULT_FLAGS = PathFollowerFlags.Active
     | PathFollowerFlags.WriteRotationZ
 ;
 
+const DEFAULT_MAX_MOVE_DISTANCE = 100000;
+
 class PathFollower {
-    constructor() {
-
-        /**
-         * Movement speed along the path in world units per second
-         * @type {Vector1}
-         */
-        this.speed = new Vector1(DEFAULT_SPEED);
-
-        /**
-         * Speed at which path follower can adjust rotation in Rad/s
-         * @type {Vector1}
-         */
-        this.rotationSpeed = new Vector1(DEFAULT_ROTATION_SPEED);
-
-        /**
-         *
-         * @type {number}
-         */
-        this.flags = DEFAULT_FLAGS;
 
-        /**
-         * Maximum distance that the follower can move along the path in a single step
-         * @type {number}
-         */
-        this.maxMoveDistance = 100000;
-
-        /**
-         * Absolute position along the path
-         * @type {number}
-         */
-        this.position = 0;
-    }
+    /**
+     * Movement speed along the path in world units per second
+     * @type {Vector1}
+     */
+    speed = new Vector1(DEFAULT_SPEED);
+
+    /**
+     * Speed at which path follower can adjust rotation in Rad/s
+     * @type {Vector1}
+     */
+    rotationSpeed = new Vector1(DEFAULT_ROTATION_SPEED);
+
+    /**
+     *
+     * @type {number}
+     */
+    flags = DEFAULT_FLAGS;
+
+    /**
+     * Maximum distance that the follower can move along the path in a single step
+     * @type {number}
+     */
+    maxMoveDistance = DEFAULT_MAX_MOVE_DISTANCE;
+
+    /**
+     * Absolute position along the path
+     * @type {number}
+     */
+    position = 0;
+
 
     get rotationAlignment() {
         throw new Error(`deprecated, use relevant flag instead`);
@@ -138,7 +139,8 @@ class PathFollower {
 
             speed: this.speed.toJSON(),
             rotationSpeed: this.rotationSpeed.toJSON(),
-            position: this.position
+            position: this.position,
+            maxMoveDistance: this.maxMoveDistance
         };
     }
 
@@ -176,6 +178,12 @@ class PathFollower {
             this.rotationSpeed.set(DEFAULT_ROTATION_SPEED);
         }
 
+        if (typeof json.maxMoveDistance === "number") {
+            this.maxMoveDistance = json.maxMoveDistance;
+        } else {
+            this.maxMoveDistance = DEFAULT_MAX_MOVE_DISTANCE;
+        }
+
         if (json.writePositionX !== undefined) {
             this.writeFlag(PathFollowerFlags.WritePositionX, json.writePositionX);
         }

package/src/engine/navigation/ecs/path_following/PathFollower.spec.js

@@ -0,0 +1,27 @@
+import PathFollower from "./PathFollower.js";
+
+test("constructor does not throw", () => {
+    new PathFollower();
+});
+
+
+test("to/from JSON consistency", () => {
+
+    const source = new PathFollower();
+
+    source.speed.set(13);
+    source.rotationSpeed.set(17);
+    source.flags = 0b1010100101;
+    source.maxMoveDistance = 123;
+    source.position = 27;
+
+    const destination = new PathFollower();
+
+    destination.fromJSON(source.toJSON());
+
+    expect(destination.speed.getValue()).toEqual(13);
+    expect(destination.rotationSpeed.getValue()).toEqual(17);
+    expect(destination.flags).toEqual(0b1010100101);
+    expect(destination.maxMoveDistance).toEqual(123);
+    expect(destination.position).toEqual(27)
+});

package/src/engine/plugin/EnginePlugin.js

@@ -2,22 +2,20 @@ import { BaseProcess } from "../../core/process/BaseProcess.js";
 import { assert } from "../../core/assert.js";
 
 export class EnginePlugin extends BaseProcess {
-    constructor() {
-        super();
 
-        /**
-         *
-         * @type {Class<EnginePlugin>[]}
-         * @private
-         */
-        this.__dependencies = [];
+    /**
+     *
+     * @type {Class<EnginePlugin>[]}
+     * @private
+     */
+    __dependencies = [];
+
+    /**
+     *
+     * @type {Engine|null}
+     */
+    engine = null;
 
-        /**
-         *
-         * @type {Engine|null}
-         */
-        this.engine = null;
-    }
 
     attach() {
         /**

package/src/engine/plugin/EnginePlugin.spec.js

@@ -0,0 +1,5 @@
+import { EnginePlugin } from "./EnginePlugin.js";
+
+test("constructor does not throw", () => {
+    new EnginePlugin();
+});

package/src/engine/plugin/EnginePluginManager.js

@@ -6,29 +6,25 @@ import { isSubclassOf } from "./isSubclassOf.js";
 import { assert } from "../../core/assert.js";
 
 export class EnginePluginManager extends BaseProcess {
-    constructor() {
-        super();
-
-        /**
-         * @private
-         * @type {Map<Class, PluginReferenceContext>}
-         */
-        this.__plugins = new Map();
-
-        /**
-         *
-         * @type {Engine}
-         */
-        this.engine = null;
-
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__version = 0;
-    }
 
+    /**
+     * @private
+     * @type {Map<Class, PluginReferenceContext>}
+     */
+    __plugins = new Map();
+
+    /**
+     *
+     * @type {Engine}
+     */
+    engine = null;
+
+    /**
+     *
+     * @type {number}
+     * @private
+     */
+    __version = 0;
 
     /**
      *

package/src/engine/scene/transitionToScene.js

@@ -9,6 +9,7 @@ import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
 import { actionTask } from "../../core/process/task/util/actionTask.js";
 import { delayTask } from "../../core/process/task/util/delayTask.js";
 import { wrapTaskIgnoreFailure } from "../../core/process/task/util/wrapTaskIgnoreFailure.js";
+import { assert } from "../../core/assert.js";
 
 
 /**
@@ -19,7 +20,17 @@ import { wrapTaskIgnoreFailure } from "../../core/process/task/util/wrapTaskIgno
  * @param {string} [name]
  * @return {Promise}
  */
-export function transitionToScene({ tasks = [], scene, engine, name }) {
+export function transitionToScene({
+                                      tasks = [],
+                                      scene,
+                                      engine,
+                                      name
+                                  }) {
+
+    assert.defined(engine, 'engine');
+    assert.defined(scene, 'scene');
+    assert.isArray(tasks, 'tasks');
+
     if (name === undefined) {
         if (tasks.length > 0) {
             //assume name of the first task

package/src/engine/simulation/Ticker.js

@@ -51,7 +51,7 @@ class Ticker {
      * @param {*} [thisArg]
      */
     unsubscribe(callback, thisArg) {
-        assert.typeOf(callback, 'function', 'callback');
+        assert.isFunction(callback, 'callback');
 
         const callbacks = this.callbacks;
         const n = callbacks.length;

package/src/generation/filtering/CellFilter.js

@@ -3,15 +3,12 @@ import DataType from "../../core/parser/simple/DataType.js";
 
 export class CellFilter {
 
-    constructor() {
-        /**
-         *
-         * @type {boolean}
-         * @protected
-         */
-        this.__initialized = false;
-
-    }
+    /**
+     *
+     * @type {boolean}
+     * @protected
+     */
+    __initialized = false;
 
     /**
      *

package/src/generation/filtering/boolean/CellFilterLiteralBoolean.js

@@ -3,11 +3,8 @@ import DataType from "../../../core/parser/simple/DataType.js";
 import { assert } from "../../../core/assert.js";
 
 export class CellFilterLiteralBoolean extends CellFilter {
-    constructor() {
-        super();
 
-        this.value = true;
-    }
+    value = true;
 
     /**
      *

package/src/generation/filtering/core/CellFilterBinaryOperation.js

@@ -1,21 +1,18 @@
 import { CellFilter } from "../CellFilter.js";
 
 export class CellFilterBinaryOperation extends CellFilter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.left = null;
-
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.right = null;
-    }
+
+    /**
+     *
+     * @type {CellFilter}
+     */
+    left = null;
+
+    /**
+     *
+     * @type {CellFilter}
+     */
+    right = null;
 
     /**
      * @template T,R

package/src/generation/filtering/core/CellFilterOperationTertiary.js

@@ -1,26 +1,22 @@
 import { CellFilter } from "../CellFilter.js";
 
 export class CellFilterOperationTertiary extends CellFilter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.a = null;
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.b = null;
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.c = null;
 
-    }
+    /**
+     *
+     * @type {CellFilter}
+     */
+    a = null;
+    /**
+     *
+     * @type {CellFilter}
+     */
+    b = null;
+    /**
+     *
+     * @type {CellFilter}
+     */
+    c = null;
 
     /**
      *

package/src/generation/filtering/numeric/CellFilterLiteralFloat.js

@@ -2,15 +2,12 @@ import { CellFilter } from "../CellFilter.js";
 import { assert } from "../../../core/assert.js";
 
 export class CellFilterLiteralFloat extends CellFilter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {number}
-         */
-        this.value = 1;
-    }
+
+    /**
+     *
+     * @type {number}
+     */
+    value = 1;
 
     /**
      *

package/src/generation/grid/actions/ContinuousGridCellActionSetTerrainObstacle.js

@@ -1,7 +1,7 @@
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";
 import Terrain from "../../../engine/ecs/terrain/ecs/Terrain.js";
 import { assert } from "../../../core/assert.js";
-import GridObstacle from "../../../engine/grid/components/GridObstacle.js";
+import GridObstacle from "../../../engine/grid/obstacle/GridObstacle.js";
 import { CellFilterLiteralFloat } from "../../filtering/numeric/CellFilterLiteralFloat.js";
 
 export class ContinuousGridCellActionSetTerrainObstacle extends ContinuousGridCellAction {

package/src/generation/grid/actions/ContinuousGridCellActionWriteObstacle.js

@@ -1,8 +1,8 @@
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";
 import { CellFilterLiteralFloat } from "../../filtering/numeric/CellFilterLiteralFloat.js";
 import Terrain from "../../../engine/ecs/terrain/ecs/Terrain.js";
-import GridPosition from "../../../engine/grid/components/GridPosition.js";
-import GridObstacle from "../../../engine/grid/components/GridObstacle.js";
+import GridPosition from "../../../engine/grid/position/GridPosition.js";
+import GridObstacle from "../../../engine/grid/obstacle/GridObstacle.js";
 
 
 export class ContinuousGridCellActionWriteObstacle extends ContinuousGridCellAction {

package/src/generation/grid/generation/road/GridTaskGenerateRoads.js

@@ -9,7 +9,7 @@ import { BitSet } from "../../../../core/binary/BitSet.js";
 import { matcher_tag_traversable } from "../../../../../samples/generation/rules/matcher_tag_traversable.js";
 import { buildPathFromDistanceMap } from "../util/buildPathFromDistanceMap.js";
 import { GridCellActionPlaceTags } from "../../../placement/action/GridCellActionPlaceTags.js";
-import { GridTags } from "../../../GridTags.js";
+import { GridTags } from "../../../../../samples/generation/grid/GridTags.js";
 import { CellMatcher } from "../../../rules/CellMatcher.js";
 import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { QuadTreeNode } from "../../../../core/geom/2d/quad-tree/QuadTreeNode.js";

package/src/generation/markers/actions/MarkerNodeActionEntityPlacement.js

@@ -1,5 +1,5 @@
 import { MarkerNodeAction } from "./MarkerNodeAction.js";
-import GridPosition from "../../../engine/grid/components/GridPosition.js";
+import GridPosition from "../../../engine/grid/position/GridPosition.js";
 import { Transform } from "../../../engine/ecs/transform/Transform.js";
 import { EntityBlueprint } from "../../../engine/ecs/EntityBlueprint.js";
 

package/src/generation/theme/TerrainLayerDescription.js

@@ -17,7 +17,7 @@ export class TerrainLayerDescription {
     }
 
     hash() {
-        return computeStringHash(this.diffuse) ^ this.size.hashCode();
+        return computeStringHash(this.diffuse) ^ this.size.hash();
     }
 
     /**

package/src/view/common/LabelView.js

@@ -3,7 +3,6 @@
  * @copyright Alex Goldring 2016
  */
 import View from "../View.js";
-import { prettyPrint } from "../../core/NumberFormat.js";
 import ObservedValue from "../../core/model/ObservedValue.js";
 import Vector1 from "../../core/geom/Vector1.js";
 import LinearValue from "../../core/model/LinearValue.js";
@@ -17,6 +16,7 @@ import { assert } from "../../core/assert.js";
 import ObservedInteger from "../../core/model/ObservedInteger.js";
 import { noop } from "../../core/function/Functions.js";
 import { isTypedArray } from "../../core/collection/array/typed/isTypedArray.js";
+import { number_pretty_print } from "../../core/primitives/numbers/number_pretty_print.js";
 
 
 /**
@@ -26,7 +26,7 @@ import { isTypedArray } from "../../core/collection/array/typed/isTypedArray.js"
  */
 function format(value) {
     if (typeof value === 'number') {
-        return prettyPrint(value);
+        return number_pretty_print(value);
     } else {
         return value;
     }
@@ -38,7 +38,7 @@ function format(value) {
  * @returns {string|number}
  */
 function formatNumber(v) {
-    return prettyPrint(v);
+    return number_pretty_print(v);
 }
 
 function formatArray(arr) {

package/src/engine/ecs/components/AimController.js

@@ -1,18 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 13/6/2014
- * Time: 22:32
- */
-
-
-function AimController(options) {
-    this.xDelta = 0;
-    this.yDelta = 0;
-    //
-    this.lon = 0;
-    this.lat = 0;
-    this.phi = 0;
-    this.theta = 0;
-}
-
-export default AimController;

package/src/engine/ecs/components/Attacker.js

@@ -1,13 +0,0 @@
-/**
- * Created by Alex on 30/06/2014.
- */
-
-
-function Attacker(options) {
-    this.target = null;
-    this.range = options.range || 0;
-    this.delay = options.delay || 1;
-    this.timerValue = 0;
-}
-
-export default Attacker;

package/src/engine/ecs/components/MeshCollider.js

@@ -1,15 +0,0 @@
-/**
- * Created by hdnha on 7/24/2014.
- */
-
-
-/**
- * @deprecated
- * @param options
- * @constructor
- */
-function MeshCollider(options) {
-    this.tags = options.tags.slice();
-}
-
-export default MeshCollider;

package/src/engine/ecs/components/RangedAttack.js

@@ -1,12 +0,0 @@
-/**
- * Created by Alex on 13/08/2014.
- */
-
-
-function RangedAttack(options) {
-    this.factory = options.factory || null;
-    this.speed = options.speed || 1;
-    this.projectileOffset = options.offset || new THREE.Vector3(0, 0, 0);
-}
-
-export default RangedAttack;

package/src/engine/ecs/components/TargetAI.js

@@ -1,11 +0,0 @@
-/**
- * Created by Alex on 30/06/2014.
- */
-
-
-function TargetAI(options) {
-    this.tags = options.tags || [];
-    this.range = options.range || 0;
-}
-
-export default TargetAI;

package/src/engine/ecs/components/ViewportMeshProjection.js

@@ -1,18 +0,0 @@
-/**
- * Created by Alex on 18/12/2014.
- */
-
-import Vector2 from "../../../core/geom/Vector2.js";
-
-function ViewportMeshProjection(options) {
-    if (options === void 0) {
-        options = {};
-    }
-    this.position = options.position !== void 0 ? options.position : new Vector2();
-    this.entity = options.entity;
-}
-
-
-ViewportMeshProjection.typeName = "ViewportMeshProjection";
-
-export default ViewportMeshProjection;

package/src/engine/ecs/systems/AimControllerSystem.js

@@ -1,63 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 13/6/2014
- * Time: 22:33
- */
-import { System } from '../System.js';
-import AimController from '../components/AimController.js';
-import CharacterController from '../components/CharacterController.js';
-import { Transform } from '../transform/Transform.js';
-import { DEG_TO_RAD } from "../../../core/math/DEG_TO_RAD.js";
-
-
-class AimControllerSystem extends System {
-    constructor() {
-        super();
-        this.dependencies = [AimController];
-
-        this.sensitivity = 5 * DEG_TO_RAD;
-    }
-
-    add(component, entity) {
-    }
-
-    remove(component) {
-    }
-
-    update(timeDelta) {
-        const entityManager = this.entityManager;
-        const sensitivity = this.sensitivity;
-        entityManager.traverseEntities([AimController, CharacterController, Transform], function (aimController, character, transform) {
-            //update controller
-            updateController(aimController, sensitivity);
-            //rotate player
-            const quaternion = new THREE.Quaternion();
-            quaternion.setFromAxisAngle(new THREE.Vector3(0, 1, 0), -aimController.lon * DEG_TO_RAD);
-            transform.rotation.copy(quaternion);
-            //rotate aim transform
-            const aimTransform = character.aim;
-            if (aimTransform !== void 0) {
-                const e = new THREE.Euler();
-                e.setFromQuaternion(aimTransform.rotation);
-                e.x = -(aimController.phi - Math.PI / 2);
-                aimTransform.rotation.setFromEuler(e);
-            }
-        });
-    }
-}
-
-
-function updateController(aim, sensitivity) {
-    aim.lon += sensitivity * aim.xDelta;
-    aim.lat -= sensitivity * aim.yDelta;
-    //reset deltas
-    aim.xDelta = 0;
-    aim.yDelta = 0;
-
-    aim.lat = Math.max(-85, Math.min(85, aim.lat));
-    aim.phi = THREE.Math.degToRad(90 - aim.lat);
-
-    aim.theta = THREE.Math.degToRad(aim.lon);
-}
-
-export default AimControllerSystem;