Use IStepWithBeat for Beat sorting instead of a union type

Quaver · May 8, 2024 · 8bfa0ba · 8bfa0ba
1 parent 1478c33
commit 8bfa0ba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 45 deletions.
diff --git a/Quaver.API/Maps/Parsers/Stepmania/IStepWithBeat.cs b/Quaver.API/Maps/Parsers/Stepmania/IStepWithBeat.cs
@@ -0,0 +1,7 @@
+namespace Quaver.API.Maps.Parsers.Stepmania
+{
+    public interface IStepWithBeat
+    {
+        float Beat { get; }
+    }
+}
diff --git a/Quaver.API/Maps/Parsers/Stepmania/StepBpmOrStop.cs b/Quaver.API/Maps/Parsers/Stepmania/StepBpmOrStop.cs
diff --git a/Quaver.API/Maps/Parsers/Stepmania/StepFile.cs b/Quaver.API/Maps/Parsers/Stepmania/StepFile.cs
@@ -267,10 +267,7 @@ private Qua ConvertChart(StepFileChart chart)
             };
 
             // Combine BPM changes and stops together and order by its beat time
-            var bpmAndStops = new Queue<StepBpmOrStop>(Bpms.Select(b => new StepBpmOrStop(b))
-                .Concat(
-                    Stops.Select(s => new StepBpmOrStop(s)))
-                .OrderBy(s => s.Beat));
+            var bpmAndStops = new Queue<IStepWithBeat>(Bpms.Cast<IStepWithBeat>().Concat(Stops).OrderBy(s => s.Beat));
 
             // The starting beat time of the current measure
             var measureBeats = 0;
@@ -307,6 +304,7 @@ private Qua ConvertChart(StepFileChart chart)
                     {
                         var bpmOrStop = bpmAndStops.Dequeue();
                         if (bpmOrStop.IsBpm)
+                        if (bpmOrStop is StepFileBPM bpm)
                         {
                             var bpm = bpmOrStop.Bpm;
                             // Fraction of row before the timing point is placed
@@ -334,9 +332,8 @@ private Qua ConvertChart(StepFileChart chart)
                             measureTime = lastBpmChangeMeasureTime;
                             currentTime = measureTime + rowIndex * millisecondsPerRow;
                         }
-                        else
+                        else if (bpmOrStop is StepFileStop stop)
                         {
-                            var stop = bpmOrStop.Stop;
                             var stopMilliseconds = stop.Seconds * 1000;
                             qua.SliderVelocities.Add(new SliderVelocityInfo
                             {

diff --git a/Quaver.API/Maps/Parsers/Stepmania/StepFileBPM.cs b/Quaver.API/Maps/Parsers/Stepmania/StepFileBPM.cs
@@ -3,7 +3,7 @@
 
 namespace Quaver.API.Maps.Parsers.Stepmania
 {
-    public class StepFileBPM
+    public class StepFileBPM : IStepWithBeat
     {
         /// <summary>
         /// </summary>

diff --git a/Quaver.API/Maps/Parsers/Stepmania/StepFileStop.cs b/Quaver.API/Maps/Parsers/Stepmania/StepFileStop.cs
@@ -2,7 +2,7 @@
 
 namespace Quaver.API.Maps.Parsers.Stepmania
 {
-    public class StepFileStop
+    public class StepFileStop : IStepWithBeat
     {
         /// <summary>
         /// </summary>