ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #481 from leezer3/NegativeAxis

Browse source 
Fix: Joysticks with an axis range below zero were inverted
This commit is contained in:
varon 2017-02-09 11:31:11 +02:00 committed by GitHub
commit 519d13ccde
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/OpenTK/Platform/Windows/WinRawJoystick.cs
View file

@ -83,8 +83,8 @@ namespace OpenTK.Platform.Windows
{
if (page == HIDPage.GenericDesktop || page == HIDPage.Simulation) // set axis only when HIDPage is known by HidHelper.TranslateJoystickAxis() to avoid axis0 to be overwritten by unknown HIDPage
{
//Certain joysticks (Speedlink Black Widow, PS3 pad connected via USB)
//return an invalid HID page of 1, so
//Certain joysticks (Speedlink Black Widow, PS3 pad connected via USB)
//return an invalid HID page of 1, so
if ((int)usage != 1)
{
JoystickAxis axis = GetAxis(collection, page, usage);
@ -405,11 +405,24 @@ namespace OpenTK.Platform.Windows
}
else
{
short scaled_value = (short)HidHelper.ScaleValue(
(int)((long)value + stick.AxisCaps[i].LogicalMin),
stick.AxisCaps[i].LogicalMin, stick.AxisCaps[i].LogicalMax,
Int16.MinValue, Int16.MaxValue);
stick.SetAxis(collection, page, usage, scaled_value);
if (stick.AxisCaps[i].LogicalMin > 0)
{
short scaled_value = (short) HidHelper.ScaleValue(
(int) ((long) value + stick.AxisCaps[i].LogicalMin),
stick.AxisCaps[i].LogicalMin, stick.AxisCaps[i].LogicalMax,
Int16.MinValue, Int16.MaxValue);
stick.SetAxis(collection, page, usage, scaled_value);
}
else
{
//If our stick returns a minimum value below zero, we should not add this to our value
//before attempting to scale it, as this then inverts the value
short scaled_value = (short)HidHelper.ScaleValue(
(int)(long)value,
stick.AxisCaps[i].LogicalMin, stick.AxisCaps[i].LogicalMax,
Int16.MinValue, Int16.MaxValue);
stick.SetAxis(collection, page, usage, scaled_value);
}
}
}
}