@woosh/meep-engine 2.75.0 → 2.75.2

package/build/meep.module.js

@@ -69794,30 +69794,37 @@ class ImageRGBADataLoader extends AssetLoader {
 }
 
 /**
- * @author Alex Goldring
- * @copyright Alex Goldring 2018
+ * Utility class for managing connection between listeners to signals
  */
+class SignalBinding {
+    /**
+     * State flag
+     * @type {boolean}
+     */
+    #linked = false;
 
+    get linked() {
+        return this.#linked;
+    }
 
-class SignalBinding {
     /**
      *
      * @param {Signal} signal
      * @param {function} handler
-     * @param {*} [context]
+     * @param {*} [context] will be passed as thisArg to the handler
      * @constructor
      */
     constructor(signal, handler, context) {
         if (typeof handler !== "function") {
-            throw new TypeError(`handler must be a function, instead was ${handler}`);
+            throw new TypeError(`handler must be a function, instead was '${typeof handler}'`);
         }
 
         if (typeof signal !== "object") {
-            throw new TypeError(`signal must be of an object, instead was ${signal}`)
+            throw new TypeError(`signal must be of an object, instead was '${typeof signal}'`)
         }
 
         if (typeof signal.add !== "function") {
-            throw new TypeError(`signal.add must be a function, instead was ${signal.add}`);
+            throw new TypeError(`signal.add must be a function, instead was '${typeof signal.add}'`);
         }
 
         /**
@@ -69838,11 +69845,6 @@ class SignalBinding {
          */
         this.context = context;
 
-        /**
-         * State flag
-         * @type {boolean}
-         */
-        this.linked = false;
     }
 
     /**
@@ -69850,11 +69852,11 @@ class SignalBinding {
      * Idempotent
      */
     link() {
-        if (this.linked) {
+        if (this.#linked) {
             return;
         }
 
-        this.linked = true;
+        this.#linked = true;
         this.signal.add(this.handler, this.context);
     }
 
@@ -69863,11 +69865,11 @@ class SignalBinding {
      * Idempotent
      */
     unlink() {
-        if (!this.linked) {
+        if (!this.#linked) {
             return;
         }
 
-        this.linked = false;
+        this.#linked = false;
         this.signal.remove(this.handler, this.context);
     }
 }
@@ -70347,7 +70349,7 @@ class ObservedBoolean extends Boolean {
 
     /**
      *
-     * @param {function} f
+     * @param {function(boolean)} f
      */
     process(f) {
         f(this.__value);
@@ -117811,6 +117813,7 @@ class SelectorBehavior extends CompositeBehavior {
     }
 
     initialize(context) {
+
         const children = this.__children;
 
         if (children.length > 0) {
@@ -117818,7 +117821,7 @@ class SelectorBehavior extends CompositeBehavior {
             this.__currentBehaviourIndex = 0;
             this.__currentBehaviour = children[0];
 
-            this.__currentBehaviour.initialize(this.context);
+            this.__currentBehaviour.initialize(context);
 
         } else {
             // no children

package/package.json

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

package/src/core/bvh2/bvh3/query/bvh_query_user_data_nearest_to_point.spec.js

@@ -1,3 +1,4 @@
+import { aabb3_unsigned_distance_sqr_to_point } from "../../../geom/3d/aabb/aabb3_unsigned_distance_sqr_to_point.js";
 import { randomFloatBetween } from "../../../math/random/randomFloatBetween.js";
 import { seededRandom } from "../../../math/random/seededRandom.js";
 import { BVH } from "../BVH.js";
@@ -131,4 +132,78 @@ test.skip("performance, 1M random boxes, 10k queries", () => {
     const duration = (t1 - t0);
 
     console.log(`${duration / SAMPLE_POINT_COUNT}ms/query`);
+});
+
+test.skip('naive search, 1m random boxes, 10k queries', () => {
+
+    const random = seededRandom(1);
+
+    const OBJECT_COUNT = 1000000;
+
+    const boxes = new Float32Array(OBJECT_COUNT * 6);
+
+    const min_bound = -1000;
+    const max_bound = 1000;
+
+    const extents = 25;
+
+    for (let i = 0; i < OBJECT_COUNT; i++) {
+        const address = i * 6;
+
+        const x = randomFloatBetween(random, min_bound, max_bound);
+        const y = randomFloatBetween(random, min_bound, max_bound);
+        const z = randomFloatBetween(random, min_bound, max_bound);
+
+        boxes[address] = x - extents;
+        boxes[address + 1] = y - extents;
+        boxes[address + 2] = z - extents;
+
+        boxes[address + 3] = x + extents;
+        boxes[address + 4] = y + extents;
+        boxes[address + 5] = z + extents;
+
+    }
+
+    function naive_query(boxes, count, x, y, z) {
+        let best_distance_sqr = Infinity;
+        let best_index = 0;
+
+        const limit = count * 6;
+
+        for (let i = 0; i < limit; i += 6) {
+            const distance_sqr = aabb3_unsigned_distance_sqr_to_point(
+                boxes[i], boxes[i + 1], boxes[i + 2],
+                boxes[i + 3], boxes[i + 4], boxes[i + 5],
+
+                x, y, z
+            )
+
+            if (distance_sqr < best_distance_sqr) {
+                best_index = i;
+                best_distance_sqr = distance_sqr;
+            }
+        }
+
+        return best_index;
+    }
+
+    const SAMPLE_POINT_COUNT = 10000;
+
+    const t0 = performance.now();
+
+    for (let i = 0; i < SAMPLE_POINT_COUNT; i++) {
+
+        const x = randomFloatBetween(random, min_bound, max_bound);
+        const y = randomFloatBetween(random, min_bound, max_bound);
+        const z = randomFloatBetween(random, min_bound, max_bound);
+
+        naive_query(boxes, OBJECT_COUNT, x, y, z);
+    }
+
+    const t1 = performance.now();
+
+    const duration = (t1 - t0);
+
+    console.log(`${duration / SAMPLE_POINT_COUNT}ms/query`);
+
 });

package/src/core/events/signal/SignalBinding.js

@@ -1,28 +1,35 @@
 /**
- * @author Alex Goldring
- * @copyright Alex Goldring 2018
+ * Utility class for managing connection between listeners to signals
  */
+export class SignalBinding {
+    /**
+     * State flag
+     * @type {boolean}
+     */
+    #linked = false;
 
+    get linked() {
+        return this.#linked;
+    }
 
-export class SignalBinding {
     /**
      *
      * @param {Signal} signal
      * @param {function} handler
-     * @param {*} [context]
+     * @param {*} [context] will be passed as thisArg to the handler
      * @constructor
      */
     constructor(signal, handler, context) {
         if (typeof handler !== "function") {
-            throw new TypeError(`handler must be a function, instead was ${handler}`);
+            throw new TypeError(`handler must be a function, instead was '${typeof handler}'`);
         }
 
         if (typeof signal !== "object") {
-            throw new TypeError(`signal must be of an object, instead was ${signal}`)
+            throw new TypeError(`signal must be of an object, instead was '${typeof signal}'`)
         }
 
         if (typeof signal.add !== "function") {
-            throw new TypeError(`signal.add must be a function, instead was ${signal.add}`);
+            throw new TypeError(`signal.add must be a function, instead was '${typeof signal.add}'`);
         }
 
         /**
@@ -43,11 +50,6 @@ export class SignalBinding {
          */
         this.context = context;
 
-        /**
-         * State flag
-         * @type {boolean}
-         */
-        this.linked = false;
     }
 
     /**
@@ -55,11 +57,11 @@ export class SignalBinding {
      * Idempotent
      */
     link() {
-        if (this.linked) {
+        if (this.#linked) {
             return;
         }
 
-        this.linked = true;
+        this.#linked = true;
         this.signal.add(this.handler, this.context);
     }
 
@@ -68,11 +70,11 @@ export class SignalBinding {
      * Idempotent
      */
     unlink() {
-        if (!this.linked) {
+        if (!this.#linked) {
             return;
         }
 
-        this.linked = false;
+        this.#linked = false;
         this.signal.remove(this.handler, this.context);
     }
 }

package/src/core/model/ObservedBoolean.js

@@ -91,7 +91,7 @@ class ObservedBoolean extends Boolean {
 
     /**
      *
-     * @param {function} f
+     * @param {function(boolean)} f
      */
     process(f) {
         f(this.__value);

package/src/engine/intelligence/behavior/SelectorBehavior.js

@@ -1,6 +1,6 @@
-import { CompositeBehavior } from "./composite/CompositeBehavior.js";
-import { BehaviorStatus } from "./BehaviorStatus.js";
 import { assert } from "../../../core/assert.js";
+import { BehaviorStatus } from "./BehaviorStatus.js";
+import { CompositeBehavior } from "./composite/CompositeBehavior.js";
 
 /**
  * Will try every child behaviour in order until one succeeds or if all fail - the selector behavior will fail too
@@ -83,6 +83,7 @@ export class SelectorBehavior extends CompositeBehavior {
     }
 
     initialize(context) {
+
         const children = this.__children;
 
         if (children.length > 0) {
@@ -90,7 +91,7 @@ export class SelectorBehavior extends CompositeBehavior {
             this.__currentBehaviourIndex = 0;
             this.__currentBehaviour = children[0];
 
-            this.__currentBehaviour.initialize(this.context);
+            this.__currentBehaviour.initialize(context);
 
         } else {
             // no children

package/src/engine/intelligence/behavior/SelectorBehavior.spec.js

@@ -0,0 +1,18 @@
+import { Behavior } from "./Behavior.js";
+import { SelectorBehavior } from "./SelectorBehavior.js";
+
+test("correctly passes context to children during initialization", () => {
+
+    const child = new Behavior();
+
+    const selector = SelectorBehavior.from([
+        child
+    ]);
+
+    const ctx = { a: 7 };
+
+    selector.initialize(ctx)
+
+    expect(child.context).toEqual(ctx);
+
+});