ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Input] Cleaned up line endings and joystick hat mapping

Browse source
This commit is contained in:
thefiddler 2014-07-29 23:21:37 +02:00
parent fe1d465b85
commit e243316e8e
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Source/OpenTK/Platform/MappedGamePadDriver.cs
View file

@ -122,26 +122,27 @@ namespace OpenTK.Platform
{
// JoystickHat -> Buttons/GamePadAxes mapping
JoystickHat source_hat = map.Source.Hat;
JoystickHatState state = joy.GetHat(source_hat);
bool pressed = false;
switch (map.Source.HatPosition)
{
case HatPosition.Down:
pressed = joy.GetHat(source_hat).IsDown;
break;
bool pressed = false;
switch (map.Source.HatPosition)
{
case HatPosition.Down:
pressed = state.IsDown;
break;
case HatPosition.Up:
pressed = joy.GetHat(source_hat).IsUp;
break;
case HatPosition.Up:
pressed = state.IsUp;
break;
case HatPosition.Left:
pressed = joy.GetHat(source_hat).IsLeft;
break;
case HatPosition.Left:
pressed = state.IsLeft;
break;
case HatPosition.Right:
pressed = joy.GetHat(source_hat).IsRight;
break;
}
case HatPosition.Right:
pressed = state.IsRight;
break;
}
switch (map.Target.Type)
{

16
Source/OpenTK/Platform/SDL2/Sdl2JoystickDriver.cs
View file

@ -127,28 +127,28 @@ namespace OpenTK.Platform.SDL2
OpenTK.Input.HatPosition TranslateHat(HatPosition value)
{
if ((value & HatPosition.LeftUp) == HatPosition.LeftUp)
if ((value & HatPosition.LeftUp) == HatPosition.LeftUp)
return OpenTK.Input.HatPosition.UpLeft;
if ((value & HatPosition.RightUp) == HatPosition.RightUp)
if ((value & HatPosition.RightUp) == HatPosition.RightUp)
return OpenTK.Input.HatPosition.UpRight;
if ((value & HatPosition.LeftDown) == HatPosition.LeftDown)
if ((value & HatPosition.LeftDown) == HatPosition.LeftDown)
return OpenTK.Input.HatPosition.DownLeft;
if ((value & HatPosition.RightDown) == HatPosition.RightDown)
if ((value & HatPosition.RightDown) == HatPosition.RightDown)
return OpenTK.Input.HatPosition.DownRight;
if ((value & HatPosition.Up) == HatPosition.Up)
if ((value & HatPosition.Up) == HatPosition.Up)
return OpenTK.Input.HatPosition.Up;
if ((value & HatPosition.Right) == HatPosition.Right)
if ((value & HatPosition.Right) == HatPosition.Right)
return OpenTK.Input.HatPosition.Right;
if ((value & HatPosition.Down) == HatPosition.Down)
if ((value & HatPosition.Down) == HatPosition.Down)
return OpenTK.Input.HatPosition.Down;
if ((value & HatPosition.Left) == HatPosition.Left)
if ((value & HatPosition.Left) == HatPosition.Left)
return OpenTK.Input.HatPosition.Left;
return OpenTK.Input.HatPosition.Centered;