From c8ac81aa8d8b7ff1b7f09b7c5a25724b812d3145 Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 9 Oct 2018 16:29:36 +0200 Subject: [PATCH] hid: Implement KEY_RSTICK_* & KEY_LSTICK_* --- Ryujinx.HLE/Hid/Hid.cs | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/Ryujinx.HLE/Hid/Hid.cs b/Ryujinx.HLE/Hid/Hid.cs index 0353b3baec..e634761d42 100644 --- a/Ryujinx.HLE/Hid/Hid.cs +++ b/Ryujinx.HLE/Hid/Hid.cs @@ -114,6 +114,55 @@ namespace Ryujinx.HLE.Input Device.Memory.WriteInt32(BaseControllerOffset + 0x24, (int)RightColorButtons); } + private HidControllerButtons UpdateStickButtons( + HidJoystickPosition LeftStick, + HidJoystickPosition RightStick) + { + HidControllerButtons Result = 0; + + if (RightStick.DX < 0) + { + Result |= HidControllerButtons.KEY_RSTICK_LEFT; + } + + if (RightStick.DX > 0) + { + Result |= HidControllerButtons.KEY_RSTICK_RIGHT; + } + + if (RightStick.DY < 0) + { + Result |= HidControllerButtons.KEY_RSTICK_DOWN; + } + + if (LeftStick.DY > 0) + { + Result |= HidControllerButtons.KEY_RSTICK_UP; + } + + if (LeftStick.DX < 0) + { + Result |= HidControllerButtons.KEY_LSTICK_LEFT; + } + + if (LeftStick.DX > 0) + { + Result |= HidControllerButtons.KEY_LSTICK_RIGHT; + } + + if (LeftStick.DY < 0) + { + Result |= HidControllerButtons.KEY_LSTICK_DOWN; + } + + if (LeftStick.DY > 0) + { + Result |= HidControllerButtons.KEY_LSTICK_UP; + } + + return Result; + } + public void SetJoyconButton( HidControllerId ControllerId, HidControllerLayouts ControllerLayout, @@ -121,6 +170,8 @@ namespace Ryujinx.HLE.Input HidJoystickPosition LeftStick, HidJoystickPosition RightStick) { + Buttons |= UpdateStickButtons(LeftStick, RightStick); + long ControllerOffset = HidPosition + HidControllersOffset; ControllerOffset += (int)ControllerId * HidControllerSize;