aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/Input/Controller/NpadController.cs
diff options
context:
space:
mode:
authormageven <62494521+mageven@users.noreply.github.com>2020-04-03 05:40:02 +0530
committerGitHub <noreply@github.com>2020-04-03 11:10:02 +1100
commit2365ddfc363e76ac1ac9d2e32ef9b36b85463431 (patch)
tree408bdb4a35e4f625a69ddbd65f22e9f056f7ebec /Ryujinx.HLE/Input/Controller/NpadController.cs
parent5b5239ab5b452f991d9fc4f8ad1f9a2880b8bad1 (diff)
HID SharedMem Rework (#1003)
* Delete old HLE.Input * Add new HLE Input. git shows Hid.cs as modified because of the same name. It is new. * Change HID Service * Change Ryujinx UI to reflect new Input * Add basic ControllerApplet * Add DebugPad Should fix Kirby Star Allies * Address Ac_K's comments * Moved all of HLE.Input to Services.Hid * Separated all structs and enums each to a file * Removed vars * Made some naming changes to align with switchbrew * Added official joycon colors As an aside, fixed a mistake in touchscreen headers and added checks to important SharedMem structs at init time. * Further address Ac_K's comments * Addressed gdkchan's and some more Ac_K's comments * Address AcK's review comments * Address AcK's second review comments * Replace missed Marshal.SizeOf and address gdkchan's comments
Diffstat (limited to 'Ryujinx.HLE/Input/Controller/NpadController.cs')
-rw-r--r--Ryujinx.HLE/Input/Controller/NpadController.cs68
1 files changed, 0 insertions, 68 deletions
diff --git a/Ryujinx.HLE/Input/Controller/NpadController.cs b/Ryujinx.HLE/Input/Controller/NpadController.cs
deleted file mode 100644
index b4304b8f..00000000
--- a/Ryujinx.HLE/Input/Controller/NpadController.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-namespace Ryujinx.HLE.Input
-{
- public class NpadController : BaseController
- {
- private (NpadColor Left, NpadColor Right) _npadBodyColors;
- private (NpadColor Left, NpadColor Right) _npadButtonColors;
-
- private bool _isHalf;
-
- public NpadController(
- ControllerStatus controllerStatus,
- Switch device,
- (NpadColor, NpadColor) npadBodyColors,
- (NpadColor, NpadColor) npadButtonColors) : base(device, controllerStatus)
- {
- _npadBodyColors = npadBodyColors;
- _npadButtonColors = npadButtonColors;
- }
-
- public override void Connect(ControllerId controllerId)
- {
- if (HidControllerType != ControllerStatus.NpadLeft && HidControllerType != ControllerStatus.NpadRight)
- {
- _isHalf = false;
- }
-
- ConnectionState = ControllerConnectionState.ControllerStateConnected;
-
- if (controllerId == ControllerId.ControllerHandheld)
- ConnectionState |= ControllerConnectionState.ControllerStateWired;
-
- ControllerColorDescription singleColorDesc =
- ControllerColorDescription.ColorDescriptionColorsNonexistent;
-
- ControllerColorDescription splitColorDesc = 0;
-
- NpadColor singleBodyColor = NpadColor.Black;
- NpadColor singleButtonColor = NpadColor.Black;
-
- Initialize(_isHalf,
- (_npadBodyColors.Left, _npadBodyColors.Right),
- (_npadButtonColors.Left, _npadButtonColors.Right),
- singleColorDesc,
- splitColorDesc,
- singleBodyColor,
- singleButtonColor );
-
- base.Connect(controllerId);
-
- var _currentLayout = ControllerLayouts.HandheldJoined;
-
- switch (HidControllerType)
- {
- case ControllerStatus.NpadLeft:
- _currentLayout = ControllerLayouts.Left;
- break;
- case ControllerStatus.NpadRight:
- _currentLayout = ControllerLayouts.Right;
- break;
- case ControllerStatus.NpadPair:
- _currentLayout = ControllerLayouts.Joined;
- break;
- }
-
- SetLayout(_currentLayout);
- }
- }
-}