diff options
| author | emmauss <emmausssss@gmail.com> | 2020-09-29 21:32:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 23:32:42 +0200 |
| commit | 26319d5ab3a4d2f93fc7acb70760d9f96575ee07 (patch) | |
| tree | 797d5d828785813d141949decacd6d55f0d4dc0e /Ryujinx.Common/Configuration | |
| parent | a6f8a0b01ed3c36d537825de4c27acdec4e7d638 (diff) | |
Add Motion controls (#1363)
* Add motion controls
Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* cleanup
* add reference orientation and derive relative orientation from it
* cleanup
* remove unused variable and strange file
* Review_2.
* change GetInput to TryGetInput
* Review_3.
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Co-authored-by: LDj3SNuD <dvitiello@gmail.com>
Diffstat (limited to 'Ryujinx.Common/Configuration')
| -rw-r--r-- | Ryujinx.Common/Configuration/ConfigurationFileFormat.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/ConfigurationState.cs | 22 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/Hid/InputConfig.cs | 40 |
3 files changed, 59 insertions, 5 deletions
diff --git a/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs b/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs index cab38046..7ea38bac 100644 --- a/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs +++ b/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs @@ -14,7 +14,7 @@ namespace Ryujinx.Configuration /// <summary> /// The current version of the file format /// </summary> - public const int CurrentVersion = 14; + public const int CurrentVersion = 15; public int Version { get; set; } diff --git a/Ryujinx.Common/Configuration/ConfigurationState.cs b/Ryujinx.Common/Configuration/ConfigurationState.cs index df07019d..d83d07d3 100644 --- a/Ryujinx.Common/Configuration/ConfigurationState.cs +++ b/Ryujinx.Common/Configuration/ConfigurationState.cs @@ -483,12 +483,10 @@ namespace Ryujinx.Configuration Ui.EnableCustomTheme.Value = false; Ui.CustomThemePath.Value = ""; Hid.EnableKeyboard.Value = false; - Hid.Hotkeys.Value = new KeyboardHotkeys { ToggleVsync = Key.Tab }; - Hid.InputConfig.Value = new List<InputConfig> { new KeyboardConfig @@ -529,7 +527,15 @@ namespace Ryujinx.Configuration ButtonZr = Key.O, ButtonSl = Key.PageUp, ButtonSr = Key.PageDown - } + }, + EnableMotion = false, + MirrorInput = false, + Slot = 0, + AltSlot = 0, + Sensitivity = 100, + GyroDeadzone = 1, + DsuServerHost = "127.0.0.1", + DsuServerPort = 26760 } }; } @@ -628,7 +634,15 @@ namespace Ryujinx.Configuration ButtonZr = Key.O, ButtonSl = Key.Unbound, ButtonSr = Key.Unbound - } + }, + EnableMotion = false, + MirrorInput = false, + Slot = 0, + AltSlot = 0, + Sensitivity = 100, + GyroDeadzone = 1, + DsuServerHost = "127.0.0.1", + DsuServerPort = 26760 } }; diff --git a/Ryujinx.Common/Configuration/Hid/InputConfig.cs b/Ryujinx.Common/Configuration/Hid/InputConfig.cs index 540506d5..7ccb989b 100644 --- a/Ryujinx.Common/Configuration/Hid/InputConfig.cs +++ b/Ryujinx.Common/Configuration/Hid/InputConfig.cs @@ -16,5 +16,45 @@ namespace Ryujinx.Common.Configuration.Hid /// Player's Index for the controller /// </summary> public PlayerIndex PlayerIndex { get; set; } + + /// <summary> + /// Motion Controller Slot + /// </summary> + public int Slot { get; set; } + + /// <summary> + /// Motion Controller Alternative Slot, for RightJoyCon in Pair mode + /// </summary> + public int AltSlot { get; set; } + + /// <summary> + /// Mirror motion input in Pair mode + /// </summary> + public bool MirrorInput { get; set; } + + /// <summary> + /// Host address of the DSU Server + /// </summary> + public string DsuServerHost { get; set; } + + /// <summary> + /// Port of the DSU Server + /// </summary> + public int DsuServerPort { get; set; } + + /// <summary> + /// Gyro Sensitivity + /// </summary> + public int Sensitivity { get; set; } + + /// <summary> + /// Gyro Deadzone + /// </summary> + public double GyroDeadzone { get; set; } + + /// <summary> + /// Enable Motion Controls + /// </summary> + public bool EnableMotion { get; set; } } }
\ No newline at end of file |