ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-02-24 20:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Input] LegacyJoystickDriver now reports hat pos

Browse source
This commit is contained in:
thefiddler 2014-03-17 00:30:19 +01:00
parent f93d464f62
commit cae62151b8
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +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
joysticks[i] = new LegacyJoystickDevice(i, caps.AxisCount, caps.ButtonCount); joysticks[i] = new LegacyJoystickDevice(
i,
caps.AxisCount + 2 * caps.HatCount,
caps.ButtonCount);
//device.Description = Joystick.GetName(i); //device.Description = Joystick.GetName(i);
joysticks[i].Description = ConnectedName; joysticks[i].Description = ConnectedName;
@ -78,16 +81,41 @@ namespace OpenTK.Platform
} }
JoystickState state = Joystick.GetState(i); JoystickState state = Joystick.GetState(i);
for (int axis_index = 0; axis_index < (int)caps.AxisCount; axis_index++) for (int axis_index = 0; axis_index < 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)caps.ButtonCount; button_index++) for (int button_index = 0; button_index < 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);
} }
for (int hat_index = 0; hat_index < caps.HatCount; hat_index++)
{
// LegacyJoystickDriver report hats as pairs of axes
// Make sure we have enough axes left for this mapping
int axis_index = caps.AxisCount + 2 * hat_index;
if (axis_index < JoystickState.MaxAxes)
{
JoystickHat hat = JoystickHat.Hat0 + hat_index;
JoystickHatState hat_state = state.GetHat(hat);
JoystickAxis axis = JoystickAxis.Axis0 + axis_index;
float x = 0;
float y = 0;
if (hat_state.IsDown)
y--;
if (hat_state.IsUp)
y++;
if (hat_state.IsLeft)
x--;
if (hat_state.IsRight)
x++;
joysticks[i].SetAxis(axis, x);
joysticks[i].SetAxis(axis + 1, y);
}
}
} }
} }