diff options
| author | Alex Barney <thealexbarney@gmail.com> | 2018-12-06 05:16:24 -0600 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-12-06 09:16:24 -0200 |
| commit | fb1d9493a3d43f2b86c551682586905a1f0e9ea7 (patch) | |
| tree | d842685ff5bdd45d11d94bd1a45a002b9d532fe7 /Ryujinx.HLE/Input/HidProController.cs | |
| parent | 3615a70cae3f89197fe185dfc5d0a47fa42151d9 (diff) | |
Adjust naming conventions and general refactoring in HLE Project (#527)
* Rename enum fields
* Naming conventions
* Remove unneeded ".this"
* Remove unneeded semicolons
* Remove unused Usings
* Don't use var
* Remove unneeded enum underlying types
* Explicitly label class visibility
* Remove unneeded @ prefixes
* Remove unneeded commas
* Remove unneeded if expressions
* Method doesn't use unsafe code
* Remove unneeded casts
* Initialized objects don't need an empty constructor
* Remove settings from DotSettings
* Revert "Explicitly label class visibility"
This reverts commit ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51.
* Small changes
* Revert external enum renaming
* Changes from feedback
* Apply previous refactorings to the merged code
Diffstat (limited to 'Ryujinx.HLE/Input/HidProController.cs')
| -rw-r--r-- | Ryujinx.HLE/Input/HidProController.cs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/Ryujinx.HLE/Input/HidProController.cs b/Ryujinx.HLE/Input/HidProController.cs index 40c79fed..f08fb085 100644 --- a/Ryujinx.HLE/Input/HidProController.cs +++ b/Ryujinx.HLE/Input/HidProController.cs @@ -2,43 +2,43 @@ { public class HidProController : HidControllerBase { - bool Wired = false; + bool _wired = false; - public HidProController(Switch Device) : base(HidControllerType.ProController, Device) + public HidProController(Switch device) : base(HidControllerType.ProController, device) { - Wired = true; + _wired = true; } - public override void Connect(HidControllerId ControllerId) + public override void Connect(HidControllerId controllerId) { - base.Connect(ControllerId); + base.Connect(controllerId); - HidControllerColorDesc SingleColorDesc = - HidControllerColorDesc.ColorDesc_ColorsNonexistent; + HidControllerColorDesc singleColorDesc = + HidControllerColorDesc.ColorDescColorsNonexistent; - HidControllerColorDesc SplitColorDesc = 0; + HidControllerColorDesc splitColorDesc = 0; - NpadColor SingleColorBody = NpadColor.Black; - NpadColor SingleColorButtons = NpadColor.Black; + NpadColor singleColorBody = NpadColor.Black; + NpadColor singleColorButtons = NpadColor.Black; - Device.Memory.WriteInt32(Offset + 0x08, (int)SingleColorDesc); - Device.Memory.WriteInt32(Offset + 0x0c, (int)SingleColorBody); - Device.Memory.WriteInt32(Offset + 0x10, (int)SingleColorButtons); - Device.Memory.WriteInt32(Offset + 0x14, (int)SplitColorDesc); + Device.Memory.WriteInt32(Offset + 0x08, (int)singleColorDesc); + Device.Memory.WriteInt32(Offset + 0x0c, (int)singleColorBody); + Device.Memory.WriteInt32(Offset + 0x10, (int)singleColorButtons); + Device.Memory.WriteInt32(Offset + 0x14, (int)splitColorDesc); Connected = true; } public override void SendInput( - HidControllerButtons Buttons, - HidJoystickPosition LeftStick, - HidJoystickPosition RightStick) + HidControllerButtons buttons, + HidJoystickPosition leftStick, + HidJoystickPosition rightStick) { - long ControllerOffset = WriteInput(Buttons, LeftStick, RightStick, HidControllerLayouts.Pro_Controller); + long controllerOffset = WriteInput(buttons, leftStick, rightStick, HidControllerLayouts.ProController); - Device.Memory.WriteInt64(ControllerOffset + 0x28, - (Connected ? (uint)HidControllerConnState.Controller_State_Connected : 0) | - (Wired ? (uint)HidControllerConnState.Controller_State_Wired : 0)); + Device.Memory.WriteInt64(controllerOffset + 0x28, + (Connected ? (uint)HidControllerConnState.ControllerStateConnected : 0) | + (_wired ? (uint)HidControllerConnState.ControllerStateWired : 0)); } } } |