@woosh/meep-engine 2.94.0 → 2.94.2

package/build/meep.module.js

@@ -102842,7 +102842,7 @@ class GUIEngine {
 
     constructor() {
 
-        this.ticker.subscribe(d => {
+        this.ticker.onTick.add(d => {
 
 
             let ctx = null;
@@ -116251,17 +116251,17 @@ class Uint32Heap {
         const size = this.__size;
 
         while (true) {
-            const l = (i << 1) + 1;
-            const r = l + 1;
+            const left = (i << 1) + 1;
+            const right = left + 1;
 
             let smallest = i;
 
-            if (l < size && this.compare(l, smallest)) {
-                smallest = l;
+            if (left < size && this.compare(left, smallest)) {
+                smallest = left;
             }
 
-            if (r < size && this.compare(r, smallest)) {
-                smallest = r;
+            if (right < size && this.compare(right, smallest)) {
+                smallest = right;
             }
 
             if (smallest === i) {
@@ -116335,19 +116335,23 @@ class Uint32Heap {
 
     pop_min() {
 
-        const result = this.top_id;
+        const new_size = this.__size - 1;
+        this.__size = new_size;
 
-        this.__size--;
+        const uint32 = this.__data_uint32;
+        const top_id = uint32[1];
 
-        if (this.__size > 0) {
-            // move top element to the bottom
-            this.swap(0, this.__size);
+        // move bottom element to the top.
+        // the top doesn't need to be moved down as we have discarded it already
+        const i2 = new_size << 1; // same as *2
 
-            // rebalance
-            this.heap_down(0);
-        }
+        uint32[0] = uint32[i2];
+        uint32[1] = uint32[i2 + 1];
 
-        return result;
+        // re-balance
+        this.heap_down(0);
+
+        return top_id;
     }
 
     /**
@@ -116365,6 +116369,7 @@ class Uint32Heap {
             const _id = uint32[address];
 
             if (_id === id) {
+                // reverse address to index
                 return (address >>> 1);
             }
         }
@@ -116378,7 +116383,7 @@ class Uint32Heap {
      * @param {number} id
      * @returns {boolean}
      */
-    contains(id){
+    contains(id) {
         return this.find_index_by_id(id) !== -1;
     }
 
@@ -116509,7 +116514,7 @@ class Uint32Heap {
 
         // insert at the end
         const index = current_size;
-        const address = index << 1;
+        const address = index << 1; // same as *2
 
         // write data
         this.__data_float32[address] = score;
@@ -116579,7 +116584,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[]}
@@ -116608,11 +116613,11 @@ function compute_path(node, g_score, width, height) {
 
         // normalize
         if (_dx !== 0) {
-            _dx /= Math.abs(_dx);
+            _dx = sign$1(_dx);
         }
 
         if (_dy !== 0) {
-            _dy /= Math.abs(_dy);
+            _dy = sign$1(_dy);
         }
 
         const direction_change = dx !== _dx || dy !== _dy;
@@ -116673,6 +116678,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;
@@ -116707,6 +116713,12 @@ const open = new Uint32Heap();
 const closed = new BitSet();
 closed.preventShrink();
 
+/**
+ * Contains refined heuristic value
+ * @type {Float32Array}
+ */
+let g_score = new Float32Array(1024);
+
 /**
  *
  * @param {number[]|Uint8Array|Uint16Array|Float32Array} field
@@ -116714,7 +116726,6 @@ closed.preventShrink();
  * @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
  */
@@ -116722,7 +116733,6 @@ function find_path_on_grid_astar(
     field,
     width, height,
     start, goal,
-    crossing_penalty,
     block_value
 ) {
 
@@ -116730,14 +116740,15 @@ function find_path_on_grid_astar(
     open.clear();
     closed.reset();
 
-    /**
-     * Contains refined heuristic value
-     * @type {number[]}
-     */
-    const g_score = [];
+    const cell_count = width * height;
 
-    g_score[start] = 0;
+    if (g_score.length < cell_count) {
+        g_score = new Float32Array(cell_count);
+    }
 
+    g_score.fill(Infinity, 0, cell_count);
+
+    g_score[start] = 0;
 
     open.insert(start, heuristic(start, goal, width));
 
@@ -116776,32 +116787,24 @@ 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;
 
-            const index_in_open_set = open.find_index_by_id(neighbor);
+            if (cost_so_far < g_score[neighbor]) {
 
-            const not_in_open_set = index_in_open_set === -1;
-
-            if (not_in_open_set || cost_so_far < g_score[neighbor]) {
-
-                // update refined score
+                // update actual cost
                 g_score[neighbor] = cost_so_far;
 
                 const remaining_heuristic = heuristic(neighbor, goal, width);
 
                 const refined_heuristic = cost_so_far + remaining_heuristic;
 
-                if (not_in_open_set) {
-                    // Pushing to heap will put it in proper place based on the 'f' value.
-                    open.insert(neighbor, refined_heuristic);
-                } else {
-                    // Already seen the node, but since it has been re-scored we need to reorder it in the heap
-                    open.__update_score_by_index(index_in_open_set, refined_heuristic);
-                }
+                // Pushing to heap will put it in proper place based on the 'f' value.
+                open.insert_or_update(neighbor, refined_heuristic);
             }
+
         }
     }
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.94.0",
+  "version": "2.94.2",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/collection/heap/Uint32Heap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Uint32Heap.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/heap/Uint32Heap.js"],"names":[],"mappings":"AAiDA;;;;GAIG;AACH;IACI;;;OAGG;IACH,+BAFW,MAAM,EAuBhB;IAlBG,2BAA0E;IAE1E;;;;OAIG;IACH,sBAAwD;IAExD;;;;OAIG;IACH,uBAA0D;IAE1D,mBAAkC;IAClC,eAAe;IAGnB;;;OAGG;IACH,wBAsBC;IAED;;;;;OAKG;IACH,gBAOC;IAED;;;;;OAKG;IACH,aAiBC;IAED;;;OAGG;IACH,kBA6BC;IAED;;;;OAIG;IACH,gBAeC;IAED;;;OAGG;IACH,mBAEC;IAED;;;OAGG;IACH,uBAEC;IAED;;;OAGG;IACH,qBAEC;IAED;;;OAGG;IACH,YAFa,OAAO,CAInB;IAED,mBAEC;IAED,kBAgBC;IAED;;;;OAIG;IACH,qBAHW,MAAM,GACJ,MAAM,CAkBlB;IAED;;;;OAIG;IACH,aAHW,MAAM,GACJ,OAAO,CAInB;IAED;;OAEG;IACH,cAEC;IAED;;;;OAIG;IACH,WAHW,MAAM,GACJ,OAAO,CAWnB;IAED;;;OAGG;IACH,yBAFW,MAAM,QAehB;IAED;;;;OAIG;IACH,iBAHW,MAAM,SACN,MAAM,QAUhB;IAED;;;;OAIG;IACH,+BAHW,MAAM,SACN,MAAM,QAiBhB;IAED;;;;OAIG;IACH,cAHW,MAAM,GACJ,MAAM,CAYlB;IAGD;;;;OAIG;IACH,qBAHW,MAAM,SACN,MAAM,QAUhB;IAED;;;;OAIG;IACH,WAHW,MAAM,SACN,MAAM,QA0BhB;CAGJ"}
+{"version":3,"file":"Uint32Heap.d.ts","sourceRoot":"","sources":["../../../../../src/core/collection/heap/Uint32Heap.js"],"names":[],"mappings":"AAiDA;;;;GAIG;AACH;IACI;;;OAGG;IACH,+BAFW,MAAM,EAuBhB;IAlBG,2BAA0E;IAE1E;;;;OAIG;IACH,sBAAwD;IAExD;;;;OAIG;IACH,uBAA0D;IAE1D,mBAAkC;IAClC,eAAe;IAGnB;;;OAGG;IACH,wBAsBC;IAED;;;;;OAKG;IACH,gBAOC;IAED;;;;;OAKG;IACH,aAiBC;IAED;;;OAGG;IACH,kBA6BC;IAED;;;;OAIG;IACH,gBAeC;IAED;;;OAGG;IACH,mBAEC;IAED;;;OAGG;IACH,uBAEC;IAED;;;OAGG;IACH,qBAEC;IAED;;;OAGG;IACH,YAFa,OAAO,CAInB;IAED,mBAEC;IAED,kBAoBC;IAED;;;;OAIG;IACH,qBAHW,MAAM,GACJ,MAAM,CAmBlB;IAED;;;;OAIG;IACH,aAHW,MAAM,GACJ,OAAO,CAInB;IAED;;OAEG;IACH,cAEC;IAED;;;;OAIG;IACH,WAHW,MAAM,GACJ,OAAO,CAWnB;IAED;;;OAGG;IACH,yBAFW,MAAM,QAehB;IAED;;;;OAIG;IACH,iBAHW,MAAM,SACN,MAAM,QAUhB;IAED;;;;OAIG;IACH,+BAHW,MAAM,SACN,MAAM,QAiBhB;IAED;;;;OAIG;IACH,cAHW,MAAM,GACJ,MAAM,CAYlB;IAGD;;;;OAIG;IACH,qBAHW,MAAM,SACN,MAAM,QAUhB;IAED;;;;OAIG;IACH,WAHW,MAAM,SACN,MAAM,QA0BhB;CAGJ"}

package/src/core/collection/heap/Uint32Heap.js

@@ -159,17 +159,17 @@ export class Uint32Heap {
         const size = this.__size;
 
         while (true) {
-            const l = (i << 1) + 1;
-            const r = l + 1;
+            const left = (i << 1) + 1;
+            const right = left + 1;
 
             let smallest = i;
 
-            if (l < size && this.compare(l, smallest)) {
-                smallest = l;
+            if (left < size && this.compare(left, smallest)) {
+                smallest = left;
             }
 
-            if (r < size && this.compare(r, smallest)) {
-                smallest = r;
+            if (right < size && this.compare(right, smallest)) {
+                smallest = right;
             }
 
             if (smallest === i) {
@@ -244,19 +244,23 @@ export class Uint32Heap {
     pop_min() {
         assert.greaterThan(this.__size, 0, 'heap is empty');
 
-        const result = this.top_id;
+        const new_size = this.__size - 1;
+        this.__size = new_size;
 
-        this.__size--;
+        const uint32 = this.__data_uint32;
+        const top_id = uint32[1];
 
-        if (this.__size > 0) {
-            // move top element to the bottom
-            this.swap(0, this.__size);
+        // move bottom element to the top.
+        // the top doesn't need to be moved down as we have discarded it already
+        const i2 = new_size << 1; // same as *2
 
-            // rebalance
-            this.heap_down(0);
-        }
+        uint32[0] = uint32[i2];
+        uint32[1] = uint32[i2 + 1];
+
+        // re-balance
+        this.heap_down(0);
 
-        return result;
+        return top_id;
     }
 
     /**
@@ -274,6 +278,7 @@ export class Uint32Heap {
             const _id = uint32[address];
 
             if (_id === id) {
+                // reverse address to index
                 return (address >>> 1);
             }
         }
@@ -287,7 +292,7 @@ export class Uint32Heap {
      * @param {number} id
      * @returns {boolean}
      */
-    contains(id){
+    contains(id) {
         return this.find_index_by_id(id) !== -1;
     }
 
@@ -422,7 +427,7 @@ export class Uint32Heap {
 
         // insert at the end
         const index = current_size;
-        const address = index << 1;
+        const address = index << 1; // same as *2
 
         // write data
         this.__data_float32[address] = score;

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":"AA4LA;;;;;;;;;;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,CAoG1B"}
+{"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;
@@ -186,6 +188,12 @@ const open = new Uint32Heap();
 const closed = new BitSet();
 closed.preventShrink();
 
+/**
+ * Contains refined heuristic value
+ * @type {Float32Array}
+ */
+let g_score = new Float32Array(1024);
+
 /**
  *
  * @param {number[]|Uint8Array|Uint16Array|Float32Array} field
@@ -193,7 +201,6 @@ closed.preventShrink();
  * @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
  */
@@ -201,7 +208,6 @@ export function find_path_on_grid_astar(
     field,
     width, height,
     start, goal,
-    crossing_penalty,
     block_value
 ) {
 
@@ -211,21 +217,21 @@ 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
     open.clear();
     closed.reset();
 
-    /**
-     * Contains refined heuristic value
-     * @type {number[]}
-     */
-    const g_score = [];
+    const cell_count = width * height;
 
-    g_score[start] = 0;
+    if (g_score.length < cell_count) {
+        g_score = new Float32Array(cell_count);
+    }
 
+    g_score.fill(Infinity, 0, cell_count);
+
+    g_score[start] = 0;
 
     open.insert(start, heuristic(start, goal, width));
 
@@ -264,32 +270,24 @@ 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;
 
-            const index_in_open_set = open.find_index_by_id(neighbor);
-
-            const not_in_open_set = index_in_open_set === -1;
-
-            if (not_in_open_set || cost_so_far < g_score[neighbor]) {
+            if (cost_so_far < g_score[neighbor]) {
 
-                // update refined score
+                // update actual cost
                 g_score[neighbor] = cost_so_far;
 
                 const remaining_heuristic = heuristic(neighbor, goal, width);
 
                 const refined_heuristic = cost_so_far + remaining_heuristic;
 
-                if (not_in_open_set) {
-                    // Pushing to heap will put it in proper place based on the 'f' value.
-                    open.insert(neighbor, refined_heuristic);
-                } else {
-                    // Already seen the node, but since it has been re-scored we need to reorder it in the heap
-                    open.__update_score_by_index(index_in_open_set, refined_heuristic);
-                }
+                // Pushing to heap will put it in proper place based on the 'f' value.
+                open.insert_or_update(neighbor, refined_heuristic)
             }
+
         }
     }
 

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,12 +31,12 @@ 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]);
 });
 
-test("performance, 256x256 random", () => {
+test.skip("performance, 256x256 random", () => {
     const FIELD_SIZE = 256;
 
     const field = new Uint8Array(FIELD_SIZE * FIELD_SIZE);
@@ -52,7 +52,7 @@ test("performance, 256x256 random", () => {
 
     }
 
-    const SAMPLE_COUNT = 10000;
+    const SAMPLE_COUNT = 100000;
 
     const coordinates = new Uint32Array(SAMPLE_COUNT * 2);
 
@@ -76,12 +76,7 @@ test("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();

package/src/engine/ui/GUIEngine.js

@@ -101,7 +101,7 @@ class GUIEngine {
 
     constructor() {
 
-        this.ticker.subscribe(d => {
+        this.ticker.onTick.add(d => {
 
 
             let ctx = null;