ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 10:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Input] Do not throw exception on too many axes

Browse source 
A joystick device with more axes/buttons/hats than supported will now
register a warning message instead of throwing an exception.

Fixes an issue with the VMware touch driver, which registers 25 distinct
axes.
This commit is contained in:
thefiddler 2014-09-02 22:10:26 +02:00
parent f829b3d732
commit ec37a9a16d
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Source/OpenTK/Input/JoystickCapabilities.cs
View file

@ -29,6 +29,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Text; using System.Text;
namespace OpenTK.Input namespace OpenTK.Input
@ -48,11 +49,18 @@ namespace OpenTK.Input
internal JoystickCapabilities(int axis_count, int button_count, int hat_count, bool is_connected) internal JoystickCapabilities(int axis_count, int button_count, int hat_count, bool is_connected)
{ {
if (axis_count < 0 || axis_count > JoystickState.MaxAxes) if (axis_count < 0 || axis_count > JoystickState.MaxAxes)
throw new ArgumentOutOfRangeException("axis_count"); Debug.Print("[{0}] Axis count {1} out of range (0, {2})",
typeof(JoystickCapabilities).Name, axis_count, JoystickState.MaxAxes);
if (button_count < 0 || button_count > JoystickState.MaxButtons) if (button_count < 0 || button_count > JoystickState.MaxButtons)
throw new ArgumentOutOfRangeException("axis_count"); Debug.Print("[{0}] Button count {1} out of range (0, {2})",
typeof(JoystickCapabilities).Name, button_count, JoystickState.MaxButtons);
if (hat_count < 0 || hat_count > JoystickState.MaxHats) if (hat_count < 0 || hat_count > JoystickState.MaxHats)
throw new ArgumentOutOfRangeException("hat_count"); Debug.Print("[{0}] Hat count {1} out of range (0, {2})",
typeof(JoystickCapabilities).Name, hat_count, JoystickState.MaxHats);
axis_count = MathHelper.Clamp(axis_count, 0, JoystickState.MaxAxes);
button_count = MathHelper.Clamp(button_count, 0, JoystickState.MaxButtons);
hat_count = MathHelper.Clamp(hat_count, 0, JoystickState.MaxHats);
this.axis_count = (byte)axis_count; this.axis_count = (byte)axis_count;
this.button_count = (byte)button_count; this.button_count = (byte)button_count;