Merge pull request #34 from neogeek/hotfix/cleaned-up-calculate-beat-bars

neogeek · web-flow · commit 1c2e8411aa84 · 2024-08-05T23:47:32.000-04:00
[hotfix] Cleaned up CalculateBeatBars.
diff --git a/RhythmGameUtilities/Scripts/Utilities.cs b/RhythmGameUtilities/Scripts/Utilities.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -101,17 +102,48 @@ public static float InverseLerp(float a, float b, float v)
             return UtilitiesInternal.InverseLerp(a, b, v);
         }
 
-        public static List<int[]> GenerateAdjacentKeyPairs<T>(Dictionary<int, T> dictionary)
+        public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,
+            bool includeHalfNotes = true)
+        {
+            var beatBars = new List<BeatBar>();
+
+            var keyValuePairs = GenerateAdjacentKeyPairs(bpmChanges);
+
+            foreach (var (startTick, endTick) in keyValuePairs)
+            {
+                for (var tick = startTick; tick <= endTick; tick += resolution)
+                {
+                    beatBars.Add(new BeatBar
+                    {
+                        Position = tick, BPM = bpmChanges[startTick], TimeSignature = new[] { ts }
+                    });
+
+                    if (includeHalfNotes && tick != endTick)
+                    {
+                        beatBars.Add(new BeatBar
+                        {
+                            Position = tick + resolution / 2,
+                            BPM = bpmChanges[startTick],
+                            TimeSignature = new[] { ts }
+                        });
+                    }
+                }
+            }
+
+            return beatBars;
+        }
+
+        public static List<Tuple<T, T>> GenerateAdjacentKeyPairs<T>(Dictionary<T, T> dictionary)
         {
             var keys = dictionary.Keys.ToList();
 
             keys.Sort();
 
-            var adjacentKeyPairs = new List<int[]>();
+            var adjacentKeyPairs = new List<Tuple<T, T>>();
 
             for (var i = 0; i < keys.Count - 1; i += 1)
             {
-                adjacentKeyPairs.Add(new[] { keys[i], keys[i + 1] });
+                adjacentKeyPairs.Add(new Tuple<T, T>(keys[i], keys[i + 1]));
             }
 
             return adjacentKeyPairs;
diff --git a/RhythmGameUtilities/Structs/Song.cs b/RhythmGameUtilities/Structs/Song.cs
@@ -122,7 +122,7 @@ public List<BeatBar> BeatBars
             {
                 if (_beatBars.Count == 0)
                 {
-                    _beatBars = CalculateBeatBars(BPM);
+                    _beatBars = Utilities.CalculateBeatBars(BPM);
                 }
 
                 return _beatBars;
@@ -198,35 +198,6 @@ public int[] GetCurrentTimeSignature(Note note)
             return TimeSignatures.Last(item => item.Key <= note.Position).Value;
         }
 
-        public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpm, int resolution = 192, int ts = 4,
-            bool includeHalfNotes = true)
-        {
-            var newBpm = new List<BeatBar>();
-
-            var keyValuePairs = Utilities.GenerateAdjacentKeyPairs(bpm);
-
-            foreach (var keys in keyValuePairs)
-            {
-                var startTick = keys[0];
-                var endTick = keys[1];
-
-                for (var tick = startTick; tick <= endTick; tick += resolution)
-                {
-                    newBpm.Add(new BeatBar { Position = tick, BPM = bpm[startTick], TimeSignature = new[] { ts } });
-
-                    if (includeHalfNotes && tick != endTick)
-                    {
-                        newBpm.Add(new BeatBar
-                        {
-                            Position = tick + resolution / 2, BPM = bpm[keys[0]], TimeSignature = new[] { 4 }
-                        });
-                    }
-                }
-            }
-
-            return newBpm;
-        }
-
     }
 
 }
diff --git a/UnityPackage/Scripts/Utilities.cs b/UnityPackage/Scripts/Utilities.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -101,17 +102,48 @@ public static float InverseLerp(float a, float b, float v)
             return UtilitiesInternal.InverseLerp(a, b, v);
         }
 
-        public static List<int[]> GenerateAdjacentKeyPairs<T>(Dictionary<int, T> dictionary)
+        public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,
+            bool includeHalfNotes = true)
+        {
+            var beatBars = new List<BeatBar>();
+
+            var keyValuePairs = GenerateAdjacentKeyPairs(bpmChanges);
+
+            foreach (var (startTick, endTick) in keyValuePairs)
+            {
+                for (var tick = startTick; tick <= endTick; tick += resolution)
+                {
+                    beatBars.Add(new BeatBar
+                    {
+                        Position = tick, BPM = bpmChanges[startTick], TimeSignature = new[] { ts }
+                    });
+
+                    if (includeHalfNotes && tick != endTick)
+                    {
+                        beatBars.Add(new BeatBar
+                        {
+                            Position = tick + resolution / 2,
+                            BPM = bpmChanges[startTick],
+                            TimeSignature = new[] { ts }
+                        });
+                    }
+                }
+            }
+
+            return beatBars;
+        }
+
+        public static List<Tuple<T, T>> GenerateAdjacentKeyPairs<T>(Dictionary<T, T> dictionary)
         {
             var keys = dictionary.Keys.ToList();
 
             keys.Sort();
 
-            var adjacentKeyPairs = new List<int[]>();
+            var adjacentKeyPairs = new List<Tuple<T, T>>();
 
             for (var i = 0; i < keys.Count - 1; i += 1)
             {
-                adjacentKeyPairs.Add(new[] { keys[i], keys[i + 1] });
+                adjacentKeyPairs.Add(new Tuple<T, T>(keys[i], keys[i + 1]));
             }
 
             return adjacentKeyPairs;
diff --git a/UnityPackage/Structs/Song.cs b/UnityPackage/Structs/Song.cs
@@ -122,7 +122,7 @@ public List<BeatBar> BeatBars
             {
                 if (_beatBars.Count == 0)
                 {
-                    _beatBars = CalculateBeatBars(BPM);
+                    _beatBars = Utilities.CalculateBeatBars(BPM);
                 }
 
                 return _beatBars;
@@ -198,35 +198,6 @@ public int[] GetCurrentTimeSignature(Note note)
             return TimeSignatures.Last(item => item.Key <= note.Position).Value;
         }
 
-        public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpm, int resolution = 192, int ts = 4,
-            bool includeHalfNotes = true)
-        {
-            var newBpm = new List<BeatBar>();
-
-            var keyValuePairs = Utilities.GenerateAdjacentKeyPairs(bpm);
-
-            foreach (var keys in keyValuePairs)
-            {
-                var startTick = keys[0];
-                var endTick = keys[1];
-
-                for (var tick = startTick; tick <= endTick; tick += resolution)
-                {
-                    newBpm.Add(new BeatBar { Position = tick, BPM = bpm[startTick], TimeSignature = new[] { ts } });
-
-                    if (includeHalfNotes && tick != endTick)
-                    {
-                        newBpm.Add(new BeatBar
-                        {
-                            Position = tick + resolution / 2, BPM = bpm[keys[0]], TimeSignature = new[] { 4 }
-                        });
-                    }
-                }
-            }
-
-            return newBpm;
-        }
-
     }
 
 }
