tr2/input: add ui for editing controller layouts

walkawayy · Oct 31, 2024 · b56ccd9 · b56ccd9
1 parent 698915a
commit b56ccd9
Show file tree

Hide file tree

Showing 28 changed files with 767 additions and 260 deletions.
diff --git a/data/tr1/ship/cfg/TR1X_gameflow.json5 b/data/tr1/ship/cfg/TR1X_gameflow.json5
@@ -595,13 +595,13 @@
     ],
 
     "strings": {
-        "CONTROL_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_KEYBOARD": "Keyboard",
         "CONTROL_CUSTOMIZE": "Customize Controls",
-        "CONTROL_CUSTOM_1": "Custom Scheme 1",
-        "CONTROL_CUSTOM_2": "Custom Scheme 2",
-        "CONTROL_CUSTOM_3": "Custom Scheme 3",
+        "CONTROL_CUSTOM_1": "User Keys 1",
+        "CONTROL_CUSTOM_2": "User Keys 2",
+        "CONTROL_CUSTOM_3": "User Keys 3",
         "CONTROL_DEFAULT_KEYS": "Default Keys",
-        "CONTROL_KEYBOARD": "Keyboard",
         "CONTROL_RESET_DEFAULTS": "Reset All: Hold %s",
         "CONTROL_UNBIND": "Unbind: Hold %s",
         "DETAIL_BILINEAR": "Bilinear",

diff --git a/data/tr1/ship/cfg/TR1X_gameflow_demo_pc.json5 b/data/tr1/ship/cfg/TR1X_gameflow_demo_pc.json5
@@ -83,13 +83,13 @@
     ],
 
     "strings": {
-        "CONTROL_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_KEYBOARD": "Keyboard",
         "CONTROL_CUSTOMIZE": "Customize Controls",
-        "CONTROL_CUSTOM_1": "Custom Scheme 1",
-        "CONTROL_CUSTOM_2": "Custom Scheme 2",
-        "CONTROL_CUSTOM_3": "Custom Scheme 3",
+        "CONTROL_CUSTOM_1": "User Keys 1",
+        "CONTROL_CUSTOM_2": "User Keys 2",
+        "CONTROL_CUSTOM_3": "User Keys 3",
         "CONTROL_DEFAULT_KEYS": "Default Keys",
-        "CONTROL_KEYBOARD": "Keyboard",
         "CONTROL_RESET_DEFAULTS": "Reset All: Hold %s",
         "CONTROL_UNBIND": "Unbind: Hold %s",
         "DETAIL_BILINEAR": "Bilinear",

diff --git a/data/tr1/ship/cfg/TR1X_gameflow_ub.json5 b/data/tr1/ship/cfg/TR1X_gameflow_ub.json5
@@ -155,13 +155,13 @@
     ],
 
     "strings": {
-        "CONTROL_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_KEYBOARD": "Keyboard",
         "CONTROL_CUSTOMIZE": "Customize Controls",
-        "CONTROL_CUSTOM_1": "Custom Scheme 1",
-        "CONTROL_CUSTOM_2": "Custom Scheme 2",
-        "CONTROL_CUSTOM_3": "Custom Scheme 3",
+        "CONTROL_CUSTOM_1": "User Keys 1",
+        "CONTROL_CUSTOM_2": "User Keys 2",
+        "CONTROL_CUSTOM_3": "User Keys 3",
         "CONTROL_DEFAULT_KEYS": "Default Keys",
-        "CONTROL_KEYBOARD": "Keyboard",
         "CONTROL_RESET_DEFAULTS": "Reset All: Hold %s",
         "CONTROL_UNBIND": "Unbind: Hold %s",
         "DETAIL_BILINEAR": "Bilinear",

diff --git a/data/tr2/ship/cfg/TR2X_gameflow.json5 b/data/tr2/ship/cfg/TR2X_gameflow.json5
@@ -351,9 +351,12 @@
     },
 
     "game_strings": {
-        "CONTROL_CUSTOM_1": "Custom Scheme 1",
-        "CONTROL_CUSTOM_2": "Custom Scheme 2",
-        "CONTROL_CUSTOM_3": "Custom Scheme 3",
+        "CONTROL_BACKEND_CONTROLLER": "Controller",
+        "CONTROL_BACKEND_KEYBOARD": "Keyboard",
+        "CONTROL_CUSTOMIZE": "Customize Controls",
+        "CONTROL_CUSTOM_1": "User Keys 1",
+        "CONTROL_CUSTOM_2": "User Keys 2",
+        "CONTROL_CUSTOM_3": "User Keys 3",
         "CONTROL_DEFAULT_KEYS": "Default Keys",
         "MISC_OFF": "Off",
         "MISC_ON": "On",

diff --git a/docs/tr2/progress.txt b/docs/tr2/progress.txt
@@ -261,18 +261,19 @@ typedef struct __unaligned {
     union {
         uint32_t all;
         struct {
-            uint32_t active:     1;
-            uint32_t flash:      1;
-            uint32_t rotate_h:   1;
-            uint32_t rotate_v:   1;
-            uint32_t centre_h:   1;
-            uint32_t centre_v:   1;
-            uint32_t hide:       1;
-            uint32_t right:      1;
-            uint32_t bottom:     1;
-            uint32_t background: 1;
-            uint32_t outline:    1;
-            uint32_t multiline:  1;
+            uint32_t active:      1;
+            uint32_t flash:       1;
+            uint32_t rotate_h:    1;
+            uint32_t rotate_v:    1;
+            uint32_t centre_h:    1;
+            uint32_t centre_v:    1;
+            uint32_t hide:        1;
+            uint32_t right:       1;
+            uint32_t bottom:      1;
+            uint32_t background:  1;
+            uint32_t outline:     1;
+            uint32_t multiline:   1;
+            uint32_t manual_draw: 1; // not present in the OG
         };
     } flags;
     uint16_t text_flags;