Merge remote-tracking branch 'upstream/develop' into develop
Merge from upstream
This commit is contained in:
commit
7f70cd27a2
2 changed files with 9 additions and 4 deletions
|
@ -13,6 +13,8 @@ namespace OpenTK
|
|||
// minimal targets (e.g. MonoTouch).
|
||||
// Note: the "overriden" classes must not be fully qualified for this to work!
|
||||
|
||||
#if MINIMAL
|
||||
|
||||
// System.Diagnostics.Debug
|
||||
static class Debug
|
||||
{
|
||||
|
@ -39,8 +41,6 @@ namespace OpenTK
|
|||
public static void Flush() { }
|
||||
}
|
||||
|
||||
#if MINIMAL
|
||||
|
||||
// System.Diagnostics.Stopwatch
|
||||
sealed class Stopwatch
|
||||
{
|
||||
|
|
|
@ -83,8 +83,13 @@ 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
|
||||
{
|
||||
JoystickAxis axis = GetAxis(collection, page, usage);
|
||||
State.SetAxis(axis, value);
|
||||
//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);
|
||||
State.SetAxis(axis, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue