addon for remapping inputs
fix various broken icons, give generic own icons
bendn 2022-11-27
parent f33aa6f · commit 4d2434b
-rw-r--r--addons/remap/package.json2
-rw-r--r--addons/remap/private/IconMap.gd25
2 files changed, 19 insertions, 8 deletions
diff --git a/addons/remap/package.json b/addons/remap/package.json
index 72059b8..004f9f8 100644
--- a/addons/remap/package.json
+++ b/addons/remap/package.json
@@ -1,6 +1,6 @@
{
"name": "@bendn/remap",
- "version": "4.1.3",
+ "version": "4.1.4",
"description": "godot input remapping",
"main": "InteractiveActionLabel.gd",
"scripts": {
diff --git a/addons/remap/private/IconMap.gd b/addons/remap/private/IconMap.gd
index d9d0489..dc561d4 100644
--- a/addons/remap/private/IconMap.gd
+++ b/addons/remap/private/IconMap.gd
@@ -71,12 +71,23 @@ const JOYPAD_BUTTON_MAP := {
JOY_BUTTON_DPAD_DOWN: "↡",
}
-## Xbox button map.
-const XBOX_BUTTON_MAP := {
+## Generic joypad button mappings.
+const GENERIC_BUTTON_MAP := {
JOY_BUTTON_A: "↧",
JOY_BUTTON_B: "↦",
JOY_BUTTON_X: "↤",
JOY_BUTTON_Y: "↥",
+ JOY_BUTTON_BACK: "❓",
+ JOY_BUTTON_GUIDE: "❓",
+ JOY_BUTTON_START: "❓",
+}
+
+## Xbox button map.
+const XBOX_BUTTON_MAP := {
+ JOY_BUTTON_A: "⇓",
+ JOY_BUTTON_B: "⇒",
+ JOY_BUTTON_X: "⇐",
+ JOY_BUTTON_Y: "⇑",
JOY_BUTTON_BACK: "⇺",
JOY_BUTTON_GUIDE: "",
JOY_BUTTON_START: "⇻",
@@ -95,10 +106,10 @@ const PLAYSTATION_BUTTON_MAP := {
## Nintendo switch button map.
const NINTENDO_BUTTON_MAP := {
- JOY_BUTTON_A: "↥",
- JOY_BUTTON_B: "↧",
+ JOY_BUTTON_A: "⇒",
+ JOY_BUTTON_B: "⇓",
JOY_BUTTON_X: "↥",
- JOY_BUTTON_Y: "↤",
+ JOY_BUTTON_Y: "⇐",
JOY_BUTTON_BACK: "⇽",
JOY_BUTTON_GUIDE: "❓", # there is no joy_button_guide on switch
JOY_BUTTON_START: "⇾",
@@ -110,7 +121,7 @@ const JOYSTICK_MAP := {
-1:
{
JOY_AXIS_LEFT_X: "↼",
- JOY_AXIS_LEFT_Y: "⇈",
+ JOY_AXIS_LEFT_Y: "↾",
JOY_AXIS_RIGHT_X: "↽",
JOY_AXIS_RIGHT_Y: "↿",
},
@@ -181,7 +192,7 @@ static func get_icon(e: InputEvent) -> String:
PADS.NINTENDO:
return NINTENDO_BUTTON_MAP[e.button_index]
PADS.GENERIC:
- return XBOX_BUTTON_MAP[e.button_index] # fallback to xbox
+ return GENERIC_BUTTON_MAP[e.button_index]
elif JOYPAD_BUTTON_MAP.has(e.button_index):
return JOYPAD_BUTTON_MAP[e.button_index]
elif e is InputEventJoypadMotion: