more tilt fixes

ThomasHaz · Apr 12, 2023 · 9abc8b5 · 9abc8b5
1 parent 5e5a11d
commit 9abc8b5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Configuration/Conversions/DigitalToAnalog.cs b/Configuration/Conversions/DigitalToAnalog.cs
@@ -40,7 +40,7 @@ public DigitalToAnalog(Input child, ConfigViewModel model) : base(model)
     {
         _trigger = false;
         Child = child;
-        On = -32767;
+        On = 32767;
         Tilt = true;
         this.WhenAnyValue(x => x.Child.RawValue).Subscribe(s => RawValue = s > 0 ? On : 0);
 

diff --git a/Configuration/Other/EmulationMode.cs b/Configuration/Other/EmulationMode.cs
@@ -84,6 +84,7 @@ public override string GetImagePath(DeviceControllerType type, RhythmType rhythm
         var image = Type switch
         {
             EmulationModeType.XboxOne => "XboxOne",
+            EmulationModeType.Xbox360 => "Xbox360",
             EmulationModeType.Wii => "Wii",
             EmulationModeType.Ps3 => "PS3",
             EmulationModeType.Ps4Or5 => "PS4",

diff --git a/Configuration/Outputs/GuitarAxis.cs b/Configuration/Outputs/GuitarAxis.cs
@@ -169,10 +169,11 @@ when Model is
                      Type == GuitarAxisType.Tilt && Input is not DigitalToAnalog:
                 // PS3 RB expects tilt as a digital bit, so map that here
                 // On pc, we use a standard axis because that works better in games like clone hero
+                // Clone hero specifically seems to want tilt to go negative by default
                 return $@"if (consoleType == PS3 || consoleType == REAL_PS3) {{
                          {GenerateOutput(mode)} = {GenerateAssignment(mode, false, false, false)} == 0xFF;
                       }} else {{
-                         report->tilt_pc = {GenerateAssignment(mode, false, false, false)};
+                         report->tilt_pc = 255 - ({GenerateAssignment(mode, false, false, false)});
                       }}";
             // Xbox 360 Pickup Selector is actually on one of the triggers.
             case ConfigField.Xbox360

diff --git a/Configuration/Serialization/SerializedDigitalToAnalog.cs b/Configuration/Serialization/SerializedDigitalToAnalog.cs
@@ -20,7 +20,7 @@ public SerializedDigitalToAnalog(SerializedInput child, int on, bool trigger, bo
     [ProtoMember(1)] private SerializedInput Child { get; }
     [ProtoMember(2)] private int On { get; }
     [ProtoMember(3)] private bool Trigger { get; }
-    [ProtoMember(3)] private bool Tilt { get; }
+    [ProtoMember(4)] private bool Tilt { get; }
 
     public override Input Generate(ConfigViewModel model)
     {

diff --git a/Configuration/Serialization/SerializedInput.cs b/Configuration/Serialization/SerializedInput.cs
@@ -1,5 +1,4 @@
 using GuitarConfigurator.NetCore.Configuration.Inputs;
-using GuitarConfigurator.NetCore.Configuration.Microcontrollers;
 using GuitarConfigurator.NetCore.ViewModels;
 using ProtoBuf;