totallyregularhuman/Ryujinx
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Fix homebrew input (#528)

Browse source 
* fix homebrew input
This commit is contained in:
emmauss 2018-12-07 22:59:38 +02:00 committed by GitHub
parent 5b4382f459
commit f1529b1bc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.HLE/Input/Hid.cs
View file

@ -39,7 +39,7 @@ namespace Ryujinx.HLE.Input
PrimaryController.Connect(controllerId); PrimaryController.Connect(controllerId);
} }
private HidControllerButtons UpdateStickButtons( public HidControllerButtons UpdateStickButtons(
HidJoystickPosition leftStick, HidJoystickPosition leftStick,
HidJoystickPosition rightStick) HidJoystickPosition rightStick)
{ {

6
Ryujinx.HLE/Input/HidNpadController.cs
View file

@ -81,6 +81,12 @@
Device.Memory.WriteInt64(controllerOffset + 0x28, Device.Memory.WriteInt64(controllerOffset + 0x28,
(Connected ? (uint)HidControllerConnState.ControllerStateConnected : 0) | (Connected ? (uint)HidControllerConnState.ControllerStateConnected : 0) |
(_currentLayout == HidControllerLayouts.HandheldJoined ? (uint)HidControllerConnState.ControllerStateWired : 0)); (_currentLayout == HidControllerLayouts.HandheldJoined ? (uint)HidControllerConnState.ControllerStateWired : 0));
controllerOffset = WriteInput(buttons, leftStick, rightStick, HidControllerLayouts.Main);
Device.Memory.WriteInt64(controllerOffset + 0x28,
(Connected ? (uint)HidControllerConnState.ControllerStateWired : 0) |
(uint)HidControllerConnState.ControllerStateWired);
} }
} }
} }

6
Ryujinx.HLE/Input/HidProController.cs
View file

@ -39,6 +39,12 @@
Device.Memory.WriteInt64(controllerOffset + 0x28, Device.Memory.WriteInt64(controllerOffset + 0x28,
(Connected ? (uint)HidControllerConnState.ControllerStateConnected : 0) | (Connected ? (uint)HidControllerConnState.ControllerStateConnected : 0) |
(_wired ? (uint)HidControllerConnState.ControllerStateWired : 0)); (_wired ? (uint)HidControllerConnState.ControllerStateWired : 0));
controllerOffset = WriteInput(buttons, leftStick, rightStick, HidControllerLayouts.Main);
Device.Memory.WriteInt64(controllerOffset + 0x28,
(Connected ? (uint)HidControllerConnState.ControllerStateWired : 0) |
(uint)HidControllerConnState.ControllerStateWired);
} }
} }
} }

2
Ryujinx/Ui/GLScreen.cs
View file

@ -174,6 +174,8 @@ namespace Ryujinx
Dy = rightJoystickDy Dy = rightJoystickDy
}; };
currentButton |= _device.Hid.UpdateStickButtons(leftJoystick, rightJoystick);
bool hasTouch = false; bool hasTouch = false;
//Get screen touch position from left mouse click //Get screen touch position from left mouse click