From 73f255ed1451796b6f9826b4f382bb4b505d3605 Mon Sep 17 00:00:00 2001 From: thefiddler Date: Fri, 12 Sep 2014 10:23:54 +0200 Subject: [PATCH] [Input] Fixed bitwise test for GamePadAxes --- Source/OpenTK/Platform/MappedGamePadDriver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/OpenTK/Platform/MappedGamePadDriver.cs b/Source/OpenTK/Platform/MappedGamePadDriver.cs index 99a0ce21..aab0f3e5 100644 --- a/Source/OpenTK/Platform/MappedGamePadDriver.cs +++ b/Source/OpenTK/Platform/MappedGamePadDriver.cs @@ -110,7 +110,7 @@ namespace OpenTK.Platform // the following line to support both. short value = pressed ? short.MaxValue : - map.Target.Axis == GamePadAxes.LeftTrigger || map.Target.Axis == GamePadAxes.RightTrigger ? + (map.Target.Axis & (GamePadAxes.LeftTrigger | GamePadAxes.RightTrigger)) != 0 ? short.MinValue : (short)0; pad.SetAxis(map.Target.Axis, value); @@ -157,7 +157,7 @@ namespace OpenTK.Platform // the following line to support both. short value = pressed ? short.MaxValue : - map.Target.Axis == GamePadAxes.LeftTrigger || map.Target.Axis == GamePadAxes.RightTrigger ? + (map.Target.Axis & (GamePadAxes.LeftTrigger | GamePadAxes.RightTrigger)) != 0 ? short.MinValue : (short)0; pad.SetAxis(map.Target.Axis, value);