@woosh/meep-engine 2.43.13 → 2.43.15

package/core/math/quadraticCurve.js

@@ -0,0 +1,11 @@
+/**
+ *
+ * @param {Number} t
+ * @param {Number} p0
+ * @param {Number} p1
+ * @param {Number} p2
+ * @return {number}
+ */
+export function quadraticCurve(t, p0, p1, p2) {
+    return (1 - t) * (1 - t) * p0 + 2 * (1 - t) * t * p1 + t * t * p2;
+}

package/core/math/quadraticCurve.spec.js

@@ -0,0 +1,13 @@
+import { quadraticCurve } from "./quadraticCurve.js";
+
+test("quadraticCurve", () => {
+    expect(quadraticCurve(2, 0.1, 0.2, 3)).toBe(11.3);
+
+    expect(quadraticCurve(1, -1, -2, -3)).toBe(-3);
+
+    expect(quadraticCurve(-1, -1, 0, 0)).toBe(-4);
+
+    expect(quadraticCurve(-1, -1, 1, 0)).toBe(-8);
+
+    expect(quadraticCurve(-1, 0, 0, 0)).toBe(0);
+});

package/core/math/sign.spec.js

@@ -0,0 +1,13 @@
+import { sign } from "./sign.js";
+
+test('sign', () => {
+    expect(sign(1)).toBe(1);
+
+    expect(sign(-1)).toBe(-1);
+
+    expect(sign(0)).toBe(0);
+
+    expect(sign(2)).toBe(1);
+
+    expect(sign(-2)).toBe(-1);
+});

package/core/model/stat/Stat.js

@@ -2,9 +2,10 @@ import { assert } from "../../assert.js";
 import List from "../../collection/list/List.js";
 import { chainFunctions } from "../../function/Functions.js";
 import Vector1 from "../../geom/Vector1.js";
-import { EPSILON, epsilonEquals } from "../../math/MathUtils.js";
 import { max2 } from "../../math/max2.js";
 import LinearModifier from "./LinearModifier.js";
+import { epsilonEquals } from "../../math/epsilonEquals.js";
+import { EPSILON } from "../../math/EPSILON.js";
 
 class Stat extends Number {
     /**

package/engine/EngineHarness.js

@@ -28,6 +28,7 @@ import { ConsoleLoggerBackend } from "./logging/ConsoleLoggerBackend.js";
 import { noop } from "../core/function/Functions.js";
 import SoundListenerSystem from "./sound/ecs/SoundListenerSystem.js";
 import SoundListener from "./sound/ecs/SoundListener.js";
+import { getURLHash } from "./platform/GetURLHash.js";
 
 /**
  *
@@ -35,29 +36,6 @@ import SoundListener from "./sound/ecs/SoundListener.js";
  * @returns {Promise}
  */
 function setLocale(engine) {
-    function getURLHash() {
-        const result = {};
-
-        if (window === undefined) {
-            return result;
-        }
-
-        const location = window.location;
-
-        const hash = location.hash;
-
-        const hashRegEx = /([a-zA-Z0-9\-\_]+)\=([a-zA-Z0-9\-\_]+)/g;
-
-        let match;
-        while ((match = hashRegEx.exec(hash)) !== null) {
-            const variableName = match[1];
-            const value = match[2];
-
-            result[variableName] = value;
-        }
-
-        return result;
-    }
 
     const urlHash = getURLHash();
 
@@ -83,6 +61,10 @@ export class EngineHarness {
 
         logger.addBackend(ConsoleLoggerBackend.INSTANCE);
 
+        /**
+         * @readonly
+         * @type {Promise|null}
+         */
         this.p = null;
     }
 

package/engine/achievements/AchievementManager.js

@@ -10,7 +10,6 @@ import EntityBuilder from "../ecs/EntityBuilder.js";
 import GUIElement from "../ecs/gui/GUIElement.js";
 import AnimationTrack from "../animation/keyed2/AnimationTrack.js";
 import TransitionFunctions from "../animation/TransitionFunctions.js";
-import { makeCubicCurve } from "../../core/math/MathUtils.js";
 import { SequenceBehavior } from "../intelligence/behavior/composite/SequenceBehavior.js";
 import { ActionBehavior } from "../intelligence/behavior/primitive/ActionBehavior.js";
 import { AnimationBehavior } from "../animation/keyed2/behavior/AnimationBehavior.js";
@@ -24,6 +23,7 @@ import { globalMetrics } from "../metrics/GlobalMetrics.js";
 import { MetricsCategory } from "../metrics/MetricsCategory.js";
 import { ClockChannelType } from "../intelligence/behavior/ecs/ClockChannelType.js";
 import { EnginePlugin } from "../plugin/EnginePlugin.js";
+import { makeCubicCurve } from "../../core/math/makeCubicCurve.js";
 
 
 const SLOW_CUBIC = makeCubicCurve(0.04, 0.4, 0.9, 0.99);

package/engine/animation/TransitionFunctions.js

@@ -1,4 +1,4 @@
-import { makeCubicCurve } from "../../core/math/MathUtils.js";
+import { makeCubicCurve } from "../../core/math/makeCubicCurve.js";
 
 /**
  *

package/engine/ecs/gui/position/ViewportPositionSystem.js

@@ -6,9 +6,9 @@ import ViewportPosition from './ViewportPosition.js';
 import GUIElement from "../GUIElement.js";
 import { assert } from "../../../../core/assert.js";
 import { SignalBinding } from "../../../../core/events/signal/SignalBinding.js";
-import { EPSILON } from "../../../../core/math/MathUtils.js";
 import AABB2 from "../../../../core/geom/AABB2.js";
 import { GUIElementEvent } from "../GUIElementEvent.js";
+import { EPSILON } from "../../../../core/math/EPSILON.js";
 
 const CSS_CLASS = 'ecs-viewport-position-component';
 

package/engine/ecs/systems/SteeringSystem.js

@@ -11,7 +11,7 @@ import Motion from '../components/Motion.js';
 import { Transform } from '../transform/Transform.js';
 import Steering, { SteeringEvents, SteeringFlags } from '../components/Steering.js';
 import Vector3 from "../../../core/geom/Vector3.js";
-import { alignToVector } from "../terrain/ecs/ClingToTerrainSystem.js";
+import { alignToVector } from "../terrain/ecs/cling/ClingToTerrainSystem.js";
 import { v3_dot } from "../../../core/geom/v3_dot.js";
 import { solveQuadratic } from "../../../core/math/solveQuadratic.js";
 

package/engine/ecs/terrain/ecs/Terrain.d.ts

@@ -1,5 +1,6 @@
 import Engine from "../../../Engine";
 import {Texture} from "three";
+import {SurfacePoint3} from "../../../../core/geom/3d/SurfacePoint3";
 
 export default class Terrain {
     fromJSON(json: any, engine: Engine): void;
@@ -7,4 +8,10 @@ export default class Terrain {
     toJSON(): any
 
     buildLightMap(quality: number): Promise<Texture>
+
+    raycastFirstSync(
+        result: SurfacePoint3,
+        originX: number, originY: number, originZ: number,
+        directionX: number, directionY: number, directionZ: number
+    ): boolean
 }

package/engine/ecs/terrain/ecs/cling/ClingToTerrain.js

@@ -0,0 +1,68 @@
+/**
+ * Created by Alex on 13/05/2016.
+ */
+import Vector3 from "../../../../../core/geom/Vector3.js";
+import Quaternion from "../../../../../core/geom/Quaternion.js";
+
+class ClingToTerrain {
+    constructor({ normalAlign = false } = {}) {
+        /**
+         * @type {boolean}
+         */
+        this.normalAlign = normalAlign;
+
+        /**
+         * Used internally for caching updates
+         * @type {Vector3}
+         */
+        this.__lastPosition = new Vector3(0, 0, 0);
+        /**
+         *
+         * @type {Quaternion}
+         */
+        this.__lastRotation = new Quaternion(0, 0, 0, 1);
+
+        /**
+         * Speed in Rad/s (Radians/second) by which rotation can change
+         * @type {number}
+         */
+        this.rotationSpeed = 3;
+    }
+
+    toJSON() {
+        return {
+            normalAlign: this.normalAlign,
+            rotationSpeed: this.rotationSpeed
+        };
+    }
+
+    fromJSON(
+        {
+            normalAlign = false,
+            rotationSpeed = Number.POSITIVE_INFINITY
+        }
+    ) {
+        this.normalAlign = normalAlign;
+        this.rotationSpeed = rotationSpeed;
+    }
+
+    /**
+     *
+     * @param json
+     * @returns {ClingToTerrain}
+     */
+    static fromJSON(json) {
+        const r = new ClingToTerrain();
+
+        r.fromJSON(json);
+
+        return r;
+    }
+}
+
+ClingToTerrain.typeName = "ClingToTerrain";
+
+
+export default ClingToTerrain;
+
+

package/engine/ecs/terrain/ecs/cling/ClingToTerrainSerializationAdapter.js

@@ -0,0 +1,31 @@
+import { BinaryClassSerializationAdapter } from "../../../storage/binary/BinaryClassSerializationAdapter.js";
+import ClingToTerrain from "./ClingToTerrain.js";
+
+export class ClingToTerrainSerializationAdapter extends BinaryClassSerializationAdapter {
+    constructor() {
+        super();
+
+        this.klass = ClingToTerrain;
+        this.version = 0;
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {ClingToTerrain} value
+     */
+    serialize(buffer, value) {
+        //TODO serialize rotation speed
+        buffer.writeUint8(value.normalAlign ? 1 : 0);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {ClingToTerrain} value
+     */
+    deserialize(buffer, value) {
+        //TODO deserialize rotation speed
+        value.normalAlign = buffer.readUint8() !== 0;
+    }
+}

package/engine/ecs/terrain/ecs/{ClingToTerrainSystem.js → cling/ClingToTerrainSystem.js}

@@ -1,21 +1,21 @@
 /**
  * Created by Alex on 13/05/2016.
  */
-import { min2 } from "../../../../core/math/min2.js";
-import { System } from '../../System.js';
-import { Transform } from '../../transform/Transform.js';
+import { min2 } from "../../../../../core/math/min2.js";
+import { System } from '../../../System.js';
+import { Transform } from '../../../transform/Transform.js';
 
 import ClingToTerrain from './ClingToTerrain.js';
 
-import Vector3 from '../../../../core/geom/Vector3.js';
-import Quaternion from "../../../../core/geom/Quaternion.js";
-import { EPSILON } from "../../../../core/math/MathUtils.js";
+import Vector3 from '../../../../../core/geom/Vector3.js';
+import Quaternion from "../../../../../core/geom/Quaternion.js";
 import { Matrix4 } from "three";
-import { assert } from "../../../../core/assert.js";
-import { SurfacePoint3 } from "../../../../core/geom/3d/SurfacePoint3.js";
-import { Deque } from "../../../../core/collection/queue/Deque.js";
-import { obtainTerrain } from "../util/obtainTerrain.js";
-import { clamp01 } from "../../../../core/math/clamp01.js";
+import { assert } from "../../../../../core/assert.js";
+import { SurfacePoint3 } from "../../../../../core/geom/3d/SurfacePoint3.js";
+import { Deque } from "../../../../../core/collection/queue/Deque.js";
+import { obtainTerrain } from "../../util/obtainTerrain.js";
+import { clamp01 } from "../../../../../core/math/clamp01.js";
+import { EPSILON } from "../../../../../core/math/EPSILON.js";
 
 
 /**
@@ -24,6 +24,10 @@ import { clamp01 } from "../../../../core/math/clamp01.js";
  */
 const temp_sp = new SurfacePoint3();
 
+/**
+ *
+ * @param {{update:function,transform:Transform}} datum
+ */
 function deregister(datum) {
     const update = datum.update;
 
@@ -33,6 +37,14 @@ function deregister(datum) {
     transform.rotation.onChanged.remove(update);
 }
 
+/**
+ * How many entities can be updated in a single tick, this is useful for performance optimization.
+ * If you have a large number of entities that need to be updated, updates can be executed over several ticks
+ * @readonly
+ * @type {number}
+ */
+const DEFAULT_UPDATE_LIMIT = 1024;
+
 class ClingToTerrainSystem extends System {
     /**
      *
@@ -49,14 +61,19 @@ class ClingToTerrainSystem extends System {
          */
         this.entityManager = null;
 
+        /**
+         *
+         * @type {Deque<number>}
+         */
         this.updateQueue = new Deque();
+
         this.data = [];
 
         /**
          * How many entities can be updated in a single tick, this is useful for performance optimization, if you have a large number of entities that need to be updated, updates can be executed over several ticks
          * @type {number}
          */
-        this.updateBatchLimit = 100;
+        this.updateBatchLimit = DEFAULT_UPDATE_LIMIT;
     }
 
     requestUpdate(entity) {
@@ -146,34 +163,35 @@ class ClingToTerrainSystem extends System {
 
         const terrain = obtainTerrain(dataset);
 
-        if (terrain !== null) {
-            const batchSize = min2(
-                updateCandidates.size(),
-                this.updateBatchLimit
-            );
+        if (terrain === null) {
+            return;
+        }
 
+        const batchSize = min2(
+            updateCandidates.size(),
+            this.updateBatchLimit
+        );
 
-            for (let i = 0; i < batchSize; i++) {
-                const entity = updateCandidates.removeFirst();
+        for (let i = 0; i < batchSize; i++) {
+            const entity = updateCandidates.removeFirst();
 
-                const c = this.data[entity];
+            const c = this.data[entity];
 
-                if (c === undefined) {
-                    /*
-                        this should never happen as update queue is cleaned up when component is removed
-                        the entity is gone
-                     */
+            if (c === undefined) {
+                /*
+                    this should never happen as update queue is cleaned up when component is removed
+                    the entity is gone
+                 */
 
-                    console.warn("ClingToTerrain component was in the update queue, but no data found. Skipping");
-                    continue;
-                }
+                console.warn("ClingToTerrain component was in the update queue, but no data found. Skipping");
+                continue;
+            }
 
-                const position_updated = doCling(c, terrain, timeDelta);
+            const position_updated = doCling(c, terrain, timeDelta);
 
-                if (!position_updated) {
-                    // no change, move back to update candidates
-                    this.requestUpdate(entity);
-                }
+            if (!position_updated) {
+                // no change, move back to update candidates
+                this.requestUpdate(entity);
             }
         }
     }
@@ -315,7 +333,7 @@ function doCling(el, terrain, timeDelta) {
         && cling.__lastRotation.roughlyEquals(rotation, 0.0001)
     ) {
         //do nothing, cached position matches with existing position
-        return;
+        return false;
     }
 
     const hit_found = terrain.raycastVerticalFirstSync(temp_sp, position.x, position.z);

package/engine/ecs/terrain/ecs/{ClingToTerrainSystem.spec.js → cling/ClingToTerrainSystem.spec.js}

@@ -1,5 +1,5 @@
 import ClingToTerrainSystem from "./ClingToTerrainSystem.js";
-import { EntityManager } from "../../EntityManager.js";
+import { EntityManager } from "../../../EntityManager.d.ts";
 
 function createEm() {
 

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

@@ -212,7 +212,7 @@ class TerrainTile {
      * @param {TerrainTile|undefined} bottomLeft
      * @param {TerrainTile|undefined} bottomRight
      */
-    stitchNormals2(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight) {
+    stitchNormals(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight) {
 
 
         const v0 = new Vector3(),

package/engine/ecs/terrain/tiles/TerrainTileManager.js

@@ -516,6 +516,7 @@ class TerrainTileManager {
     }
 
     /**
+     * Fix normals along the seams of the tile
      *
      * @param {number} x
      * @param {number} y
@@ -556,7 +557,7 @@ class TerrainTileManager {
             right = self.getRaw(x + 1, y);
         }
 
-        tile.stitchNormals2(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight);
+        tile.stitchNormals(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight);
     }
 
     /**

package/engine/graphics/camera/CameraShake.js

@@ -1,12 +1,12 @@
 import Vector3 from "../../../core/geom/Vector3.js";
 
 import SimplexNoise from 'simplex-noise';
-import { makeCubicCurve } from "../../../core/math/MathUtils.js";
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
 import { Behavior } from "../../intelligence/behavior/Behavior.js";
 import { BehaviorStatus } from "../../intelligence/behavior/BehaviorStatus.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import { clamp01 } from "../../../core/math/clamp01.js";
+import { makeCubicCurve } from "../../../core/math/makeCubicCurve.js";
 
 export class CameraShakeTraumaBehavior extends Behavior {
 

package/engine/graphics/camera/testClippingPlaneComputation.js

@@ -17,7 +17,7 @@ import TopDownCameraControllerSystem from "../ecs/camera/topdown/TopDownCameraCo
 import { TopDownCameraLanderSystem } from "../ecs/camera/topdown/TopDownCameraLanderSystem.js";
 import { CameraSystem } from "../ecs/camera/CameraSystem.js";
 import { MeshSystem } from "../ecs/mesh/MeshSystem.js";
-import ClingToTerrainSystem from "../../ecs/terrain/ecs/ClingToTerrainSystem.js";
+import ClingToTerrainSystem from "../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../ecs/terrain/ecs/TerrainSystem.js";
 import WaterSystem from "../ecs/water/WaterSystem.js";
 import Trail2DSystem from "../ecs/trail2d/Trail2DSystem.js";

package/engine/graphics/ecs/path/entity/EntityPath.js

@@ -2,9 +2,9 @@ import { IllegalStateException } from "../../../../../core/fsm/exceptions/Illega
 import { EntityPathMarker } from "./EntityPathMarker.js";
 import { Transform } from "../../../../ecs/transform/Transform.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
-import { EPSILON } from "../../../../../core/math/MathUtils.js";
 import { assert } from "../../../../../core/assert.js";
 import { binarySearchHighIndex } from "../../../../../core/collection/array/binarySearchHighIndex.js";
+import { EPSILON } from "../../../../../core/math/EPSILON.js";
 
 const scratch_v3 = new Vector3();
 

package/engine/graphics/ecs/path/testPathDisplaySystem.js

@@ -25,7 +25,7 @@ import TopDownCameraControllerSystem from "../camera/topdown/TopDownCameraContro
 import { TopDownCameraLanderSystem } from "../camera/topdown/TopDownCameraLanderSystem.js";
 import { CameraSystem } from "../camera/CameraSystem.js";
 import { MeshSystem } from "../mesh/MeshSystem.js";
-import ClingToTerrainSystem from "../../../ecs/terrain/ecs/ClingToTerrainSystem.js";
+import ClingToTerrainSystem from "../../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../../ecs/terrain/ecs/TerrainSystem.js";
 import WaterSystem from "../water/WaterSystem.js";
 import Trail2DSystem from "../trail2d/Trail2DSystem.js";

package/engine/graphics/ecs/path/tube/prototypeAnimatedPathMask.js

@@ -18,7 +18,7 @@ import TopDownCameraControllerSystem from "../../camera/topdown/TopDownCameraCon
 import { TopDownCameraLanderSystem } from "../../camera/topdown/TopDownCameraLanderSystem.js";
 import { CameraSystem } from "../../camera/CameraSystem.js";
 import { MeshSystem } from "../../mesh/MeshSystem.js";
-import ClingToTerrainSystem from "../../../../ecs/terrain/ecs/ClingToTerrainSystem.js";
+import ClingToTerrainSystem from "../../../../ecs/terrain/ecs/cling/ClingToTerrainSystem.js";
 import TerrainSystem from "../../../../ecs/terrain/ecs/TerrainSystem.js";
 import WaterSystem from "../../water/WaterSystem.js";
 import Trail2DSystem from "../../trail2d/Trail2DSystem.js";
@@ -39,7 +39,9 @@ import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSy
 import { SerializationMetadataSystem } from "../../../../ecs/systems/SerializationMetadataSystem.js";
 import { InverseKinematicsSystem } from "../../../../ecs/animation/InverseKinematicsSystem.js";
 import { PathDisplaySystem } from "../PathDisplaySystem.js";
-import { AmbientOcclusionPostProcessEffect } from "../../../render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
+import {
+    AmbientOcclusionPostProcessEffect
+} from "../../../render/buffer/simple-fx/ao/AmbientOcclusionPostProcessEffect.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
 import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
 import { JsonAssetLoader } from "../../../../asset/loaders/JsonAssetLoader.js";

package/engine/graphics/geometry/MikkT/NotZero.js

@@ -1,4 +1,4 @@
-import { EPSILON } from "../../../../core/math/MathUtils.js";
+import { EPSILON } from "../../../../core/math/EPSILON.js";
 
 /**
  *