aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Configuration/Hid/Controller
diff options
context:
space:
mode:
authorTSR Berry <20988865+TSRBerry@users.noreply.github.com>2023-04-08 01:22:00 +0200
committerMary <thog@protonmail.com>2023-04-27 23:51:14 +0200
commitcee712105850ac3385cd0091a923438167433f9f (patch)
tree4a5274b21d8b7f938c0d0ce18736d3f2993b11b1 /Ryujinx.Common/Configuration/Hid/Controller
parentcd124bda587ef09668a971fa1cac1c3f0cfc9f21 (diff)
Move solution and projects to src
Diffstat (limited to 'Ryujinx.Common/Configuration/Hid/Controller')
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs58
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs82
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs11
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs30
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs79
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs25
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs12
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs13
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs4
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/RumbleConfigController.cs20
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs4
-rw-r--r--Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs15
12 files changed, 0 insertions, 353 deletions
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs b/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
deleted file mode 100644
index ad1fa667..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
- [JsonConverter(typeof(TypedStringEnumConverter<GamepadInputId>))]
- public enum GamepadInputId : byte
- {
- Unbound,
- A,
- B,
- X,
- Y,
- LeftStick,
- RightStick,
- LeftShoulder,
- RightShoulder,
-
- // Likely axis
- LeftTrigger,
- // Likely axis
- RightTrigger,
-
- DpadUp,
- DpadDown,
- DpadLeft,
- DpadRight,
-
- // Special buttons
-
- Minus,
- Plus,
-
- Back = Minus,
- Start = Plus,
-
- Guide,
- Misc1,
-
- // Xbox Elite paddle
- Paddle1,
- Paddle2,
- Paddle3,
- Paddle4,
-
- // PS5 touchpad button
- Touchpad,
-
- // Virtual buttons for single joycon
- SingleLeftTrigger0,
- SingleRightTrigger0,
-
- SingleLeftTrigger1,
- SingleRightTrigger1,
-
- Count
- }
-} \ No newline at end of file
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs b/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs
deleted file mode 100644
index d7f0e788..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/GenericControllerInputConfig.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using Ryujinx.Common.Configuration.Hid.Controller.Motion;
-using System;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
- public class GenericControllerInputConfig<Button, Stick> : GenericInputConfigurationCommon<Button> where Button : unmanaged where Stick : unmanaged
- {
- [JsonIgnore]
- private float _deadzoneLeft;
- [JsonIgnore]
- private float _deadzoneRight;
- [JsonIgnore]
- private float _triggerThreshold;
-
- /// <summary>
- /// Left JoyCon Controller Stick Bindings
- /// </summary>
- public JoyconConfigControllerStick<Button, Stick> LeftJoyconStick { get; set; }
-
- /// <summary>
- /// Right JoyCon Controller Stick Bindings
- /// </summary>
- public JoyconConfigControllerStick<Button, Stick> RightJoyconStick { get; set; }
-
- /// <summary>
- /// Controller Left Analog Stick Deadzone
- /// </summary>
- public float DeadzoneLeft
- {
- get => _deadzoneLeft; set
- {
- _deadzoneLeft = MathF.Round(value, 3);
- OnPropertyChanged();
- }
- }
-
- /// <summary>
- /// Controller Right Analog Stick Deadzone
- /// </summary>
- public float DeadzoneRight
- {
- get => _deadzoneRight; set
- {
- _deadzoneRight = MathF.Round(value, 3);
- OnPropertyChanged();
- }
- }
-
- /// <summary>
- /// Controller Left Analog Stick Range
- /// </summary>
- public float RangeLeft { get; set; }
-
- /// <summary>
- /// Controller Right Analog Stick Range
- /// </summary>
- public float RangeRight { get; set; }
-
- /// <summary>
- /// Controller Trigger Threshold
- /// </summary>
- public float TriggerThreshold
- {
- get => _triggerThreshold; set
- {
- _triggerThreshold = MathF.Round(value, 3);
- OnPropertyChanged();
- }
- }
-
- /// <summary>
- /// Controller Motion Settings
- /// </summary>
- public MotionConfigController Motion { get; set; }
-
- /// <summary>
- /// Controller Rumble Settings
- /// </summary>
- public RumbleConfigController Rumble { get; set; }
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs b/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
deleted file mode 100644
index 869cff4f..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
- public class JoyconConfigControllerStick<Button, Stick> where Button: unmanaged where Stick: unmanaged
- {
- public Stick Joystick { get; set; }
- public bool InvertStickX { get; set; }
- public bool InvertStickY { get; set; }
- public bool Rotate90CW { get; set; }
- public Button StickButton { get; set; }
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
deleted file mode 100644
index 2a5a73ff..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
-{
- public class CemuHookMotionConfigController : MotionConfigController
- {
- /// <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; }
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
deleted file mode 100644
index 2b9e0af4..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
-{
- class JsonMotionConfigControllerConverter : JsonConverter<MotionConfigController>
- {
- private static readonly MotionConfigJsonSerializerContext SerializerContext = new(JsonHelper.GetDefaultSerializerOptions());
-
- private static MotionInputBackendType GetMotionInputBackendType(ref Utf8JsonReader reader)
- {
- // Temporary reader to get the backend type
- Utf8JsonReader tempReader = reader;
-
- MotionInputBackendType result = MotionInputBackendType.Invalid;
-
- while (tempReader.Read())
- {
- // NOTE: We scan all properties ignoring the depth entirely on purpose.
- // The reason behind this is that we cannot track in a reliable way the depth of the object because Utf8JsonReader never emit the first TokenType == StartObject if the json start with an object.
- // As such, this code will try to parse very field named "motion_backend" to the correct enum.
- if (tempReader.TokenType == JsonTokenType.PropertyName)
- {
- string propertyName = tempReader.GetString();
-
- if (propertyName.Equals("motion_backend"))
- {
- tempReader.Read();
-
- if (tempReader.TokenType == JsonTokenType.String)
- {
- string backendTypeRaw = tempReader.GetString();
-
- if (!Enum.TryParse(backendTypeRaw, out result))
- {
- result = MotionInputBackendType.Invalid;
- }
- else
- {
- break;
- }
- }
- }
- }
- }
-
- return result;
- }
-
- public override MotionConfigController Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
- {
- MotionInputBackendType motionBackendType = GetMotionInputBackendType(ref reader);
-
- return motionBackendType switch
- {
- MotionInputBackendType.GamepadDriver => JsonSerializer.Deserialize(ref reader, SerializerContext.StandardMotionConfigController),
- MotionInputBackendType.CemuHook => JsonSerializer.Deserialize(ref reader, SerializerContext.CemuHookMotionConfigController),
- _ => throw new InvalidOperationException($"Unknown backend type {motionBackendType}"),
- };
- }
-
- public override void Write(Utf8JsonWriter writer, MotionConfigController value, JsonSerializerOptions options)
- {
- switch (value.MotionBackend)
- {
- case MotionInputBackendType.GamepadDriver:
- JsonSerializer.Serialize(writer, value as StandardMotionConfigController, SerializerContext.StandardMotionConfigController);
- break;
- case MotionInputBackendType.CemuHook:
- JsonSerializer.Serialize(writer, value as CemuHookMotionConfigController, SerializerContext.CemuHookMotionConfigController);
- break;
- default:
- throw new ArgumentException($"Unknown motion backend type {value.MotionBackend}");
- }
- }
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
deleted file mode 100644
index 7636aa41..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
-{
- [JsonConverter(typeof(JsonMotionConfigControllerConverter))]
- public class MotionConfigController
- {
- public MotionInputBackendType MotionBackend { 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; }
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs
deleted file mode 100644
index 5cd9e452..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
-{
- [JsonSourceGenerationOptions(WriteIndented = true)]
- [JsonSerializable(typeof(MotionConfigController))]
- [JsonSerializable(typeof(CemuHookMotionConfigController))]
- [JsonSerializable(typeof(StandardMotionConfigController))]
- public partial class MotionConfigJsonSerializerContext : JsonSerializerContext
- {
- }
-} \ No newline at end of file
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
deleted file mode 100644
index c6551047..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
-{
- [JsonConverter(typeof(TypedStringEnumConverter<MotionInputBackendType>))]
- public enum MotionInputBackendType : byte
- {
- Invalid,
- GamepadDriver,
- CemuHook
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
deleted file mode 100644
index df925444..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
-{
- public class StandardMotionConfigController : MotionConfigController { }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/RumbleConfigController.cs b/Ryujinx.Common/Configuration/Hid/Controller/RumbleConfigController.cs
deleted file mode 100644
index 48be4f13..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/RumbleConfigController.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
- public class RumbleConfigController
- {
- /// <summary>
- /// Controller Strong Rumble Multiplier
- /// </summary>
- public float StrongRumble { get; set; }
-
- /// <summary>
- /// Controller Weak Rumble Multiplier
- /// </summary>
- public float WeakRumble { get; set; }
-
- /// <summary>
- /// Enable Rumble
- /// </summary>
- public bool EnableRumble { get; set; }
- }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs b/Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs
deleted file mode 100644
index 4154a42b..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/StandardControllerInputConfig.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
- public class StandardControllerInputConfig : GenericControllerInputConfig<GamepadInputId, StickInputId> { }
-}
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs b/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
deleted file mode 100644
index 5fc4d1c8..00000000
--- a/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Common.Configuration.Hid.Controller
-{
- [JsonConverter(typeof(TypedStringEnumConverter<StickInputId>))]
- public enum StickInputId : byte
- {
- Unbound,
- Left,
- Right,
-
- Count
- }
-} \ No newline at end of file