From 4809e5effe7f54cdb67bc5e2b4f01315ae34efc5 Mon Sep 17 00:00:00 2001 From: John Clemis Date: Wed, 27 Jun 2018 14:26:19 -0500 Subject: [PATCH] Revert "Added Extra Configuration Options" This reverts commit 6cc56bfe7ed473fedf8dfe79c7a888bbe7cfe147. --- Ryujinx/Config.cs | 9 ++---- Ryujinx/Ryujinx.conf | 6 ---- Ryujinx/Ui/GLScreen.cs | 64 ++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 46 deletions(-) diff --git a/Ryujinx/Config.cs b/Ryujinx/Config.cs index e842fffbc..705c98d11 100644 --- a/Ryujinx/Config.cs +++ b/Ryujinx/Config.cs @@ -1,5 +1,4 @@ -using OpenTK.Input; -using Ryujinx.HLE.Input; +using Ryujinx.HLE.Input; using Ryujinx.HLE.Logging; using System; using System.Collections.Generic; @@ -14,8 +13,6 @@ namespace Ryujinx public static JoyCon FakeJoyCon { get; private set; } public static float GamePad_Deadzone; - public static bool GamePad_Enable; - public static int GamePad_Index; public static void Read(Logger Log) { @@ -33,9 +30,7 @@ namespace Ryujinx Log.SetEnable(LogLevel.Warning, Convert.ToBoolean(Parser.Value("Logging_Enable_Warn"))); Log.SetEnable(LogLevel.Error, Convert.ToBoolean(Parser.Value("Logging_Enable_Error"))); - GamePad_Enable = Convert.ToBoolean(Parser.Value("GamePad_Enable")); - GamePad_Index = Convert.ToInt32 (Parser.Value("GamePad_Index")); - GamePad_Deadzone = (float)Convert.ToDouble (Parser.Value("GamePad_Deadzone")); + GamePad_Deadzone = (float)Convert.ToDouble(Parser.Value("GamePad_Deadzone")); string[] FilteredLogClasses = Parser.Value("Logging_Filtered_Classes").Split(',', StringSplitOptions.RemoveEmptyEntries); diff --git a/Ryujinx/Ryujinx.conf b/Ryujinx/Ryujinx.conf index 146bf5efe..0f0492487 100644 --- a/Ryujinx/Ryujinx.conf +++ b/Ryujinx/Ryujinx.conf @@ -19,15 +19,9 @@ Logging_Enable_Error = true #Filtered log classes, seperated by ", ", eg. `Logging_Filtered_Classes = Loader, ServiceFS` Logging_Filtered_Classes = -#Controller Device Index -GamePad_Index = 0 - #Controller Analog Stick Deadzone GamePad_Deadzone = 0.05 -#Whether or not to enable Controller support -GamePad_Enable = true - #https://github.com/opentk/opentk/blob/develop/src/OpenTK/Input/Key.cs Controls_Left_FakeJoycon_Stick_Up = 105 Controls_Left_FakeJoycon_Stick_Down = 101 diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs index 1c68cfc1f..0614d99cd 100644 --- a/Ryujinx/Ui/GLScreen.cs +++ b/Ryujinx/Ui/GLScreen.cs @@ -95,46 +95,44 @@ namespace Ryujinx if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonR]) CurrentButton |= HidControllerButtons.KEY_R; if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonZR]) CurrentButton |= HidControllerButtons.KEY_ZR; } - if (Config.GamePad_Enable) - { - //Mapping it relative to the positions of the buttons on the controller - GamePadState gamePad = GamePad.GetState(0); + //Mapping it relative to the positions of the buttons on the controller - //RightButtons - if (gamePad.Buttons.B == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_A; - if (gamePad.Buttons.A == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_B; - if (gamePad.Buttons.Y == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_X; - if (gamePad.Buttons.X == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_Y; - if (gamePad.Buttons.RightStick == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_RSTICK; - if (gamePad.Buttons.Start == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_PLUS; - if (gamePad.Buttons.RightShoulder == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_R; - if (gamePad.Triggers.Right >= 0.5) CurrentButton |= HidControllerButtons.KEY_ZR; + GamePadState gamePad = GamePad.GetState(0); - //LeftButtons - if (gamePad.Buttons.LeftStick == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_LSTICK; - if (gamePad.DPad.IsUp) CurrentButton |= HidControllerButtons.KEY_DUP; - if (gamePad.DPad.IsDown) CurrentButton |= HidControllerButtons.KEY_DDOWN; - if (gamePad.DPad.IsLeft) CurrentButton |= HidControllerButtons.KEY_DLEFT; - if (gamePad.DPad.IsRight) CurrentButton |= HidControllerButtons.KEY_DRIGHT; - if (gamePad.Buttons.Back == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_MINUS; - if (gamePad.Buttons.LeftShoulder == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_L; - if (gamePad.Triggers.Left >= 0.5) CurrentButton |= HidControllerButtons.KEY_ZL; + //RightButtons + if (gamePad.Buttons.B == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_A; + if (gamePad.Buttons.A == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_B; + if (gamePad.Buttons.Y == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_X; + if (gamePad.Buttons.X == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_Y; + if (gamePad.Buttons.RightStick == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_RSTICK; + if (gamePad.Buttons.Start == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_PLUS; + if (gamePad.Buttons.RightShoulder == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_R; + if (gamePad.Triggers.Right >= 0.5) CurrentButton |= HidControllerButtons.KEY_ZR; - //RightJoystick - if (gamePad.ThumbSticks.Right.X >= deadzone || gamePad.ThumbSticks.Right.X <= -deadzone) - RightJoystickDY = (int)(-gamePad.ThumbSticks.Right.X * short.MaxValue); + //LeftButtons + if (gamePad.Buttons.LeftStick == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_LSTICK; + if (gamePad.DPad.IsUp) CurrentButton |= HidControllerButtons.KEY_DUP; + if (gamePad.DPad.IsDown) CurrentButton |= HidControllerButtons.KEY_DDOWN; + if (gamePad.DPad.IsLeft) CurrentButton |= HidControllerButtons.KEY_DLEFT; + if (gamePad.DPad.IsRight) CurrentButton |= HidControllerButtons.KEY_DRIGHT; + if (gamePad.Buttons.Back == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_MINUS; + if (gamePad.Buttons.LeftShoulder == ButtonState.Pressed) CurrentButton |= HidControllerButtons.KEY_L; + if (gamePad.Triggers.Left >= 0.5) CurrentButton |= HidControllerButtons.KEY_ZL; - if (gamePad.ThumbSticks.Right.Y >= deadzone || gamePad.ThumbSticks.Right.Y <= -deadzone) - RightJoystickDX = (int)(-gamePad.ThumbSticks.Right.Y * short.MaxValue); + //RightJoystick + if (gamePad.ThumbSticks.Right.X >= deadzone || gamePad.ThumbSticks.Right.X <= -deadzone) + RightJoystickDY = (int)(-gamePad.ThumbSticks.Right.X * short.MaxValue); - //LeftJoystick - if (gamePad.ThumbSticks.Left.X >= deadzone || gamePad.ThumbSticks.Left.X <= -deadzone) - LeftJoystickDX = (int)(gamePad.ThumbSticks.Left.X * short.MaxValue); + if (gamePad.ThumbSticks.Right.Y >= deadzone || gamePad.ThumbSticks.Right.Y <= -deadzone) + RightJoystickDX = (int)(-gamePad.ThumbSticks.Right.Y * short.MaxValue); - if (gamePad.ThumbSticks.Left.Y >= deadzone || gamePad.ThumbSticks.Left.Y <= -deadzone) - LeftJoystickDY = (int)(gamePad.ThumbSticks.Left.Y * short.MaxValue); - } + //LeftJoystick + if (gamePad.ThumbSticks.Left.X >= deadzone || gamePad.ThumbSticks.Left.X <= -deadzone) + LeftJoystickDX = (int)(gamePad.ThumbSticks.Left.X * short.MaxValue); + + if (gamePad.ThumbSticks.Left.Y >= deadzone || gamePad.ThumbSticks.Left.Y <= -deadzone) + LeftJoystickDY = (int)(gamePad.ThumbSticks.Left.Y * short.MaxValue); LeftJoystick = new HidJoystickPosition {