Axis support for LT and RT

XITRIX · Feb 18, 2024 · 692c830 · 692c830
1 parent 7a658c0
commit 692c830
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/src/streaming/InputManager.cpp b/app/src/streaming/InputManager.cpp
@@ -146,14 +146,16 @@ GamepadState MoonlightInputManager::getControllerState(int controllerNum,
         &rawController, controllerNum);
     controller = mapController(rawController);
 
+    // Use axis or button if axis is not available (equals 0)
+    float lzAxis = controller.axes[LEFT_Z] > 0 ? controller.axes[LEFT_Z] : (controller.buttons[brls::BUTTON_LT] ? 1.f : 0.f);
+    float rzAxis = controller.axes[RIGHT_Z] > 0 ? controller.axes[RIGHT_Z] : (controller.buttons[brls::BUTTON_RT] ? 1.f : 0.f);
+
     GamepadState gamepadState{
         .buttonFlags = 0,
         .leftTrigger = static_cast<unsigned char>(
-            0xFFFF *
-            (!specialKey && controller.buttons[brls::BUTTON_LT] ? 1 : 0)),
+            0xFFFF * (!specialKey ? lzAxis : 0)),
         .rightTrigger = static_cast<unsigned char>(
-            0xFFFF *
-            (!specialKey && controller.buttons[brls::BUTTON_RT] ? 1 : 0)),
+            0xFFFF * (!specialKey ? rzAxis : 0)),
         .leftStickX = static_cast<short>(
             0x7FFF * (!specialKey ? controller.axes[brls::LEFT_X] : 0)),
         .leftStickY = static_cast<short>(

diff --git a/extern/borealis b/extern/borealis
+3 −2		library/include/borealis/core/input.hpp
+3 −1		library/lib/platforms/glfw/glfw_input.cpp
+3 −1		library/lib/platforms/sdl/sdl_input.cpp
+3 −0		library/lib/platforms/switch/switch_input.cpp