like2d 2.10.0 → 2.10.1

package/dist/input/gamepad-mapping.d.ts

@@ -6,10 +6,10 @@
  * browser APIs into physical gamepad button
  * mappings.
  *
+ *
  * Browser API shortcomings:
- *  - No standard way of exposing vendor and product
- *  - Almost nothing is standard
- *  - Vendor and product alone doesn't suffice for GUID -- Different controllers have the same.
+ *  - [No standard way of exposing vendor/product, Safari doesn't even do it.](https://github.com/w3c/gamepad/issues/199)
+ *  - Vendor and product alone doesn't suffice for GUID -- Different controllers have the same, it's good-enough.
  *  - D-pads either get mapped to an axis (last pair of axes in Chromium) or buttons (Firefox).
  *  - Analog axes get mapped differently in Firefox and Chromium.
  *
@@ -26,82 +26,66 @@ import type { Vector2 } from "../math";
  * Which are exceedingly common.
  */
 declare const buttonMap: readonly [{
-    readonly sdl: "a";
     readonly like: "BBottom";
     readonly num: number;
     readonly name: "Bottom Face Button";
 }, {
-    readonly sdl: "b";
     readonly like: "BRight";
     readonly num: 1;
     readonly name: "Right Face Button";
 }, {
-    readonly sdl: "x";
     readonly like: "BLeft";
     readonly num: 2;
     readonly name: "Left Face Button";
 }, {
-    readonly sdl: "y";
     readonly like: "BTop";
     readonly num: 3;
     readonly name: "Top Face Button";
 }, {
-    readonly sdl: "leftshoulder";
     readonly like: "L1";
     readonly num: 4;
     readonly name: "Left shoulder (front)";
 }, {
-    readonly sdl: "rightshoulder";
     readonly like: "R1";
     readonly num: 5;
     readonly name: "Right shoulder (front)";
 }, {
-    readonly sdl: "lefttrigger";
     readonly like: "L2";
     readonly num: 6;
     readonly name: "Left shoulder (rear)";
 }, {
-    readonly sdl: "righttrigger";
     readonly like: "R2";
     readonly num: 7;
     readonly name: "Right shoulder (rear)";
 }, {
-    readonly sdl: "back";
     readonly like: "MenuLeft";
     readonly num: 8;
     readonly name: "Left Menu Button";
 }, {
-    readonly sdl: "start";
     readonly like: "MenuRight";
     readonly num: 9;
     readonly name: "Right Menu Button";
 }, {
-    readonly sdl: "leftstick";
     readonly like: "LeftStick";
     readonly num: 10;
     readonly name: "Left Stick Button";
 }, {
-    readonly sdl: "rightstick";
     readonly like: "RightStick";
     readonly num: 11;
     readonly name: "Right Stick Button";
 }, {
-    readonly sdl: "dpup";
     readonly like: "Up";
     readonly num: 12;
     readonly name: "D-Pad Up";
 }, {
-    readonly sdl: "dpdown";
     readonly like: "Down";
     readonly num: 13;
     readonly name: "D-Pad Down";
 }, {
-    readonly sdl: "dpleft";
     readonly like: "Left";
     readonly num: 14;
     readonly name: "D-Pad Left";
 }, {
-    readonly sdl: "dpright";
     readonly like: "Right";
     readonly num: 15;
     readonly name: "D-Pad right";
@@ -126,8 +110,9 @@ type SdlMapping = {
     vendor: number;
     product: number;
     name: string;
-    sdlName: string;
     mapping: Record<number, LikeButton>;
+    browserName?: string;
+    id?: string;
 };
 export declare function getSdlMapping(gamepad: Gamepad): SdlMapping | undefined;
 export {};

package/dist/input/gamepad-mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gamepad-mapping.d.ts","sourceRoot":"","sources":["../../src/input/gamepad-mapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC;;;;;;GAMG;AACH,QAAA,MAAM,SAAS;;;kBAC0B,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBrC,CAAC;AAEX,MAAM,MAAM,UAAU,GAClB,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAClC,SAAS,MAAM,EAAE,GACjB,OAAO,MAAM,GAAG,GAChB,OAAO,MAAM,GAAG,CAAC;AAIrB,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,cAAc,GAAI,YAAY,MAAM,KAAG,cAQlD,CAAC;AAEH,eAAO,MAAM,qBAAqB,QAAO,aAC0B,CAAC;AACpE,eAAO,MAAM,UAAU,aAAqD,CAAC;AAC7E,eAAO,MAAM,cAAc,qfAE1B,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,IAAI,OAAO,EAAE,SAAS,YAAY,KAAG,OAK7D,CAAC;AAsEF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACrC,CAAC;AAEF,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CA0BtE"}
+{"version":3,"file":"gamepad-mapping.d.ts","sourceRoot":"","sources":["../../src/input/gamepad-mapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAEvC;;;;;;GAMG;AACH,QAAA,MAAM,SAAS;;kBACgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoB3B,CAAC;AAUX,MAAM,MAAM,UAAU,GAClB,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAClC,SAAS,MAAM,EAAE,GACjB,OAAO,MAAM,GAAG,GAChB,OAAO,MAAM,GAAG,CAAC;AAIrB,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;AAChE,MAAM,MAAM,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,cAAc,GAAI,YAAY,MAAM,KAAG,cAQlD,CAAC;AAEH,eAAO,MAAM,qBAAqB,QAAO,aAC0B,CAAC;AACpE,eAAO,MAAM,UAAU,aAAqD,CAAC;AAC7E,eAAO,MAAM,cAAc,qfAE1B,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,IAAI,OAAO,EAAE,SAAS,YAAY,KAAG,OAK7D,CAAC;AAkBF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAwBtE"}

package/dist/input/gamepad-mapping.js

@@ -6,10 +6,10 @@
  * browser APIs into physical gamepad button
  * mappings.
  *
+ *
  * Browser API shortcomings:
- *  - No standard way of exposing vendor and product
- *  - Almost nothing is standard
- *  - Vendor and product alone doesn't suffice for GUID -- Different controllers have the same.
+ *  - [No standard way of exposing vendor/product, Safari doesn't even do it.](https://github.com/w3c/gamepad/issues/199)
+ *  - Vendor and product alone doesn't suffice for GUID -- Different controllers have the same, it's good-enough.
  *  - D-pads either get mapped to an axis (last pair of axes in Chromium) or buttons (Firefox).
  *  - Analog axes get mapped differently in Firefox and Chromium.
  *
@@ -25,31 +25,33 @@
  * Which are exceedingly common.
  */
 const buttonMap = [
-    { sdl: "a", like: "BBottom", num: 0, name: "Bottom Face Button" },
-    { sdl: "b", like: "BRight", num: 1, name: "Right Face Button" },
-    { sdl: "x", like: "BLeft", num: 2, name: "Left Face Button" },
-    { sdl: "y", like: "BTop", num: 3, name: "Top Face Button" },
-    { sdl: "leftshoulder", like: "L1", num: 4, name: "Left shoulder (front)" },
-    { sdl: "rightshoulder", like: "R1", num: 5, name: "Right shoulder (front)" },
-    { sdl: "lefttrigger", like: "L2", num: 6, name: "Left shoulder (rear)" },
-    { sdl: "righttrigger", like: "R2", num: 7, name: "Right shoulder (rear)" },
-    { sdl: "back", like: "MenuLeft", num: 8, name: "Left Menu Button" },
-    { sdl: "start", like: "MenuRight", num: 9, name: "Right Menu Button" },
-    { sdl: "leftstick", like: "LeftStick", num: 10, name: "Left Stick Button" },
-    {
-        sdl: "rightstick",
-        like: "RightStick",
-        num: 11,
-        name: "Right Stick Button",
-    },
-    { sdl: "dpup", like: "Up", num: 12, name: "D-Pad Up" },
-    { sdl: "dpdown", like: "Down", num: 13, name: "D-Pad Down" },
-    { sdl: "dpleft", like: "Left", num: 14, name: "D-Pad Left" },
-    { sdl: "dpright", like: "Right", num: 15, name: "D-Pad right" },
+    { like: "BBottom", num: 0, name: "Bottom Face Button" },
+    { like: "BRight", num: 1, name: "Right Face Button" },
+    { like: "BLeft", num: 2, name: "Left Face Button" },
+    { like: "BTop", num: 3, name: "Top Face Button" },
+    { like: "L1", num: 4, name: "Left shoulder (front)" },
+    { like: "R1", num: 5, name: "Right shoulder (front)" },
+    { like: "L2", num: 6, name: "Left shoulder (rear)" },
+    { like: "R2", num: 7, name: "Right shoulder (rear)" },
+    { like: "MenuLeft", num: 8, name: "Left Menu Button" },
+    { like: "MenuRight", num: 9, name: "Right Menu Button" },
+    { like: "LeftStick", num: 10, name: "Left Stick Button" },
+    { like: "RightStick", num: 11, name: "Right Stick Button" },
+    { like: "Up", num: 12, name: "D-Pad Up" },
+    { like: "Down", num: 13, name: "D-Pad Down" },
+    { like: "Left", num: 14, name: "D-Pad Left" },
+    { like: "Right", num: 15, name: "D-Pad right" },
 ];
+const detectedOs = ((s) => [
+    ["Android", "Android"],
+    ["iPhone", "iOS"],
+    ["iPad", "iOS"],
+    ["Win", "Windows"],
+    ["Mac", "Mac OS X"],
+].find(([ss]) => s.includes(ss))?.[1] ?? "Linux")(navigator.userAgent);
 export const defaultMapping = (stickCount) => ({
     buttons: {},
-    sticks: Array(stickCount / 2)
+    sticks: Array(stickCount)
         .fill(0)
         .map((_, i) => [
         { index: i * 2, invert: false },
@@ -63,62 +65,28 @@ export const mapStick = (gp, mapping) => {
     return mapping.map((axis) => (axis.invert ? -1 : 1) * (gp.axes[axis.index] ?? 0));
 };
 //// ************* SDL Gamepad auto-binding system ******************* ////
-// @ts-ignore
-import gamecontrollerdb from "../gamecontrollerdb.txt?raw";
-const sdlButtonSet = new Set(buttonMap.map(({ sdl }) => sdl));
-const sdlToLikeMap = new Map(buttonMap.map(({ sdl, like }) => [sdl, like]));
-const mappingDb = generateMappingDb(gamecontrollerdb);
-function generateMappingDb(db) {
-    const dbEntries = db
-        .split("\n")
-        .map((l) => l.trim())
-        .filter((line) => line !== "" && !line.startsWith("#"))
-        .map(parseDbLine);
-    console.log(`[Gamepad] Parsed ${dbEntries.length} entries from DB`);
-    const mappingDb = Object.fromEntries(dbEntries);
-    console.log(`[Gamepad] Final entry count: ${Object.keys(mappingDb).length}`);
-    return mappingDb;
-}
-function parseDbLine(line) {
-    const [guid, name, ...mappings] = line.split(",");
-    mappings.pop();
-    const vpNum = 0x1 * parseInt(guid.substring(16, 18), 16) +
-        0x100 * parseInt(guid.substring(18, 20), 16) +
-        0x10000 * parseInt(guid.substring(8, 10), 16) +
-        0x1000000 * parseInt(guid.substring(10, 12), 16);
-    const mapping = Object.fromEntries(mappings
-        .map((s) => {
-        const [sdl, bname] = s.split(":");
-        const browserIndex = sdlRawButtonToBrowser(bname);
-        return (browserIndex !== undefined &&
-            sdlButtonSet.has(sdl) && [browserIndex, sdlToLikeMap.get(sdl)]);
-    })
-        .filter((v) => !!v));
-    return [vpNum, { name, mapping }];
-}
-function sdlRawButtonToBrowser(btn) {
-    return btn.startsWith("b")
-        ? Number(btn.substring(1))
-        : btn.startsWith("h")
-            ? { 1: 12, 2: 13, 4: 14, 8: 15 }[Number(btn.substring(3))]
-            : undefined;
-}
+import mappingDbRaw from "./controllerdb.json";
+const mappingDb = new Map(Object.entries(mappingDbRaw[detectedOs]).map(([k, v]) => [
+    Number(k),
+    {
+        ...v,
+        mapping: Object.fromEntries(Object.entries(v.mapping).map(([k, v]) => [Number(k), v])),
+    },
+]));
 export function getSdlMapping(gamepad) {
-    const parsed = tryParseId(gamepad.id);
+    const parsed = trySplitId(gamepad.id);
     if (parsed) {
         const [vendorStr, productStr, nameStr] = parsed;
         const vendor = parseInt(vendorStr, 16);
         const product = parseInt(productStr, 16);
         const name = nameStr.trim();
-        const mapping = mappingDb[vendor * 0x10000 + product];
+        const mapping = mappingDb.get(vendor * 0x10000 + product);
         if (mapping) {
             console.log(`[Gamepad] Found SDL db mapping for '${name}'`);
             return {
-                vendor,
-                product,
-                name,
-                sdlName: mapping.name,
-                mapping: mapping.mapping,
+                ...mapping,
+                browserName: name,
+                id: gamepad.id,
             };
         }
         else {
@@ -129,7 +97,7 @@ export function getSdlMapping(gamepad) {
         console.log(`[Gamepad] Failed to parse id: ${gamepad.id}. Please report this bug with the name of your web browser.`);
     }
 }
-function tryParseId(id) {
+function trySplitId(id) {
     const infoC = id.match(/^([^(]+)\(Vendor: ([0-9a-f]+) Product: ([0-9a-f]+)/i);
     if (infoC) {
         // chrome pattern: Name(Vendor: VEND Product: PROD)

package/dist/input/gamepad.d.ts

@@ -22,10 +22,9 @@ export declare class Gamepad {
     constructor(props: EngineProps<LikeGamepadEvent>);
     private onGamepadConnected;
     /**
-     * @private
      * Called by the engine every frame.
      */
-    update(): void;
+    private update;
     /**
      *
      * @param target Which controller?

package/dist/input/gamepad.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gamepad.d.ts","sourceRoot":"","sources":["../../src/input/gamepad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,cAAc,EAAiB,UAAU,EAAY,MAAM,mBAAmB,CAAC;AACxH,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,gCAAgC;AAChC,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,KAAK,CAAC;AAE3C;;;;;;;;;;GAUG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,eAAe,CAAQ;gBAEnB,KAAK,EAAE,WAAW,CAAC,gBAAgB,CAAC;IAgChD,OAAO,CAAC,kBAAkB;IA+B1B;;;OAGG;IACH,MAAM,IAAI,IAAI;IAId;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE;IAQpC,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM;IAIxC,OAAO,CAAC,WAAW;IAYnB,yCAAyC;IACzC,MAAM,CACJ,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,UAAU,GAAG,MAAM,GAC1B,OAAO,GAAG,SAAS;IAItB;;;OAGG;IACH,WAAW,CACT,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,UAAU,GAAG,MAAM,GAC1B,OAAO,GAAG,SAAS;IAItB;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAIrD;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,UAAO;IAU9D;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAYtD;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc;IASlD;;;;;;;OAOG;IACH,qBAAqB,CAAC,MAAM,EAAE,OAAO;CAGtC"}
+{"version":3,"file":"gamepad.d.ts","sourceRoot":"","sources":["../../src/input/gamepad.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,cAAc,EAAiB,UAAU,EAAmC,MAAM,mBAAmB,CAAC;AAC/I,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,gCAAgC;AAChC,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,KAAK,CAAC;AAE3C;;;;;;;;;;GAUG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,QAAQ,CAA+B;IAC/C,OAAO,CAAC,QAAQ,CAAoC;IACpD,OAAO,CAAC,eAAe,CAAQ;gBAEnB,KAAK,EAAE,WAAW,CAAC,gBAAgB,CAAC;IAmChD,OAAO,CAAC,kBAAkB;IAgC1B;;OAEG;IACH,OAAO,CAAC,MAAM;IAId;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE;IAQpC,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM;IAIxC,OAAO,CAAC,WAAW;IAYnB,yCAAyC;IACzC,MAAM,CACJ,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,UAAU,GAAG,MAAM,GAC1B,OAAO,GAAG,SAAS;IAItB;;;OAGG;IACH,WAAW,CACT,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,UAAU,GAAG,MAAM,GAC1B,OAAO,GAAG,SAAS;IAItB;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAIrD;;;;OAIG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,UAAO;IAU9D;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAYtD;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc;IASlD;;;;;;;OAOG;IACH,qBAAqB,CAAC,MAAM,EAAE,OAAO;CAGtC"}

package/dist/input/gamepad.js

@@ -1,4 +1,4 @@
-import { defaultMapping, fullButtonName, getSdlMapping, mapStick } from './gamepad-mapping';
+import { defaultMapping, fullButtonName, getSdlMapping, mapStick, standardButtonMapping } from './gamepad-mapping';
 /** LIKE Gamepad Wrapper
  *
  *  - Allows events/callbacks to be sent from joy buttons.
@@ -46,6 +46,9 @@ export class Gamepad {
                 gps.clear();
             }
         }, { signal: abort });
+        props.canvas.addEventListener("like:update", this.update.bind(this), {
+            signal: abort,
+        });
     }
     onGamepadConnected(ev) {
         const gps = new GamepadState(ev.gamepad.index);
@@ -58,6 +61,7 @@ export class Gamepad {
         }
         else if (ev.gamepad.mapping == 'standard') {
             gps.mapping = defaultMapping(ev.gamepad.axes.length / 2);
+            gps.mapping.buttons = standardButtonMapping();
             console.log(`Loaded standard mapping.`);
         }
         else {
@@ -73,7 +77,6 @@ export class Gamepad {
         this.dispatch("gamepadconnected", [ev.gamepad.index]);
     }
     /**
-     * @private
      * Called by the engine every frame.
      */
     update() {

package/dist/input/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/input/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AAC7C,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAEpE,qBAAa,KAAK;IASd,OAAO,CAAC,QAAQ;IARlB,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,OAAO,CAAU;gBAGf,QAAQ,EAAE,UAAU,CAAC,eAAe,GAAG,gBAAgB,CAAC,EAChE,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC;QACb,OAAO,EAAE,OAAO,CAAC;KAClB;IAOH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,CAAC,MAAM,GAAG,YAAY,CAAC,EAAO,GAAG,IAAI;IAUvE;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM;IAM3D;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE;IAIhD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAM/B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIpC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIrC,MAAM;IAiBN,OAAO,CAAC,eAAe;CAaxB"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/input/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;AAC7C,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAEpE,qBAAa,KAAK;IASd,OAAO,CAAC,QAAQ;IARlB,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,OAAO,CAAU;gBAGf,QAAQ,EAAE,UAAU,CAAC,eAAe,GAAG,gBAAgB,CAAC,EAChE,IAAI,EAAE;QACJ,QAAQ,EAAE,QAAQ,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC;QACb,OAAO,EAAE,OAAO,CAAC;KAClB;IAOH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,CAAC,MAAM,GAAG,YAAY,CAAC,EAAO,GAAG,IAAI;IAUvE;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM;IAM3D;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE;IAIhD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAM/B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIpC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIrC,MAAM;IAgBN,OAAO,CAAC,eAAe;CAaxB"}

package/dist/input/input.js

@@ -114,7 +114,6 @@ export class Input {
         return !this.currState.has(action) && this.prevState.has(action);
     }
     update() {
-        this.gamepad.update();
         [this.prevState, this.currState] = [this.currState, this.prevState];
         this.currState.clear();
         for (const action of Object.keys(this.actionTable)) {

package/dist/prefab-scenes/mapGamepad.d.ts

@@ -18,8 +18,10 @@ export declare class MapGamepad implements Scene {
     private mapping;
     private held?;
     private alreadyMapped;
+    private frameWait;
     constructor(mapMode: MapMode, targetPad: number, next?: Scene | undefined);
     load(like: Like): void;
+    update(): void;
     draw(like: Like): void;
     gamepadpressed(like: Like, source: number, _name: LikeButton, num: number): void;
     gamepadreleased(_like: Like, source: number, _name: LikeButton, num: number): void;

package/dist/prefab-scenes/mapGamepad.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapGamepad.d.ts","sourceRoot":"","sources":["../../src/prefab-scenes/mapGamepad.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B,OAAO,EAAE,KAAK,UAAU,EAAkC,MAAM,UAAU,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAyBjC,eAAO,MAAM,YAAY,iBAA4C,CAAC;AACtE,eAAO,MAAM,YAAY,iBAA6C,CAAC;AACvE,eAAO,MAAM,aAAa,iBAA6C,CAAC;AACxE,eAAO,MAAM,YAAY,iBAA6C,CAAC;AACvE,eAAO,MAAM,YAAY,iBAAgC,CAAC;AA6D1D,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,UAAW,YAAW,KAAK;IAOpC,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,IAAI,CAAC;IARf,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,IAAI,CAAC,CAAa;IAC1B,OAAO,CAAC,aAAa,CAAqB;gBAGhC,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,KAAK,YAAA;IAGtB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAUtB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAqCtB,cAAc,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,GACV,IAAI;IAaP,eAAe,CACb,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,GACV,IAAI;IAOP,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAG/B"}
+{"version":3,"file":"mapGamepad.d.ts","sourceRoot":"","sources":["../../src/prefab-scenes/mapGamepad.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B,OAAO,EAAE,KAAK,UAAU,EAAkC,MAAM,UAAU,CAAC;AAE3E,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAyBjC,eAAO,MAAM,YAAY,iBAA4C,CAAC;AACtE,eAAO,MAAM,YAAY,iBAA6C,CAAC;AACvE,eAAO,MAAM,aAAa,iBAA6C,CAAC;AACxE,eAAO,MAAM,YAAY,iBAA6C,CAAC;AACvE,eAAO,MAAM,YAAY,iBAAgC,CAAC;AA6D1D,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,UAAW,YAAW,KAAK;IAQpC,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,IAAI,CAAC;IATf,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,IAAI,CAAC,CAAa;IAC1B,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,SAAS,CAAK;gBAGZ,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,KAAK,YAAA;IAGtB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IActB,MAAM,IAAI,IAAI;IAId,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAqCtB,cAAc,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,GACV,IAAI;IAaP,eAAe,CACb,KAAK,EAAE,IAAI,EACX,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,UAAU,EACjB,GAAG,EAAE,MAAM,GACV,IAAI;IAOP,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;CAG/B"}

package/dist/prefab-scenes/mapGamepad.js

@@ -119,16 +119,27 @@ export class MapGamepad {
             writable: true,
             value: new Set()
         });
+        Object.defineProperty(this, "frameWait", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
     }
     load(like) {
+        this.frameWait = 10;
         this.mapping = like.gamepad.getMapping(this.targetPad) ?? defaultMapping(2);
+        const alreadyMapped = new Set(Object.values(this.mapping.buttons));
         for (const btn of mapOrder.reverse()) {
-            if (this.mapMode.buttons.has(btn)) {
+            if (this.mapMode.buttons.has(btn) && !alreadyMapped.has(btn)) {
                 this.currentlyUnmapped.push(btn);
             }
         }
         like.canvas.setMode([320, 240]);
     }
+    update() {
+        this.frameWait--;
+    }
     draw(like) {
         const centerText = {
             font: "1px sans-serif",
@@ -139,7 +150,7 @@ export class MapGamepad {
         like.gfx.clear();
         like.gfx.scale(20);
         like.gfx.translate([0, 1]);
-        like.gfx.print("white", "Map gamepad (click to close)", [8, 0.0], centerText);
+        like.gfx.print("white", `Map gamepad ${this.targetPad}`, [8, 0.0], centerText);
         for (const prop of this.mapMode.buttons.keys()) {
             const color = this.held == prop
                 ? "green"
@@ -155,7 +166,7 @@ export class MapGamepad {
             : "Press any button to resume.", [2, 10], { font: "1px sans-serif" });
     }
     gamepadpressed(like, source, _name, num) {
-        if (source !== this.targetPad || this.held)
+        if (source !== this.targetPad || this.held || this.frameWait > 0)
             return;
         const active = this.currentlyUnmapped.pop();
         if (active && !this.alreadyMapped.has(num)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "like2d",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "A web-native game framework inspired by Love2D",
   "type": "module",
   "main": "./dist/index.js",
@@ -43,7 +43,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "tsc && cp src/gamecontrollerdb.txt dist/",
+    "build": "tsc",
     "typecheck": "tsc --noEmit",
     "lint": "echo 'No linting configured'",
     "clean": "rm -rf dist",