daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-12-24 08:31:22 -08:00
Code Issues Packages Projects Releases Wiki Activity

hid: Implement KEY_RSTICK_* & KEY_LSTICK_* (#466)

Browse Source 
* hid: Implement KEY_RSTICK_* & KEY_LSTICK_*

* Fix KEY_RSTICK_UP
This commit is contained in:
Thomas Guillemard 2018-10-27 20:36:49 +02:00 committed by Ac_K
parent 00d4f44bbb
commit 19152def95
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Ryujinx.HLE/Hid/Hid.cs
View File

@ -114,6 +114,55 @@ namespace Ryujinx.HLE.Input
Device.Memory.WriteInt32(BaseControllerOffset + 0x24, (int)RightColorButtons); 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 (RightStick.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( public void SetJoyconButton(
HidControllerId ControllerId, HidControllerId ControllerId,
HidControllerLayouts ControllerLayout, HidControllerLayouts ControllerLayout,
@ -121,6 +170,8 @@ namespace Ryujinx.HLE.Input
HidJoystickPosition LeftStick, HidJoystickPosition LeftStick,
HidJoystickPosition RightStick) HidJoystickPosition RightStick)
{ {
Buttons |= UpdateStickButtons(LeftStick, RightStick);
long ControllerOffset = HidPosition + HidControllersOffset; long ControllerOffset = HidPosition + HidControllersOffset;
ControllerOffset += (int)ControllerId * HidControllerSize; ControllerOffset += (int)ControllerId * HidControllerSize;