ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-08-04 21:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change: Simplify bounds checking

Browse source
This commit is contained in:
Christopher Lees 2017-07-11 12:38:05 +01:00
parent ac9a1fb697
commit b1450bc2f2
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,6 +341,12 @@ namespace OpenTK.Platform.Windows
HatPosition GetHatPosition(uint value, HidProtocolValueCaps caps) HatPosition GetHatPosition(uint value, HidProtocolValueCaps caps)
{ {
if (value > caps.LogicalMax)
{
//Return zero if our value is out of bounds ==> e.g.
//Thrustmaster T-Flight Hotas X returns 15 for the centered position
return HatPosition.Centered;
}
if (caps.LogicalMax == 3) if (caps.LogicalMax == 3)
{ {
//4-way hat switch as per the example in Appendix C //4-way hat switch as per the example in Appendix C
@ -355,8 +361,6 @@ namespace OpenTK.Platform.Windows
return HatPosition.Right; return HatPosition.Right;
case 3: case 3:
return HatPosition.Down; return HatPosition.Down;
default:
return HatPosition.Centered;
} }
} }
if (caps.LogicalMax == 8) if (caps.LogicalMax == 8)
@ -364,23 +368,12 @@ namespace OpenTK.Platform.Windows
//Hat states are represented as a plain number from 0-8 //Hat states are represented as a plain number from 0-8
//with centered being zero //with centered being zero
//Padding should have already been stripped out, so just cast //Padding should have already been stripped out, so just cast
if (value > 8)
{
//Value out of bounds, so return centered
return HatPosition.Centered;
}
return (HatPosition)value; return (HatPosition)value;
} }
if (caps.LogicalMax == 7) if (caps.LogicalMax == 7)
{ {
//Hat states are represented as a plain number from 0-7 //Hat states are represented as a plain number from 0-7
//with centered being 8 //with centered being 8
if (value > 8)
{
//Return zero if our value is out of bounds ==> e.g.
//Thrustmaster T-Flight Hotas X returns 15 for the centered position
return HatPosition.Centered;
}
value++; value++;
value %= 9; value %= 9;
return (HatPosition)value; return (HatPosition)value;