Add Default_Midi And Default_Chart ParseSettings constants

YARC-Official · Oct 7, 2024 · 32e2ffb · 32e2ffb
1 parent 0173ce1
commit 32e2ffb
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/YARG.Core.Benchmarks/Parsing/DotChartParsingBenchmarks.cs b/YARG.Core.Benchmarks/Parsing/DotChartParsingBenchmarks.cs
@@ -9,7 +9,6 @@ namespace YARG.Core.Benchmarks
     // [SimpleJob(RunStrategy.ColdStart, targetCount: 25, invocationCount: 1)]
     public class DotChartParsingBenchmarks
     {
-        private ParseSettings settings = ParseSettings.Default;
         private string chartText;
 
         [GlobalSetup]
@@ -25,7 +24,7 @@ public void Initialize()
         [Benchmark]
         public SongChart ChartParsing()
         {
-            return SongChart.FromDotChart(settings, chartText);
+            return SongChart.FromDotChart(in ParseSettings.Default_Chart, chartText);
         }
     }
 }
diff --git a/YARG.Core.Benchmarks/Parsing/MidiParsingBenchmarks.cs b/YARG.Core.Benchmarks/Parsing/MidiParsingBenchmarks.cs
@@ -9,8 +9,6 @@ namespace YARG.Core.Benchmarks
     // [SimpleJob(RunStrategy.ColdStart, targetCount: 25, invocationCount: 1)]
     public class MidiParsingBenchmarks
     {
-
-        private ParseSettings settings = ParseSettings.Default;
         private MidiFile midi;
 
         [GlobalSetup]
@@ -26,7 +24,7 @@ public void Initialize()
         [Benchmark]
         public SongChart ChartParsing()
         {
-            return SongChart.FromMidi(settings, midi);
+            return SongChart.FromMidi(in ParseSettings.Default_Midi, midi);
         }
     }
 }
diff --git a/YARG.Core.UnitTests/Engine/DrumEngineTester.cs b/YARG.Core.UnitTests/Engine/DrumEngineTester.cs
@@ -20,8 +20,6 @@ public class DrumEngineTester
 
     private string? _chartsDirectory;
 
-    private readonly ParseSettings _settings = ParseSettings.Default;
-
     [SetUp]
     public void Setup()
     {
@@ -37,7 +35,7 @@ public void DrumSoloThatEndsInChord_ShouldWorkCorrectly()
     {
         var chartPath = Path.Combine(_chartsDirectory!, "drawntotheflame.mid");
         var midi = MidiFile.Read(chartPath);
-        var chart = SongChart.FromMidi(_settings, midi);
+        var chart = SongChart.FromMidi(in ParseSettings.Default_Midi, midi);
         var notes = chart.ProDrums.GetDifficulty(Difficulty.Expert);
 
         var engine = new YargDrumsEngine(notes, chart.SyncTrack, _engineParams, true);
@@ -56,7 +54,7 @@ public void DrumTrackWithKickDrumRemoved_ShouldWorkCorrectly()
     {
         var chartPath = Path.Combine(_chartsDirectory!, "drawntotheflame.mid");
         var midi = MidiFile.Read(chartPath);
-        var chart = SongChart.FromMidi(_settings, midi);
+        var chart = SongChart.FromMidi(in ParseSettings.Default_Midi, midi);
         var notes = chart.ProDrums.GetDifficulty(Difficulty.Expert);
 
         notes.RemoveKickDrumNotes();

diff --git a/YARG.Core/Chart/ParsingProperties.cs b/YARG.Core/Chart/ParsingProperties.cs
@@ -25,16 +25,31 @@ public struct ParseSettings
         public static readonly ParseSettings Default = new()
         {
             DrumsType = DrumsType.Unknown,
+            HopoThreshold = SETTING_DEFAULT,
+            SustainCutoffThreshold = SETTING_DEFAULT,
+            ChordHopoCancellation = false,
+            StarPowerNote = SETTING_DEFAULT,
+            NoteSnapThreshold = 0,
+        };
 
+        public static readonly ParseSettings Default_Chart = new()
+        {
+            DrumsType = DrumsType.Unknown,
             HopoThreshold = SETTING_DEFAULT,
-            HopoFreq_FoF = SETTING_DEFAULT,
-            EighthNoteHopo = false,
+            SustainCutoffThreshold = 0,
             ChordHopoCancellation = false,
+            StarPowerNote = SETTING_DEFAULT,
+            NoteSnapThreshold = 0,
+        };
 
+        public static readonly ParseSettings Default_Midi = new()
+        {
+            DrumsType = DrumsType.Unknown,
+            HopoThreshold = SETTING_DEFAULT,
             SustainCutoffThreshold = SETTING_DEFAULT,
+            ChordHopoCancellation = false,
+            StarPowerNote = 116,
             NoteSnapThreshold = 0,
-
-            StarPowerNote = SETTING_DEFAULT,
         };
 
         /// <summary>

diff --git a/YARG.Core/MoonscraperChartParser/IO/Chart/ChartReader.cs b/YARG.Core/MoonscraperChartParser/IO/Chart/ChartReader.cs
@@ -78,13 +78,13 @@ private static ReadOnlySpan<char>
 
         public static MoonSong ReadFromFile(string filepath)
         {
-            var settings = ParseSettings.Default;
+            var settings = ParseSettings.Default_Chart;
             return ReadFromFile(ref settings, filepath);
         }
 
         public static MoonSong ReadFromText(ReadOnlySpan<char> chartText)
         {
-            var settings = ParseSettings.Default;
+            var settings = ParseSettings.Default_Chart;
             return ReadFromText(ref settings, chartText);
         }
 

diff --git a/YARG.Core/MoonscraperChartParser/IO/Midi/MidReader.cs b/YARG.Core/MoonscraperChartParser/IO/Midi/MidReader.cs
@@ -71,19 +71,19 @@ private struct EventProcessParams
 
         public static MoonSong ReadMidi(string path)
         {
-            var settings = ParseSettings.Default;
+            var settings = ParseSettings.Default_Midi;
             return ReadMidi(ref settings, path);
         }
 
         public static MoonSong ReadMidi(Stream stream)
         {
-            var settings = ParseSettings.Default;
+            var settings = ParseSettings.Default_Midi;
             return ReadMidi(ref settings, stream);
         }
 
         public static MoonSong ReadMidi(MidiFile midi)
         {
-            var settings = ParseSettings.Default;
+            var settings = ParseSettings.Default_Midi;
             return ReadMidi(ref settings, midi);
         }