Fix WMR Bindings (#38)

* Fix generic Microsoft WMR bindings Currently the inventory and jump button are set to the same button on the right WMR controller, making jumping impossible because you open your inventory at the same time. * Fix generic WMR bindings Mirror changes made in VanillaGameplayActionSet for WMR bindings.
mcxr-org · Mar 6, 2022 · af289ec · af289ec
1 parent a8dcdc9
commit af289ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/mcxr-play/src/main/java/net/sorenon/mcxr/play/input/actionsets/GuiActionSet.java b/mcxr-play/src/main/java/net/sorenon/mcxr/play/input/actionsets/GuiActionSet.java
@@ -66,7 +66,8 @@ public void getDefaultBindings(HashMap<String, List<Pair<Action, String>>> map)
                         new Pair<>(pickup, "/user/hand/right/input/trigger/value"),
                         new Pair<>(split, "/user/hand/right/input/trackpad/click"),
                         new Pair<>(quickMove, "/user/hand/left/input/trigger/value"),
-                        new Pair<>(exit, "/user/hand/left/input/trackpad/click"),
+                        new Pair<>(exit, "/user/hand/left/input/menu/click"),
+                        new Pair<>(exit, "/user/hand/right/input/menu/click"),
                         new Pair<>(scroll, "/user/hand/right/input/thumbstick")
                 )
         );

diff --git a/mcxr-play/src/main/java/net/sorenon/mcxr/play/input/actionsets/VanillaGameplayActionSet.java b/mcxr-play/src/main/java/net/sorenon/mcxr/play/input/actionsets/VanillaGameplayActionSet.java
@@ -106,12 +106,12 @@ public void getDefaultBindings(HashMap<String, List<Pair<Action, String>>> map)
                         new Pair<>(move, "/user/hand/left/input/thumbstick"),
                         new Pair<>(hotbar, "/user/hand/right/input/thumbstick/y"),
                         new Pair<>(turn, "/user/hand/right/input/thumbstick/x"),
-                        new Pair<>(inventory, "/user/hand/left/input/trackpad/click"),
+                        new Pair<>(inventory, "/user/hand/left/input/menu/click"),
                         new Pair<>(jump, "/user/hand/right/input/trackpad/click"),
                         new Pair<>(sprint, "/user/hand/right/input/squeeze/click"),
                         new Pair<>(sneak, "/user/hand/left/input/squeeze/click"),
-                        new Pair<>(resetPos, "/user/hand/right/input/thumbstick/click"),
-                        new Pair<>(inventory, "/user/hand/right/input/trackpad/click")
+                        new Pair<>(resetPos, "/user/hand/left/input/trackpad/click"),
+                        new Pair<>(inventory, "/user/hand/right/input/menu/click")
                 )
         );
         if (MCXRPlayClient.OPEN_XR.instance.handle.getCapabilities().XR_EXT_hp_mixed_reality_controller) {