From cee712105850ac3385cd0091a923438167433f9f Mon Sep 17 00:00:00 2001
From: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
Date: Sat, 8 Apr 2023 01:22:00 +0200
Subject: Move solution and projects to src
---
.../Motion/CemuHookMotionConfigController.cs | 30 ++++++++
.../Motion/JsonMotionConfigControllerConverter.cs | 79 ++++++++++++++++++++++
.../Controller/Motion/MotionConfigController.cs | 25 +++++++
.../Motion/MotionConfigJsonSerializerContext.cs | 12 ++++
.../Controller/Motion/MotionInputBackendType.cs | 13 ++++
.../Motion/StandardMotionConfigController.cs | 4 ++
6 files changed, 163 insertions(+)
create mode 100644 src/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
create mode 100644 src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
create mode 100644 src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
create mode 100644 src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs
create mode 100644 src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
create mode 100644 src/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
(limited to 'src/Ryujinx.Common/Configuration/Hid/Controller/Motion')
diff --git a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
new file mode 100644
index 00000000..2a5a73ff
--- /dev/null
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/CemuHookMotionConfigController.cs
@@ -0,0 +1,30 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ public class CemuHookMotionConfigController : MotionConfigController
+ {
+ ///
+ /// Motion Controller Slot
+ ///
+ public int Slot { get; set; }
+
+ ///
+ /// Motion Controller Alternative Slot, for RightJoyCon in Pair mode
+ ///
+ public int AltSlot { get; set; }
+
+ ///
+ /// Mirror motion input in Pair mode
+ ///
+ public bool MirrorInput { get; set; }
+
+ ///
+ /// Host address of the DSU Server
+ ///
+ public string DsuServerHost { get; set; }
+
+ ///
+ /// Port of the DSU Server
+ ///
+ public int DsuServerPort { get; set; }
+ }
+}
diff --git a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
new file mode 100644
index 00000000..2b9e0af4
--- /dev/null
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs
@@ -0,0 +1,79 @@
+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
+ {
+ 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/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
new file mode 100644
index 00000000..7636aa41
--- /dev/null
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigController.cs
@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ [JsonConverter(typeof(JsonMotionConfigControllerConverter))]
+ public class MotionConfigController
+ {
+ public MotionInputBackendType MotionBackend { get; set; }
+
+ ///
+ /// Gyro Sensitivity
+ ///
+ public int Sensitivity { get; set; }
+
+ ///
+ /// Gyro Deadzone
+ ///
+ public double GyroDeadzone { get; set; }
+
+ ///
+ /// Enable Motion Controls
+ ///
+ public bool EnableMotion { get; set; }
+ }
+}
diff --git a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs
new file mode 100644
index 00000000..5cd9e452
--- /dev/null
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionConfigJsonSerializerContext.cs
@@ -0,0 +1,12 @@
+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/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
new file mode 100644
index 00000000..c6551047
--- /dev/null
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs
@@ -0,0 +1,13 @@
+using Ryujinx.Common.Utilities;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ [JsonConverter(typeof(TypedStringEnumConverter))]
+ public enum MotionInputBackendType : byte
+ {
+ Invalid,
+ GamepadDriver,
+ CemuHook
+ }
+}
diff --git a/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
new file mode 100644
index 00000000..df925444
--- /dev/null
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/Motion/StandardMotionConfigController.cs
@@ -0,0 +1,4 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
+{
+ public class StandardMotionConfigController : MotionConfigController { }
+}
--
cgit v1.2.3