@woosh/meep-engine 2.109.23 → 2.109.25

package/src/engine/input/devices/PointerDevice.js

@@ -5,7 +5,9 @@ import Vector3 from "../../../core/geom/Vector3.js";
 import { sign } from "../../../core/math/sign.js";
 import { MouseEvents } from "./events/MouseEvents.js";
 import { TouchEvents } from "./events/TouchEvents.js";
+import { eventToSourceIdentifier } from "./eventToSourceIdentifier.js";
 import { InputDeviceSwitch } from "./InputDeviceSwitch.js";
+import { LocationalInteractionMetadata } from "./LocationalInteractionMetadata.js";
 
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/buttons
@@ -84,6 +86,7 @@ function getTouchCenter(touchList, result) {
 
 }
 
+
 /**
  *
  * @param {Signal} up
@@ -92,13 +95,51 @@ function getTouchCenter(touchList, result) {
  * @param {number} maxDistance
  * @param {Signal} signal
  */
-function observeTap(up, down, move, maxDistance, signal) {
+function observeTap(
+    up,
+    down,
+    move,
+    maxDistance,
+    signal
+) {
 
-    const origin = new Vector2();
+    /**
+     *
+     * @type {Map<number, LocationalInteractionMetadata>}
+     */
+    const active = new Map();
+
+    /**
+     *
+     * @param {number} id
+     */
+    function reset(id) {
+        assert.isNonNegativeInteger(id, 'id');
 
+        if (active.delete(id)) {
+            up.remove(handleUp);
+            move.remove(handleMove);
+        }
+    }
+
+    /**
+     *
+     * @param {Vector2} position
+     * @param {MouseEvent|TouchEvent} event
+     */
     function handleUp(position, event) {
-        up.remove(handleUp);
-        move.remove(handleMove);
+        const id = eventToSourceIdentifier(event);
+
+        const meta = active.get(id);
+
+        if (meta === undefined) {
+            // this should not happen
+            console.warn(`Unregistered up event handler`);
+            return;
+        }
+
+        reset(id);
+
         signal.send2(position, event);
     }
 
@@ -108,20 +149,43 @@ function observeTap(up, down, move, maxDistance, signal) {
      * @param {MouseEvent|TouchEvent} event
      */
     function handleMove(position, event) {
-        if (origin.distanceTo(position) > maxDistance) {
-            //we moved too far, abort tap
-            move.remove(handleMove);
+        const id = eventToSourceIdentifier(event);
 
-            up.remove(handleUp);
+        const meta = active.get(id);
+
+        if (meta === undefined) {
+            // this should not happen
+            console.warn(`Unregistered move event handler`);
+
+            reset(id);
+
+            return;
         }
+
+        if (meta.position.distanceTo(position) > maxDistance) {
+            //we moved too far, abort tap
+            reset(id);
+        }
+
     }
 
-    function handleDown(position) {
+    /**
+     *
+     * @param {Vector2} position
+     * @param {TouchEvent|MouseEvent} event
+     */
+    function handleDown(position, event) {
+        const id = eventToSourceIdentifier(event);
+
+        // make sure to cancel previous pending resolution
+        reset(id);
+
+        active.set(id, LocationalInteractionMetadata.from(position));
+
         up.addOne(handleUp);
+
         //track move
         move.add(handleMove);
-
-        origin.copy(position);
     }
 
     down.add(handleDown);
@@ -433,17 +497,11 @@ export class PointerDevice {
         this.#domElement = domElement;
 
 
-        this.#touchStart.add((param0, param1, param2) => {
-            this.on.down.send3(param0, param1, param2);
-        });
+        this.#touchStart.add(this.on.down.send3, this.on.down);
 
-        this.#touchEnd.add((param0, param1, param2) => {
-            this.on.up.send3(param0, param1, param2);
-        });
-        this.#touchMove.add((param0, param1, param2) => {
-            this.on.move.send3(param0, param1, param2);
-        });
+        this.#touchEnd.add(this.on.up.send3, this.on.up);
 
+        this.#touchMove.add(this.on.move.send3, this.on.move);
 
         //constructed events
         observeTap(this.on.up, this.on.down, this.on.move, 10, this.on.tap);
@@ -459,6 +517,16 @@ export class PointerDevice {
         });
     }
 
+
+    /**
+     *
+     * @param {TouchEvent} event
+     */
+    #eventHandlerGlobalTouchEnd = (event) => {
+        getTouchCenter(event.touches, this.position);
+        this.#globalUp.send2(this.position, event);
+    }
+
     /**
      *
      * @param {MouseEvent} event
@@ -472,19 +540,7 @@ export class PointerDevice {
 
         const button = this.buttons[button_index];
 
-        if (button !== undefined) {
-            button.is_down = true;
-            button.down.send0();
-        }
-    }
-
-    /**
-     *
-     * @param {TouchEvent} event
-     */
-    #eventHandlerGlobalTouchEnd = (event) => {
-        getTouchCenter(event.touches, this.position);
-        this.#globalUp.send2(this.position, event);
+        button?.press();
     }
 
     /**
@@ -509,10 +565,7 @@ export class PointerDevice {
 
         const button = this.buttons[button_index];
 
-        if (button !== undefined) {
-            button.is_down = false;
-            button.up.send0();
-        }
+        button?.release();
     }
 
     /**

package/src/engine/input/devices/eventToSourceIdentifier.d.ts

@@ -0,0 +1,7 @@
+/**
+ *
+ * @param {TouchEvent|MouseEvent} event
+ * @returns {number}
+ */
+export function eventToSourceIdentifier(event: TouchEvent | MouseEvent): number;
+//# sourceMappingURL=eventToSourceIdentifier.d.ts.map

package/src/engine/input/devices/eventToSourceIdentifier.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"eventToSourceIdentifier.d.ts","sourceRoot":"","sources":["../../../../../src/engine/input/devices/eventToSourceIdentifier.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,+CAHW,UAAU,GAAC,UAAU,GACnB,MAAM,CAgClB"}

package/src/engine/input/devices/eventToSourceIdentifier.js

@@ -0,0 +1,36 @@
+/**
+ *
+ * @param {TouchEvent|MouseEvent} event
+ * @returns {number}
+ */
+export function eventToSourceIdentifier(event) {
+    let device_id = 0;
+    let source_id = 0;
+
+    if (event instanceof MouseEvent) {
+
+        // mouse
+
+        device_id = 1;
+        source_id = event.button;
+
+    } else if (event instanceof TouchEvent) {
+
+        // touch
+
+        device_id = 2;
+        const touches = event.changedTouches;
+        const num_changes = touches.length;
+
+        if (num_changes > 0) {
+            const touch = touches.item(0);
+
+            source_id = touch.identifier;
+        }
+
+    }
+
+    return ((device_id & 0b11) << 29)
+        | (source_id & 0b11111111111111111111111111111)
+        ;
+}

package/src/engine/input/devices/isHTMLElementFocusable.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Based on the article about focusable events: https://stackoverflow.com/questions/1599660/which-html-elements-can-receive-focus
+ * @param {Element} el
+ */
+export function isHTMLElementFocusable(el: Element): boolean;
+//# sourceMappingURL=isHTMLElementFocusable.d.ts.map

package/src/engine/input/devices/isHTMLElementFocusable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isHTMLElementFocusable.d.ts","sourceRoot":"","sources":["../../../../../src/engine/input/devices/isHTMLElementFocusable.js"],"names":[],"mappings":"AAsBA;;;GAGG;AACH,2CAFW,OAAO,WASjB"}

package/src/engine/input/devices/isHTMLElementFocusable.js

@@ -0,0 +1,34 @@
+/**
+ *
+ * @param thing
+ * @param klass
+ * @returns {boolean}
+ */
+function isInstanceOf(thing, klass) {
+    if (klass === undefined) {
+        return false;
+    }
+    if (klass === null) {
+        return false;
+    }
+
+    if (typeof klass !== "object") {
+        return false;
+    }
+
+
+    return thing instanceof klass;
+}
+
+/**
+ * Based on the article about focusable events: https://stackoverflow.com/questions/1599660/which-html-elements-can-receive-focus
+ * @param {Element} el
+ */
+export function isHTMLElementFocusable(el) {
+    return isInstanceOf(el, HTMLInputElement)
+        || isInstanceOf(el, HTMLSelectElement)
+        || isInstanceOf(el, HTMLTextAreaElement)
+        || isInstanceOf(el, HTMLAnchorElement)
+        || isInstanceOf(el, HTMLButtonElement)
+        || isInstanceOf(el, HTMLAreaElement)
+}

package/src/generation/grid/generation/discrete/GridTaskConnectRooms.js

@@ -1,7 +1,7 @@
 import { matcher_tag_unoccupied } from "../../../../../samples/generation/rules/matcher_tag_unoccupied.js";
 import { assert } from "../../../../core/assert.js";
 import { BitSet } from "../../../../core/binary/BitSet.js";
-import BinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
+import FastBinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
 import { Uint32Heap } from "../../../../core/collection/heap/Uint32Heap.js";
 import { passThrough } from "../../../../core/function/passThrough.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
@@ -158,7 +158,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
      * @param {BitSet} connected
      */
     fillConnectedArea(x, y, grid, connected) {
-        const open = new BinaryHeap(passThrough);
+        const open = new FastBinaryHeap(passThrough);
 
         const width = grid.width;
         const initialIndex = x + y * width;
@@ -238,7 +238,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
 
         distances.fill(65535);
 
-        // const open = new BinaryHeap(i => distances[i]);
+        // const open = new FastBinaryHeap(i => distances[i]);
 
         const open = new Uint32Heap();
 

package/src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskBuildSourceDistanceMap.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js"],"names":[],"mappings":"AAUA;;GAEG;AACH;IA6BI;;;;;;;OAOG;IACH;;;;;;uCAgBC;IAjDG;;;OAGG;IACH,2BAAyB;IAEzB;;;OAGG;IACH,yBAAuB;IAEvB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,SAFU,MAAM,CAEI;IA6BxB,iDA8IC;CACJ;kCA9MiC,+BAA+B;sBAH3C,+CAA+C"}
+{"version":3,"file":"GridTaskBuildSourceDistanceMap.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js"],"names":[],"mappings":"AAUA;;GAEG;AACH;IA6BI;;;;;;;OAOG;IACH;;;;;;uCAgBC;IAjDG;;;OAGG;IACH,2BAAyB;IAEzB;;;OAGG;IACH,yBAAuB;IAEvB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,SAFU,MAAM,CAEI;IA6BxB,iDA8IC;CACJ;kCA3MiC,+BAA+B;sBAJ3C,+CAA+C"}

package/src/generation/grid/generation/discrete/layer/GridTaskBuildSourceDistanceMap.js

@@ -1,12 +1,12 @@
-import Task from "../../../../../core/process/task/Task.js";
+import { assert } from "../../../../../core/assert.js";
 import { BitSet } from "../../../../../core/binary/BitSet.js";
+import FastBinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
+import Task from "../../../../../core/process/task/Task.js";
 import TaskGroup from "../../../../../core/process/task/TaskGroup.js";
 import { TaskSignal } from "../../../../../core/process/task/TaskSignal.js";
-import BinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
-import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
-import { assert } from "../../../../../core/assert.js";
 import { actionTask } from "../../../../../core/process/task/util/actionTask.js";
 import { countTask } from "../../../../../core/process/task/util/countTask.js";
+import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
 
 /**
  * Build a map of distances across the grid, using 2 concepts: source cells and passable cells. Source cells are where the distance is 0, and passable cells are those that can be travelled through
@@ -93,7 +93,7 @@ export class GridTaskBuildSourceDistanceMap extends GridTaskGenerator {
 
         const target = layer.sampler.data;
 
-        const open = new BinaryHeap(function (i) {
+        const open = new FastBinaryHeap(function (i) {
             return target[i];
         });
 

package/src/generation/grid/generation/discrete/layer/GridTaskDistanceToMarkers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskDistanceToMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/discrete/layer/GridTaskDistanceToMarkers.js"],"names":[],"mappings":"AAIA;IAIQ;;;OAGG;IACH,yBAAuB;IAEvB;;;OAGG;IACH,OAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,SAFU,MAAM,CAEI;IAGxB,oBAKC;IAED,4CAgCC;CACJ;kCAnEiC,+BAA+B"}
+{"version":3,"file":"GridTaskDistanceToMarkers.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/grid/generation/discrete/layer/GridTaskDistanceToMarkers.js"],"names":[],"mappings":"AAIA;IAIQ;;;OAGG;IACH,yBAAuB;IAEvB;;;OAGG;IACH,OAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,SAFU,MAAM,CAEI;IAGxB,oBAKC;IAED,4CAgCC;CACJ;kCAjEiC,+BAA+B"}

package/src/generation/grid/generation/discrete/layer/GridTaskDistanceToMarkers.js

@@ -1,6 +1,6 @@
-import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
-import BinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
+import FastBinaryHeap from "../../../../../core/collection/heap/FastBinaryHeap.js";
 import { actionTask } from "../../../../../core/process/task/util/actionTask.js";
+import { GridTaskGenerator } from "../../../GridTaskGenerator.js";
 
 export class GridTaskDistanceToMarkers extends GridTaskGenerator {
     constructor() {
@@ -27,7 +27,7 @@ export class GridTaskDistanceToMarkers extends GridTaskGenerator {
 
     buildChunks() {
 
-        const open = new BinaryHeap(function (i) {
+        const open = new FastBinaryHeap(function (i) {
             return target[i];
         });
     }

package/src/generation/grid/generation/road/GridTaskGenerateRoads.js

@@ -4,7 +4,7 @@ import { matcher_tag_traversable } from "../../../../../samples/generation/rules
 import { BitSet } from "../../../../core/binary/BitSet.js";
 import { groupArrayBy } from "../../../../core/collection/array/groupArrayBy.js";
 import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
-import BinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
+import FastBinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
 import { QuadTreeNode } from "../../../../core/geom/2d/quad-tree/QuadTreeNode.js";
 import { Graph } from "../../../../core/graph/v2/Graph.js";
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
@@ -124,7 +124,7 @@ function buildPaths(
 
     const neighbourhoodMaskSize = neighbourhoodMask.length;
 
-    const open = new BinaryHeap(i => distances[i]);
+    const open = new FastBinaryHeap(i => distances[i]);
 
     const closed = new BitSet();