ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-07 16:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed WinMM offsets for IJoystickDevice2

Browse source
This commit is contained in:
Stefanos A 2013-12-24 16:42:48 +01:00 committed by thefiddler
parent f3cb578587
commit 9a90772cef
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Source/OpenTK/Platform/Windows/WinMMJoystick.cs
View file

@ -148,6 +148,12 @@ namespace OpenTK.Platform.Windows
return index >= 0 && index < UnsafeNativeMethods.joyGetNumDevs(); return index >= 0 && index < UnsafeNativeMethods.joyGetNumDevs();
} }
static short CalculateOffset(int pos, int min, int max)
{
int offset = (ushort.MaxValue * (pos - min)) / (max - min) - short.MaxValue;
return (short)offset;
}
#endregion #endregion
#region IJoystickDriver #region IJoystickDriver
@ -294,12 +300,16 @@ namespace OpenTK.Platform.Windows
JoystickError result = UnsafeNativeMethods.joyGetPosEx(index, ref info); JoystickError result = UnsafeNativeMethods.joyGetPosEx(index, ref info);
if (result == JoystickError.NoError) if (result == JoystickError.NoError)
{ {
state.SetAxis(JoystickAxis.Axis0, (short)info.XPos); JoyCaps caps;
state.SetAxis(JoystickAxis.Axis1, (short)info.YPos); result = UnsafeNativeMethods.joyGetDevCaps(index, out caps, JoyCaps.SizeInBytes);
state.SetAxis(JoystickAxis.Axis2, (short)info.ZPos); if (result == JoystickError.NoError)
state.SetAxis(JoystickAxis.Axis3, (short)info.RPos); {
state.SetAxis(JoystickAxis.Axis4, (short)info.ZPos); state.SetAxis(JoystickAxis.Axis0, CalculateOffset(info.XPos, caps.XMin, caps.XMax));
state.SetAxis(JoystickAxis.Axis5, (short)info.RPos); state.SetAxis(JoystickAxis.Axis1, CalculateOffset(info.YPos, caps.YMin, caps.YMax));
state.SetAxis(JoystickAxis.Axis2, CalculateOffset(info.ZPos, caps.ZMin, caps.ZMax));
state.SetAxis(JoystickAxis.Axis3, CalculateOffset(info.RPos, caps.RMin, caps.RMax));
state.SetAxis(JoystickAxis.Axis4, CalculateOffset(info.UPos, caps.UMin, caps.UMax));
state.SetAxis(JoystickAxis.Axis5, CalculateOffset(info.VPos, caps.VMin, caps.VMax));
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
{ {
@ -308,15 +318,12 @@ namespace OpenTK.Platform.Windows
state.SetIsConnected(true); state.SetIsConnected(true);
} }
else if (result == JoystickError.Unplugged) }
if (result == JoystickError.Unplugged)
{ {
UnplugJoystick(index); UnplugJoystick(index);
} }
else
{
// Joystick not existent or other error. No need to spam the log
//Debug.Print("[Win] WinMM joyGetPosEx failed. Error: {0}", result);
}
} }
else else
{ {