@antha/input 0.0.5 → 0.0.6

package/dist/bindings/antha-menu-nav.mod.js

@@ -3,7 +3,7 @@ import { check } from '@augment-vir/assert';
 import { getObjectTypedEntries, getObjectTypedValues } from '@augment-vir/common';
 import { convertDuration } from 'date-vir';
 import { NavController, NavDirection, NavValue } from 'device-navigation';
-import { PredefinedGamepadBrand } from 'gamepad-type';
+import { KnownInput } from 'gamepad-type';
 import { InputDirection } from '../raw-inputs/raw-input.js';
 import { AnyGamepad, } from './player-bindings.js';
 export { nav, navAttribute, NavController } from 'device-navigation';
@@ -49,7 +49,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            inputName: 'd-pad-left',
+            inputName: KnownInput.DPadLeft,
         },
         {
             deviceKey: 'keyboard',
@@ -71,7 +71,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            inputName: 'd-pad-right',
+            inputName: KnownInput.DPadRight,
         },
         {
             deviceKey: 'keyboard',
@@ -93,7 +93,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            inputName: 'd-pad-up',
+            inputName: KnownInput.DPadUp,
         },
         {
             deviceKey: 'keyboard',
@@ -115,7 +115,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            inputName: 'd-pad-down',
+            inputName: KnownInput.DPadDown,
         },
         {
             deviceKey: 'keyboard',
@@ -152,13 +152,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            gamepadBrand: PredefinedGamepadBrand.Sony,
-            inputName: 'X',
-        },
-        {
-            deviceKey: AnyGamepad,
-            direction: InputDirection.Positive,
-            inputName: 'A',
+            inputName: KnownInput.FaceAccept,
         },
     ],
     [MenuNavBinding.MenuExit]: [
@@ -170,13 +164,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            gamepadBrand: PredefinedGamepadBrand.Sony,
-            inputName: 'O',
-        },
-        {
-            deviceKey: AnyGamepad,
-            direction: InputDirection.Positive,
-            inputName: 'B',
+            inputName: KnownInput.FaceCancel,
         },
     ],
     [MenuNavBinding.MenuSectionNext]: [
@@ -193,7 +181,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            inputName: 'R1',
+            inputName: KnownInput.R1,
         },
     ],
     [MenuNavBinding.MenuSectionPrevious]: [
@@ -210,7 +198,7 @@ export const defaultMenuNavBindings = {
         {
             deviceKey: AnyGamepad,
             direction: InputDirection.Positive,
-            inputName: 'L1',
+            inputName: KnownInput.L1,
         },
     ],
 };

package/dist/raw-inputs/antha-read-raw-input.mod.js

@@ -1,7 +1,8 @@
 import { defineAnthaMod } from '@antha/engine';
+import { check } from '@augment-vir/assert';
 import { mapObject, } from '@augment-vir/common';
 import { html } from 'element-vir';
-import { defaultGamepadLayouts, defaultGamepadModelMap, findMatchingGamepadLayout, findMatchingGamepadModel, } from 'gamepad-type';
+import { defaultGamepadLayouts, defaultGamepadModelMap, findMatchingGamepadLayout, findMatchingGamepadModel, modelInputNameOverrides, } from 'gamepad-type';
 import { InputDeviceHandler, isGamepadDeviceKey, } from 'input-device-handler';
 import { AnthaRawInputDebug } from './antha-raw-input-debug.element.js';
 import { calculateInputDirection, mapToSimpleDevicesMap, } from './raw-input.js';
@@ -82,6 +83,10 @@ export function readRawInputs(state, { msSinceLastExecute, }) {
                 })
                 : undefined;
             const mappedInputName = layout?.inputMappings[currentInput.inputName];
+            const modelInputName = getModelInputNameOverride({
+                mappedInputName,
+                gamepadModel: model?.gamepadModel,
+            });
             const rawInput = {
                 mapped: {
                     deviceName: model?.gamepadModel || device.deviceName,
@@ -99,6 +104,9 @@ export function readRawInputs(state, { msSinceLastExecute, }) {
             if (mappedInputName) {
                 deviceInputs[mappedInputName] = rawInput;
             }
+            if (modelInputName) {
+                deviceInputs[modelInputName] = rawInput;
+            }
             deviceInputs[currentInput.inputName] = rawInput;
         });
         return {
@@ -111,3 +119,14 @@ export function readRawInputs(state, { msSinceLastExecute, }) {
         currentDevices: mapToSimpleDevicesMap(currentDevices),
     };
 }
+function getModelInputNameOverride({ mappedInputName, gamepadModel, }) {
+    if (!mappedInputName ||
+        !gamepadModel ||
+        !check.isKeyOf(gamepadModel, modelInputNameOverrides)) {
+        return undefined;
+    }
+    const inputNameOverrides = modelInputNameOverrides[gamepadModel];
+    return check.isKeyOf(mappedInputName, inputNameOverrides)
+        ? inputNameOverrides[mappedInputName]
+        : undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@antha/input",
-    "version": "0.0.5",
+    "version": "0.0.6",
     "description": "An Antha mod for handling inputs.",
     "keywords": [
         "vir",
@@ -37,7 +37,7 @@
         "@augment-vir/common": "^31.73.1",
         "date-vir": "^8.5.0",
         "device-navigation": "^4.7.2",
-        "gamepad-type": "^2.0.2",
+        "gamepad-type": "^2.1.0",
         "input-device-handler": "^9.0.3",
         "object-shape-tester": "^6.14.0",
         "type-fest": "^5.7.0",
@@ -52,7 +52,7 @@
         "istanbul-smart-text-reporter": "^1.1.5"
     },
     "peerDependencies": {
-        "@antha/engine": "^0.0.5",
+        "@antha/engine": "^0.0.6",
         "element-vir": ">=26"
     },
     "engines": {