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

Merge remote-tracking branch 'upstream/develop' into develop

Browse source 
Merge from upstream
This commit is contained in:
Tzach Shabtay 2017-01-31 22:37:39 -05:00
parent f310f4a119 0abd2cc361
commit 7f70cd27a2
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/OpenTK/Minimal.cs
View file

@ -13,6 +13,8 @@ namespace OpenTK
// minimal targets (e.g. MonoTouch). // minimal targets (e.g. MonoTouch).
// Note: the "overriden" classes must not be fully qualified for this to work! // Note: the "overriden" classes must not be fully qualified for this to work!
#if MINIMAL
// System.Diagnostics.Debug // System.Diagnostics.Debug
static class Debug static class Debug
{ {
@ -39,8 +41,6 @@ namespace OpenTK
public static void Flush() { } public static void Flush() { }
} }
#if MINIMAL
// System.Diagnostics.Stopwatch // System.Diagnostics.Stopwatch
sealed class Stopwatch sealed class Stopwatch
{ {

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

@ -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 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); //Certain joysticks (Speedlink Black Widow, PS3 pad connected via USB)
State.SetAxis(axis, value); //return an invalid HID page of 1, so
if ((int)usage != 1)
{
JoystickAxis axis = GetAxis(collection, page, usage);
State.SetAxis(axis, value);
}
} }
} }