@woosh/meep-engine 2.94.1 → 2.94.4

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

@@ -355,6 +355,24 @@ export class Transform {
     toString() {
         return `{ position: ${this.position}, rotation: ${this.rotation}, scale: ${this.scale} }`;
     }
+
+    /**
+     * @deprecated use {@link Quaternion.rotateTowards} instead
+     * @param {Quaternion} sourceQuaternion
+     * @param {Vector3} targetVector
+     * @param {Number} limit
+     */
+    static adjustRotation(
+        sourceQuaternion,
+        targetVector,
+        limit = Infinity
+    ) {
+        const q = new Quaternion();
+
+        q.lookRotation(targetVector);
+
+        sourceQuaternion.rotateTowards(q, limit);
+    }
 }
 
 /**
@@ -370,17 +388,4 @@ Transform.typeName = "Transform";
 Transform.prototype.isTransform = true;
 
 
-/**
- * @deprecated use {@link Quaternion.rotateTowards} instead
- * @param {Quaternion} sourceQuaternion
- * @param {Vector3} targetVector
- * @param {Number} limit
- */
-Transform.adjustRotation = function (sourceQuaternion, targetVector, limit = Infinity) {
-    const q = new Quaternion();
-
-    q.lookRotation(targetVector);
-
-    sourceQuaternion.rotateTowards(q, limit);
-};
 

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

@@ -1,9 +1,24 @@
+import { jest } from "@jest/globals";
 import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { Transform } from "./Transform.js";
 import { TransformFlags } from "./TransformFlags.js";
 
+/**
+ *
+ * @return {Transform}
+ */
+function sample_a() {
+    const a = new Transform();
+
+    a.position.set(1, 2, 3);
+    a.rotation.set(5, -7, 11, -13);
+    a.scale.set(17, -23, 29);
+
+    return a;
+}
+
 test("constructor does not throw", () => {
 
     expect(() => new Transform()).not.toThrow();
@@ -46,19 +61,43 @@ test("position changes propagate to matrix", () => {
     expect(t.matrix[14]).toBe(-7);
 });
 
-/**
- *
- * @return {Transform}
- */
-function sample_a() {
-    const a = new Transform();
+test("subscribe/unsubscribe", () => {
+    const mock = jest.fn();
 
-    a.position.set(1, 2, 3);
-    a.rotation.set(5, -7, 11, -13);
-    a.scale.set(17, -23, 29);
+    const t = sample_a();
 
-    return a;
-}
+    t.subscribe(mock);
+
+    expect(mock).not.toHaveBeenCalled();
+
+    t.position._add(1, 0, 0);
+
+    expect(mock).toHaveBeenCalledTimes(1);
+
+    t.scale._add(0, 1, 0);
+
+    expect(mock).toHaveBeenCalledTimes(2);
+
+    t.rotation.set(-1, 3, -5, -t.rotation.w);
+
+    expect(mock).toHaveBeenCalledTimes(3);
+
+    t.unsubscribe(mock);
+
+    expect(mock).toHaveBeenCalledTimes(3);
+
+    t.position._add(1, 0, 0);
+
+    expect(mock).toHaveBeenCalledTimes(3);
+
+    t.scale._add(0, 1, 0);
+
+    expect(mock).toHaveBeenCalledTimes(3);
+
+    t.rotation.set(-1, 3, -5, -t.rotation.w);
+
+    expect(mock).toHaveBeenCalledTimes(3);
+});
 
 test("to/fromJSON consistency", () => {
     const a = sample_a();

package/src/engine/navigation/grid/find_path_on_grid_astar.d.ts

@@ -5,9 +5,8 @@
  * @param {number} height
  * @param {number} start
  * @param {number} goal
- * @param {number} crossing_penalty
  * @param {number} block_value value in the field that signifies impassible obstacle
  * @returns {Array.<number>} array of indices representing path from start to end
  */
-export function find_path_on_grid_astar(field: number[] | Uint8Array | Uint16Array | Float32Array, width: number, height: number, start: number, goal: number, crossing_penalty: number, block_value: number): Array<number>;
+export function find_path_on_grid_astar(field: number[] | Uint8Array | Uint16Array | Float32Array, width: number, height: number, start: number, goal: number, block_value: number): Array<number>;
 //# sourceMappingURL=find_path_on_grid_astar.d.ts.map

package/src/engine/navigation/grid/find_path_on_grid_astar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find_path_on_grid_astar.d.ts","sourceRoot":"","sources":["../../../../../src/engine/navigation/grid/find_path_on_grid_astar.js"],"names":[],"mappings":"AAkMA;;;;;;;;;;GAUG;AACH,+CATW,MAAM,EAAE,GAAC,UAAU,GAAC,WAAW,GAAC,YAAY,SAC5C,MAAM,UACN,MAAM,SACN,MAAM,QACN,MAAM,oBACN,MAAM,eACN,MAAM,GACJ,MAAO,MAAM,CAAC,CA6F1B"}
+{"version":3,"file":"find_path_on_grid_astar.d.ts","sourceRoot":"","sources":["../../../../../src/engine/navigation/grid/find_path_on_grid_astar.js"],"names":[],"mappings":"AAoMA;;;;;;;;;GASG;AACH,+CARW,MAAM,EAAE,GAAC,UAAU,GAAC,WAAW,GAAC,YAAY,SAC5C,MAAM,UACN,MAAM,SACN,MAAM,QACN,MAAM,eACN,MAAM,GACJ,MAAO,MAAM,CAAC,CA2F1B"}

package/src/engine/navigation/grid/find_path_on_grid_astar.js

@@ -2,6 +2,7 @@ import { assert } from "../../../core/assert.js";
 import { BitSet } from "../../../core/binary/BitSet.js";
 import { Uint32Heap } from "../../../core/collection/heap/Uint32Heap.js";
 import Vector2 from '../../../core/geom/Vector2.js';
+import { sign } from "../../../core/math/sign.js";
 
 const neighbors = new Uint32Array(4);
 
@@ -58,7 +59,7 @@ function compute_neighbors(result, index, width, height) {
 /**
  *
  * @param {number} node
- * @param {number[]} g_score
+ * @param {number[]|Float32Array} g_score
  * @param {number} width
  * @param {number} height
  * @returns {number[]}
@@ -87,11 +88,11 @@ function compute_path(node, g_score, width, height) {
 
         // normalize
         if (_dx !== 0) {
-            _dx /= Math.abs(_dx);
+            _dx = sign(_dx);
         }
 
         if (_dy !== 0) {
-            _dy /= Math.abs(_dy);
+            _dy = sign(_dy);
         }
 
         const direction_change = dx !== _dx || dy !== _dy;
@@ -152,6 +153,7 @@ function compute_path(node, g_score, width, height) {
 
     }
 
+    // so far the path is from goal to start, we need to reverse it
     result.reverse();
 
     return result;
@@ -199,7 +201,6 @@ let g_score = new Float32Array(1024);
  * @param {number} height
  * @param {number} start
  * @param {number} goal
- * @param {number} crossing_penalty
  * @param {number} block_value value in the field that signifies impassible obstacle
  * @returns {Array.<number>} array of indices representing path from start to end
  */
@@ -207,7 +208,6 @@ export function find_path_on_grid_astar(
     field,
     width, height,
     start, goal,
-    crossing_penalty,
     block_value
 ) {
 
@@ -217,7 +217,6 @@ export function find_path_on_grid_astar(
     assert.isNonNegativeInteger(start, "start");
     assert.isNonNegativeInteger(goal, "goal");
 
-    assert.isNumber(crossing_penalty, 'crossingPenalty');
     assert.isNumber(block_value, 'blockValue');
 
     // prepare sets
@@ -271,7 +270,7 @@ export function find_path_on_grid_astar(
             }
 
             // Cost of traversing to this neighbour
-            const transition_cost = neighbor_value * crossing_penalty + 1;
+            const transition_cost = neighbor_value + 1;
 
             // updated path cost
             const cost_so_far = g_score[currentNode] + transition_cost;

package/src/engine/navigation/grid/find_path_on_grid_astar.spec.js

@@ -4,13 +4,13 @@ import { number_pretty_print } from "../../../core/primitives/numbers/number_pre
 import { find_path_on_grid_astar } from "./find_path_on_grid_astar.js";
 
 test("sanity check on 1x1 grid", () => {
-    const path = find_path_on_grid_astar([0], 1, 1, 0, 0, 0, 1);
+    const path = find_path_on_grid_astar([0], 1, 1, 0, 0, 1);
 
     expect(path).toEqual([0]);
 });
 
 test("sanity check on 2x1 grid", () => {
-    const path = find_path_on_grid_astar([0, 0], 2, 1, 0, 1, 0, 1);
+    const path = find_path_on_grid_astar([0, 0], 2, 1, 0, 1, 1);
 
     expect(path).toEqual([0, 1]);
 });
@@ -20,7 +20,7 @@ test("sanity check on 2x2 grid", () => {
     const path = find_path_on_grid_astar([
         0, 0,
         1, 0
-    ], 2, 2, 0, 3, 0, 1);
+    ], 2, 2, 0, 3, 1);
 
     expect(path).toEqual([0, 1, 3]);
 });
@@ -31,7 +31,7 @@ test("path on open 3x3 grid", () => {
         0, 0, 0,
         0, 0, 0,
         0, 0, 0
-    ], 3, 3, 0, 8, 0, 1);
+    ], 3, 3, 0, 8, 1);
 
     expect(path).toEqual([0, 3, 5, 8]);
 });
@@ -76,12 +76,7 @@ test.skip("performance, 256x256 random", () => {
         const start = coordinates[i2];
         const goal = coordinates[i2 + 1];
 
-        find_path_on_grid_astar(
-            field,
-            FIELD_SIZE, FIELD_SIZE,
-            start,
-            goal, 1, 255
-        );
+        find_path_on_grid_astar(field, FIELD_SIZE, FIELD_SIZE, start, goal, 255);
     }
 
     const t1 = performance.now();