ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-06-01 12:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OpenTK] Fixed polling

Browse source
This commit is contained in:
thefiddler 2014-01-15 01:19:45 +01:00
parent e7f037b0a2
commit e6a9adf494
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/OpenTK/Platform/LegacyJoystickDriver.cs
View file

@ -65,9 +65,10 @@ namespace OpenTK.Platform
if (caps.IsConnected && joysticks[i].Description == DisconnectedName) if (caps.IsConnected && joysticks[i].Description == DisconnectedName)
{ {
// New joystick connected // New joystick connected
JoystickDevice device = new LegacyJoystickDevice(i, caps.AxisCount, caps.ButtonCount); joysticks[i] = new LegacyJoystickDevice(i, caps.AxisCount, caps.ButtonCount);
//device.Description = Joystick.GetName(i); //device.Description = Joystick.GetName(i);
device.Description = ConnectedName; joysticks[i].Description = ConnectedName;
} }
else if (!caps.IsConnected && joysticks[i].Description != DisconnectedName) else if (!caps.IsConnected && joysticks[i].Description != DisconnectedName)
{ {
@ -77,12 +78,12 @@ namespace OpenTK.Platform
} }
JoystickState state = Joystick.GetState(i); JoystickState state = Joystick.GetState(i);
for (int axis_index = 0; axis_index < (int)JoystickAxis.Last; axis_index++) for (int axis_index = 0; axis_index < (int)caps.AxisCount; axis_index++)
{ {
JoystickAxis axis = JoystickAxis.Axis0 + axis_index; JoystickAxis axis = JoystickAxis.Axis0 + axis_index;
joysticks[i].SetAxis(axis, state.GetAxis(axis)); joysticks[i].SetAxis(axis, state.GetAxis(axis));
} }
for (int button_index = 0; button_index < (int)JoystickButton.Last; button_index++) for (int button_index = 0; button_index < (int)caps.ButtonCount; button_index++)
{ {
JoystickButton button = JoystickButton.Button0 + button_index; JoystickButton button = JoystickButton.Button0 + button_index;
joysticks[i].SetButton(button, state.GetButton(button) == ButtonState.Pressed); joysticks[i].SetButton(button, state.GetButton(button) == ButtonState.Pressed);
@ -96,6 +97,7 @@ namespace OpenTK.Platform
{ {
get get
{ {
Poll();
return joysticks_readonly; return joysticks_readonly;
} }
} }