@woosh/meep-engine 2.52.0 → 2.54.0

package/src/engine/ecs/team/Team.js

@@ -2,7 +2,6 @@
  * Created by Alex on 13/04/2016.
  */
 import ObservedInteger from "../../../core/model/ObservedInteger.js";
-import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 
 class Team extends ObservedInteger {
     /**
@@ -37,46 +36,3 @@ Team.typeName = "Team";
 
 export default Team;
 
-export class TeamSerializationAdapter extends BinaryClassSerializationAdapter{
-    constructor(){
-        super();
-
-        this.klass = Team;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Team} value
-     */
-    serialize(buffer, value) {
-        const v = value.getValue();
-
-        if (v === Infinity) {
-            buffer.writeInt32(2147483647);
-        } else if (v === -Infinity) {
-            buffer.writeInt32(-2147483648);
-        } else {
-            //TODO it's possible to write encoded Infinity values by accident
-            buffer.writeInt32(v);
-        }
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Team} value
-     */
-    deserialize(buffer, value) {
-        const v = buffer.readInt32();
-
-        if (v === 2147483647) {
-            value.set(Infinity);
-        } else if (v === -2147483648) {
-            value.set(-Infinity);
-        } else {
-            value.set(v);
-        }
-    }
-}

package/src/engine/ecs/team/TeamSerializationAdapter.js

@@ -0,0 +1,46 @@
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+import Team from "./Team.js";
+
+export class TeamSerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = Team;
+        this.version = 0;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Team} value
+     */
+    serialize(buffer, value) {
+        const v = value.getValue();
+
+        if (v === Infinity) {
+            buffer.writeInt32(2147483647);
+        } else if (v === -Infinity) {
+            buffer.writeInt32(-2147483648);
+        } else {
+            //TODO it's possible to write encoded Infinity values by accident
+            buffer.writeInt32(v);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Team} value
+     */
+    deserialize(buffer, value) {
+        const v = buffer.readInt32();
+
+        if (v === 2147483647) {
+            value.set(Infinity);
+        } else if (v === -2147483648) {
+            value.set(-Infinity);
+        } else {
+            value.set(v);
+        }
+    }
+}

package/src/engine/ecs/terrain/overlay/TerrainOverlay.spec.js

@@ -0,0 +1,6 @@
+import { TerrainOverlay } from "./TerrainOverlay.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+
+test("constructor does not throw", () => {
+    new TerrainOverlay(new Vector2(1, 1))
+});

package/src/engine/ecs/terrain/tiles/TerrainTile.js

@@ -33,98 +33,101 @@ import { passThrough } from "../../../../core/function/Functions.js";
  * terrain tile is a part of a 2d array
  */
 class TerrainTile {
-    constructor() {
-        this.gridPosition = new Vector2();
-        this.scale = new Vector2(1, 1);
-        this.size = new Vector2();
-        this.position = new Vector2();
-        this.resolution = new ObservedInteger(1);
+    gridPosition = new Vector2();
+    scale = new Vector2(1, 1);
+    size = new Vector2();
+    position = new Vector2();
+    resolution = new ObservedInteger(1);
 
-        /**
-         *
-         * @type {Material}
-         */
-        this.material = null;
-        this.mesh = ThreeFactory.createMesh();
+    /**
+     *
+     * @type {Material}
+     */
+    material = null;
+    mesh = ThreeFactory.createMesh();
 
-        this.mesh.name = "TerrainTile";
 
-        /**
-         * Terrain mesh is static, it never changes its transform. Updates are wasteful.
-         * @type {boolean}
-         */
-        this.mesh.matrixWorldNeedsUpdate = false;
+    /**
+     *
+     * @type {THREE.BufferGeometry}
+     */
+    geometry = null;
 
-        /**
-         *
-         * @type {THREE.BufferGeometry}
-         */
-        this.geometry = null;
+    /**
+     *
+     * @type {boolean}
+     */
+    enableBVH = true;
 
-        /**
-         *
-         * @type {boolean}
-         */
-        this.enableBVH = true;
+    /**
+     *
+     * @type {LeafNode}
+     */
+    boundingBox = new LeafNode(this);
 
-        /**
-         *
-         * @type {LeafNode}
-         */
-        this.boundingBox = new LeafNode(this);
+    /**
+     *
+     * @type {BinaryNode}
+     */
+    bvh = null;
 
-        /**
-         *
-         * @type {BinaryNode}
-         */
-        this.bvh = null;
+    /**
+     *
+     * @type {boolean}
+     */
+    isBuilt = false;
+    /**
+     *
+     * @type {boolean}
+     */
+    isBuildInProgress = false;
+    referenceCount = 0;
 
-        /**
-         *
-         * @type {boolean}
-         */
-        this.isBuilt = false;
-        /**
-         *
-         * @type {boolean}
-         */
-        this.isBuildInProgress = false;
-        this.referenceCount = 0;
+    /**
+     *
+     * @type {Signal<TerrainTile>}
+     */
+    onBuilt = new Signal();
+    onDestroyed = new Signal();
 
-        /**
-         *
-         * @type {Signal<TerrainTile>}
-         */
-        this.onBuilt = new Signal();
-        this.onDestroyed = new Signal();
+    /**
+     * Encodes whether stitching has been performed on per-neighbour basis
+     * @private
+     * @type {{bottomLeft: boolean, top: boolean, left: boolean, bottom: boolean, bottomRight: boolean, topLeft: boolean, topRight: boolean, right: boolean}}
+     */
+    stitching = {
+        top: false,
+        bottom: false,
+        left: false,
+        right: false,
 
-        /**
-         * Encodes whether stitching has been performed on per-neighbour basis
-         * @private
-         * @type {{bottomLeft: boolean, top: boolean, left: boolean, bottom: boolean, bottomRight: boolean, topLeft: boolean, topRight: boolean, right: boolean}}
-         */
-        this.stitching = {
-            top: false,
-            bottom: false,
-            left: false,
-            right: false,
+        topLeft: false,
+        topRight: false,
+
+        bottomLeft: false,
+        bottomRight: false
+    };
 
-            topLeft: false,
-            topRight: false,
+    /**
+     * Initial estimate of height bounds for this tile
+     * Untransformed by transform matrix
+     * @type {NumericInterval}
+     * @private
+     */
+    __initial_height_range = new NumericInterval(Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY);
 
-            bottomLeft: false,
-            bottomRight: false
-        };
+    raycaster = new BVHGeometryRaycaster();
+
+    constructor() {
+
+        this.mesh.name = "TerrainTile";
 
         /**
-         * Initial estimate of height bounds for this tile
-         * Untransformed by transform matrix
-         * @type {NumericInterval}
-         * @private
+         * Terrain mesh is static, it never changes its transform. Updates are wasteful.
+         * @type {boolean}
          */
-        this.__initial_height_range = new NumericInterval(Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY);
+        this.mesh.matrixWorldNeedsUpdate = false;
 
-        this.raycaster = new BVHGeometryRaycaster();
         //Binary BVH form doesn't have distinct leaf objects and stores face indices directly, this requires a special face index extractor that treats leaves as indices directly.
         this.raycaster.extractFaceIndexFromLeaf = passThrough;
     }

package/src/engine/ecs/terrain/tiles/TerrainTile.spec.js

@@ -0,0 +1,25 @@
+import TerrainTile from "./TerrainTile.js";
+import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+
+test("constructor does not throw", () => {
+    new TerrainTile();
+});
+
+test("get/set transform", () => {
+
+    const tile = new TerrainTile();
+    tile.setInitialHeightBounds(1, 7);
+
+    tile.transform = MATRIX_4_IDENTITY;
+
+    expect(Array.from(tile.transform)).toEqual(Array.from(MATRIX_4_IDENTITY));
+
+});
+
+test("using 'dispose' method on newly created tile", () => {
+
+    const tile = new TerrainTile();
+
+    expect(() => tile.dispose()).not.toThrow();
+    
+});

package/src/engine/ecs/transform/Transform.js

@@ -303,7 +303,7 @@ export class Transform {
     }
 
     /**
-     *
+     * Write out the current transform to a supplied container
      * @param {number[]|Float32Array} result
      */
     toMatrix4(result) {

package/src/engine/ecs/transform/Transform.spec.js

@@ -149,3 +149,27 @@ test("writeFlag", () => {
 
     expect(ut.flags).toBe(1);
 });
+
+test("toMatrix from identity transform", () => {
+    const t = new Transform();
+
+    t.makeIdentity();
+
+    const matrix = [];
+
+    t.toMatrix4(matrix);
+
+    expect(matrix).toEqual(Array.from(MATRIX_4_IDENTITY));
+});
+
+test("hash", () => {
+
+    const t = new Transform();
+
+    const hash = t.hash();
+
+    expect(typeof hash).toBe("number");
+    expect(Number.isInteger(hash)).toBe(true);
+    expect(t.hash()).toEqual(hash);
+
+});

package/src/engine/graphics/camera/testClippingPlaneComputation.js

@@ -23,10 +23,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/ecs/path/tube/prototypeAnimatedPathMask.js

@@ -24,10 +24,10 @@ import WaterSystem from "../../water/WaterSystem.js";
 import Trail2DSystem from "../../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 "../../highlight/system/MeshHighlightSystem.js";

package/src/engine/graphics/ecs/water2/shader/testWaterShader.js

@@ -11,10 +11,10 @@ import { MeshSystem } from "../../mesh/MeshSystem.js";
 import TerrainSystem from "../../../../ecs/terrain/ecs/TerrainSystem.js";
 import WaterSystem from "../../water/WaterSystem.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 "../../highlight/system/MeshHighlightSystem.js";

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');