manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-09 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes in compliance with review

Browse source
This commit is contained in:
John Clemis 2018-06-28 17:47:05 -05:00
parent 42c3bde419
commit 6a4cabba1e
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx/Config.cs
View file

@ -1,5 +1,5 @@
using OpenTK.Input; using OpenTK.Input;
using Ryujinx.HLE.Input; using Ryujinx.UI.Input;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

32
Ryujinx/Ui/GLScreen.cs
View file

@ -59,58 +59,58 @@ namespace Ryujinx
private ButtonState GetGamePadButtonFromString(GamePadState GamePad, string Button) //Please make this prettier if you can. private ButtonState GetGamePadButtonFromString(GamePadState GamePad, string Button) //Please make this prettier if you can.
{ {
ButtonState result = GamePad.Buttons.A; ButtonState Result = GamePad.Buttons.A;
switch (Button) switch (Button)
{ {
case "A": case "A":
result = GamePad.Buttons.A; Result = GamePad.Buttons.A;
break; break;
case "B": case "B":
result = GamePad.Buttons.B; Result = GamePad.Buttons.B;
break; break;
case "X": case "X":
result = GamePad.Buttons.X; Result = GamePad.Buttons.X;
break; break;
case "Y": case "Y":
result = GamePad.Buttons.Y; Result = GamePad.Buttons.Y;
break; break;
case "LStick": case "LStick":
result = GamePad.Buttons.LeftStick; Result = GamePad.Buttons.LeftStick;
break; break;
case "RStick": case "RStick":
result = GamePad.Buttons.RightStick; Result = GamePad.Buttons.RightStick;
break; break;
case "LShoulder": case "LShoulder":
result = GamePad.Buttons.LeftShoulder; Result = GamePad.Buttons.LeftShoulder;
break; break;
case "RShoulder": case "RShoulder":
result = GamePad.Buttons.RightShoulder; Result = GamePad.Buttons.RightShoulder;
break; break;
case "DPadUp": case "DPadUp":
result = GamePad.DPad.Up; Result = GamePad.DPad.Up;
break; break;
case "DPadDown": case "DPadDown":
result = GamePad.DPad.Down; Result = GamePad.DPad.Down;
break; break;
case "DPadLeft": case "DPadLeft":
result = GamePad.DPad.Left; Result = GamePad.DPad.Left;
break; break;
case "DPadRight": case "DPadRight":
result = GamePad.DPad.Right; Result = GamePad.DPad.Right;
break; break;
case "Start": case "Start":
result = GamePad.Buttons.Start; Result = GamePad.Buttons.Start;
break; break;
case "Back": case "Back":
result = GamePad.Buttons.Back; Result = GamePad.Buttons.Back;
break; break;
default: default:
Console.Error.WriteLine("Invalid Button Mapping \"" + Button + "\"! Defaulting to Button A."); Console.Error.WriteLine("Invalid Button Mapping \"" + Button + "\"! Defaulting to Button A.");
break; break;
} }
return result; return Result;
} }
private float GetGamePadTriggerFromString(GamePadState GamePad, string Trigger) private float GetGamePadTriggerFromString(GamePadState GamePad, string Trigger)

2
Ryujinx.HLE/Hid/JoyConController.cs → Ryujinx/Ui/JoyConController.cs
View file

@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace Ryujinx.HLE.Input namespace Ryujinx.UI.Input
{ {
public struct JoyConControllerLeft public struct JoyConControllerLeft
{ {

2
Ryujinx.HLE/Hid/JoyConKeyboard.cs → Ryujinx/Ui/JoyConKeyboard.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.Input namespace Ryujinx.UI.Input
{ {
public struct JoyConKeyboardLeft public struct JoyConKeyboardLeft
{ {