@woosh/meep-engine 2.52.0 → 2.54.0

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/platform/EnginePlatform.js

@@ -1,8 +1,4 @@
 export class EnginePlatform {
-    constructor() {
-    }
-
-
     /**
      * @returns {Storage}
      */

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/engine/InputEngine.js

@@ -1,94 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 22/6/2014
- * Time: 20:15
- */
-import { KeyCodes } from './input/devices/KeyCodes.js';
-import { assert } from "../core/assert.js";
-
-/**
- * @deprecated use PointerDevice and KeyboardDevice respectively
- * @param pointerContext
- * @param keyContext
- * @constructor
- */
-const InputEngine = function (pointerContext, keyContext) {
-    assert.defined(pointerContext, 'pointerContext');
-    assert.defined(keyContext, 'keyContext');
-
-    console.warn('deprecated, use PointerDevice and KeyboardDevice instead');
-
-    const keyMap = [];
-    const mouseMap = {};
-
-    function obtainBindingByCode(code) {
-        let binding;
-        if (typeof (code) === "number") {
-            if (keyMap[code] === void 0) {
-                keyMap[code] = {};
-            }
-            binding = keyMap[code];
-        } else {
-            if (mouseMap[code] === void 0) {
-                mouseMap[code] = {};
-            }
-            binding = mouseMap[code];
-        }
-        return binding;
-    }
-
-    this.mapKey = function (keyCode, config) {
-        const binding = obtainBindingByCode(keyCode);
-        if (config.on) {
-            binding.on = config.on;
-        }
-        if (config.off) {
-            binding.off = config.off;
-        }
-    };
-    this.mapKeyBoolean = function (keyName, context, property) {
-        const keyCode = KeyCodes[keyName];
-        const binding = obtainBindingByCode(keyCode);
-        binding.on = function () {
-            context[property] = true;
-        };
-        binding.off = function () {
-            context[property] = false;
-        };
-        return this;
-    };
-    const keyDownHandler = function (event) {
-        const keyCode = event.keyCode;
-        //console.log("down", keyCode);
-        const binding = keyMap[keyCode];
-        if (binding && binding.on) {
-            binding.on(event);
-        }
-    };
-    const keyUpHandler = function (event) {
-        const keyCode = event.keyCode;
-        const binding = keyMap[keyCode];
-        if (binding && binding.off) {
-            binding.off(event);
-        }
-    };
-    const mouseUpHandler = function (event) {
-        const mouse1 = mouseMap.mouse1;
-        if (mouse1) {
-            mouse1.off(event);
-        }
-    };
-    const mouseDownHandler = function (event) {
-        const mouse1 = mouseMap.mouse1;
-        if (mouse1) {
-            mouse1.on(event);
-        }
-    };
-    keyContext.addEventListener("keydown", keyDownHandler);
-    keyContext.addEventListener("keyup", keyUpHandler);
-    pointerContext.addEventListener("mousedown", mouseDownHandler);
-    pointerContext.addEventListener("mouseup", mouseUpHandler);
-    //
-
-};
-export default InputEngine;

package/src/engine/PointerLock.js

@@ -1,60 +0,0 @@
-/**
- * Created by Alex on 27/02/14.
- */
-
-
-
-function getPointerLockElement() {
-    const pointerLockElement = document.pointerLockElement ||
-        document.mozPointerLockElement ||
-        document.webkitPointerLockElement;
-    return pointerLockElement;
-}
-
-function PointerLock(element) {
-    this.element = element;
-    element.requestPointerLock = element.requestPointerLock ||
-        element.mozRequestPointerLock ||
-        element.webkitRequestPointerLock;
-    element.exitPointerLock = element.exitPointerLock ||
-        element.mozExitPointerLock ||
-        element.webkitExitPointerLock;
-    this.pointerLockError = (function (evt) {
-        console.error("failed to lock pointer", evt);
-    }).bind(this);
-    this.pointerLockChange = (function (evt) {
-        if (this.isBound()) {
-            this.emit("locked");
-        } else {
-            this.unlock();
-        }
-    }).bind(this);
-}
-
-PointerLock.prototype = new EventEmitter();
-PointerLock.prototype.isBound = function () {
-    return this.element === getPointerLockElement();
-};
-PointerLock.prototype.lock = function () {
-    if (this.isBound()) {
-        return;
-    }
-    document.addEventListener('pointerlockerror', this.pointerLockError, false);
-    document.addEventListener('mozpointerlockerror', this.pointerLockError, false);
-    document.addEventListener('webkitpointerlockerror', this.pointerLockError, false);
-
-    document.addEventListener('pointerlockchange', this.pointerLockChange, false);
-    document.addEventListener('mozpointerlockchange', this.pointerLockChange, false);
-    document.addEventListener('webkitpointerlockchange', this.pointerLockChange, false);
-    this.element.requestPointerLock();
-};
-PointerLock.prototype.unlock = function () {
-    document.removeEventListener('pointerlockchange', this.pointerLockChange, false);
-    document.removeEventListener('mozpointerlockchange', this.pointerLockChange, false);
-    document.removeEventListener('webkitpointerlockchange', this.pointerLockChange, false);
-    if (this.isBound()) {
-        this.element.exitPointerLock();
-    }
-    this.emit("unlocked");
-};
-export default PointerLock;

package/src/engine/ecs/terrain/ecs/layers/loadLegacyTerrainLayers.js

@@ -1,99 +0,0 @@
-import { max2 } from "../../../../../core/math/max2.js";
-import { TerrainLayer } from "./TerrainLayer.js";
-import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
-
-/**
- *
- * @param {{repeat:Vector2,textures:{diffuse:string[]}}} description
- * @param {TerrainLayers} layers
- * @param {AssetManager} am
- * @param {Vector2} size
- * @param {number} gridScale
- * @returns {Promise}
- */
-export function loadLegacyTerrainLayers(description, layers, am, size, gridScale) {
-
-    /**
-     *
-     * @type {string[]}
-     */
-    const textures = description.textures.diffuse;
-
-    /**
-     *
-     * @param {string} url
-     * @param {number} layerIndex
-     * @return {Promise<Asset>}
-     */
-    function loadLayer(url, layerIndex) {
-
-        /**
-         *
-         * @type {TerrainLayer}
-         */
-        const layer = layers.layers.get(layerIndex);
-
-        layer.textureDiffuseURL = url;
-
-        return layer.loadTextureData(am);
-    }
-
-    const layerCount = textures.length;
-
-    for (let i = 0; i < layerCount; i++) {
-
-        const layer = new TerrainLayer();
-
-
-        const nX = gridScale * (size.x / size.y);
-        const nY = gridScale;
-
-        layer.size.set(nX / description.repeat.x, nY / description.repeat.y);
-
-        layer.diffuse = Sampler2D.uint8(3, layers.resolution.x, layers.resolution.y);
-
-        layers.addLayer(layer);
-    }
-
-    layers.buildTexture();
-
-    const promises = [];
-
-    for (let i = 0; i < layerCount; i++) {
-        const url = textures[i];
-
-        const promise = loadLayer(url, i);
-
-        promises.push(promise);
-    }
-
-    function updateResolution() {
-
-        let size_x = 0;
-        let size_y = 0;
-
-        for (let i = 0; i < layerCount; i++) {
-            const layer = layers.get(i);
-
-            size_x = max2(layer.diffuse.width, size_x);
-            size_y = max2(layer.diffuse.height, size_y);
-        }
-
-        layers.resolution.set(size_x, size_y);
-
-        layers.buildTexture();
-    }
-
-    function writeLayers() {
-
-        layers.writeAllLayersDataIntoTexture();
-    }
-
-
-    return Promise.all(promises)
-        .then(() => {
-            updateResolution();
-
-            writeLayers();
-        });
-}

package/src/engine/ecs/terrain/ecs/splat/loadLegacyTerrainSplats.js

@@ -1,73 +0,0 @@
-import { GameAssetType } from "../../../../asset/GameAssetType.js";
-import { max2 } from "../../../../../core/math/max2.js";
-import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
-
-/**
- *
- * @param {{textures:{splat:string[]}}} description
- * @param {SplatMapping} mapping
- * @param {AssetManager} am
- * @returns {Promise}
- */
-export function loadLegacyTerrainSplats(description, mapping, am) {
-
-
-    const textures = description.textures.splat;
-
-    const n = textures.length;
-
-    /**
-     *
-     * @param {string} url
-     * @param {number} index
-     * @return {Promise<Asset>}
-     */
-    function loadSplat(url, index) {
-
-        return am.promise(url, GameAssetType.Image)
-            .then(asset => {
-
-                const image = asset.create();
-
-                // FIXME texture array in three.js doesn't work when texture size is less than 4x4
-                const width = max2(image.width, 4);
-                const height = max2(image.height, 4);
-
-                //create a sampler
-                const source = new Sampler2D(image.data, 4, image.width, image.height);
-
-                mapping.resize(width, height, 4);
-
-                mapping.writeLayerFromSampler(source, index, 0);
-
-            });
-    }
-
-    const weightPromises = [];
-
-    for (let i = 0; i < n; i++) {
-        const url = textures[i];
-
-        const promise = loadSplat(url, i);
-
-        weightPromises.push(promise);
-    }
-
-    return Promise.all(weightPromises)
-        .then(() => {
-            const materialData = mapping.materialData;
-
-            const n = materialData.length;
-
-            for (let i = 0; i < n; i += 4) {
-                materialData[i] = 0;
-                materialData[i + 1] = 1;
-                materialData[i + 2] = 2;
-                materialData[i + 3] = 3;
-            }
-
-            mapping.materialTexture.needsUpdate = true;
-            mapping.weightTexture.needsUpdate = true;
-
-        });
-}

package/src/engine/graphics/texture/ExportCanvasAsPNG.js

@@ -1,7 +0,0 @@
-/**
- * Created by Alex on 26/04/2015.
- */
-export default function (canvas) {
-    const dataURL = canvas.toDataURL("image/png;base64;");
-    window.open(dataURL, "", "width=" + canvas.width + ",height=" + canvas.height);
-};