mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 08:25:46 +00:00
parent
5b4382f459
commit
f1529b1bc2
4 changed files with 15 additions and 1 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue