@woosh/meep-engine 2.52.0 → 2.53.0

package/src/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -24,10 +24,10 @@ import WaterSystem from "../../../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";

package/src/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -25,10 +25,10 @@ import WaterSystem from "../../../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";

package/src/engine/graphics/render/visibility/hiz/prototypeHiZ.js

@@ -24,10 +24,10 @@ import WaterSystem from "../../../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../../../ecs/trail2d/Trail2DSystem.js";
 import { Foliage2System } from "../../../../ecs/foliage/ecs/Foliage2System.js";
 import ViewportPositionSystem from "../../../../ecs/gui/position/ViewportPositionSystem.js";
-import { GridPosition2TransformSystem } from "../../../../grid/systems/GridPosition2TransformSystem.js";
+import { GridPosition2TransformSystem } from "../../../../grid/grid2transform/GridPosition2TransformSystem.js";
 import { Transform2GridPositionSystem } from "../../../../grid/transform2grid/Transform2GridPositionSystem.js";
 import SynchronizePositionSystem from "../../../../ecs/systems/SynchronizePositionSystem.js";
-import GridPositionSystem from "../../../../grid/systems/GridPositionSystem.js";
+import GridPositionSystem from "../../../../grid/position/GridPositionSystem.js";
 import InputControllerSystem from "../../../../input/ecs/systems/InputControllerSystem.js";
 import { InputSystem } from "../../../../input/ecs/systems/InputSystem.js";
 import MeshHighlightSystem from "../../../ecs/highlight/system/MeshHighlightSystem.js";

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

@@ -21,7 +21,10 @@ const DATA_TEXTURE_WIDTH = 128;
 const SHRINK_FACTOR = 0.5;
 const GROW_FACTOR = 1.05;
 
-
+/**
+ * Mainly used for storing non-color data in GPU memory
+ * Useful for things like simulation and running general purpose GPU compute inside fragment shaders
+ */
 export class TextureBackedMemoryRegion {
 
     constructor() {

package/src/engine/graphics/texture/sampler/filter/filter_lanczos3.js

@@ -5,15 +5,20 @@ export function filter_lanczos3(x) {
     //     x = -x;
     // }
 
-    if (x > 3) {
+    const lobes = 3;
+
+    if (x > lobes) {
         return 0;
     }
 
     if (x < 1.1920929e-7) {
+        // distance is very close to 0
         return 1;
     }
 
-    return (3 * Math.sin(Math.PI * x) * Math.sin(Math.PI * x / 3)) / (Math.PI * Math.PI * x * x);
+    const px = Math.PI * x;
+
+    return (lobes * Math.sin(px) * Math.sin(px / lobes)) / (px * px);
 
 }
 

package/src/engine/grid/{components → grid2transform}/GridPosition2Transform.js

@@ -1,5 +1,4 @@
 import Vector2 from "../../../core/geom/Vector2.js";
-import { BinaryClassUpgrader } from "../../ecs/storage/binary/BinaryClassUpgrader.js";
 import { GridPosition2TransformFlags } from "./GridPosition2TransformFlags.js";
 
 /**
@@ -121,43 +120,3 @@ export class GridPosition2Transform {
 }
 
 GridPosition2Transform.typeName = "GridPosition2Transform";
-
-
-export class GridPosition2TransformSerializationUpgrader_0_1 extends BinaryClassUpgrader {
-    constructor() {
-        super();
-
-        //
-        this.__startVersion = 0;
-        this.__targetVersion = 1;
-    }
-
-    upgrade(source, target) {
-        const offsetX = source.readFloat64();
-        const offsetY = source.readFloat64();
-
-        let header = 3;
-        if (offsetX === 0 && offsetY === 0) {
-            header = 0;
-        } else if (offsetX === 0) {
-            header = 2;
-        } else if (offsetY === 0) {
-            header = 1;
-        } else {
-            //both coordinates are present
-            header = 3;
-        }
-
-        target.writeUint8(header);
-
-        if ((header & 1) !== 0) {
-            //write X
-            target.writeFloat32(offsetX);
-        }
-
-        if ((header & 2) !== 0) {
-            //write Y
-            target.writeFloat32(offsetY);
-        }
-    }
-}

package/src/engine/grid/grid2transform/GridPosition2TransformSerializationUpgrader_0_1.js

@@ -0,0 +1,40 @@
+import { BinaryClassUpgrader } from "../../ecs/storage/binary/BinaryClassUpgrader.js";
+
+export class GridPosition2TransformSerializationUpgrader_0_1 extends BinaryClassUpgrader {
+    constructor() {
+        super();
+
+        //
+        this.__startVersion = 0;
+        this.__targetVersion = 1;
+    }
+
+    upgrade(source, target) {
+        const offsetX = source.readFloat64();
+        const offsetY = source.readFloat64();
+
+        let header = 3;
+        if (offsetX === 0 && offsetY === 0) {
+            header = 0;
+        } else if (offsetX === 0) {
+            header = 2;
+        } else if (offsetY === 0) {
+            header = 1;
+        } else {
+            //both coordinates are present
+            header = 3;
+        }
+
+        target.writeUint8(header);
+
+        if ((header & 1) !== 0) {
+            //write X
+            target.writeFloat32(offsetX);
+        }
+
+        if ((header & 2) !== 0) {
+            //write Y
+            target.writeFloat32(offsetY);
+        }
+    }
+}

package/src/engine/grid/{systems → grid2transform}/GridPosition2TransformSystem.js

@@ -3,10 +3,10 @@
  */
 import { System } from '../../ecs/System.js';
 import { Transform } from '../../ecs/transform/Transform.js';
-import GridPosition from '../components/GridPosition.js';
-import { GridPosition2Transform } from '../components/GridPosition2Transform.js';
+import GridPosition from '../position/GridPosition.js';
+import { GridPosition2Transform } from './GridPosition2Transform.js';
 import Vector3 from "../../../core/geom/Vector3.js";
-import { GridPosition2TransformFlags } from "../components/GridPosition2TransformFlags.js";
+import { GridPosition2TransformFlags } from "./GridPosition2TransformFlags.js";
 import { obtainTerrain } from "../../ecs/terrain/util/obtainTerrain.js";
 import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";

package/src/engine/grid/{components → position}/GridPosition.js

@@ -10,6 +10,10 @@ import Vector2 from '../../../core/geom/Vector2.js';
  */
 class GridPosition extends Vector2 {
 
+    /**
+     *
+     * @return {GridPosition}
+     */
     clone() {
         const clone = new GridPosition();
 

package/src/engine/grid/{systems → position}/GridPositionSystem.js

@@ -2,7 +2,7 @@
  * Created by Alex on 13/10/2014.
  */
 import { System } from '../../ecs/System.js';
-import GridPosition from '../components/GridPosition.js';
+import GridPosition from './GridPosition.js';
 import { QuadTreeNode } from "../../../core/geom/2d/quad-tree/QuadTreeNode.js";
 
 class GridPositionSystem extends System {

package/src/engine/grid/transform2grid/Transform2GridPositionSystem.js

@@ -1,6 +1,6 @@
 import { System } from "../../ecs/System.js";
 import { Transform2GridPosition } from "./Transform2GridPosition.js";
-import GridPosition from "../components/GridPosition.js";
+import GridPosition from "../position/GridPosition.js";
 import { Transform } from "../../ecs/transform/Transform.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import { Transform2GridPositionMode } from "./Transform2GridPositionMode.js";

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