Merge pull request #90 from neogeek/hotfix/return-array-not-list

neogeek · web-flow · commit 0fd016437572 · 2025-01-14T01:14:39.000-05:00
[hotfix] Return arrays instead of lists.
diff --git a/RhythmGameUtilities.Tests/UtilitiesTest.cs b/RhythmGameUtilities.Tests/UtilitiesTest.cs
@@ -70,25 +70,18 @@ public void TestCalculateBeatBars()
 
             var beatBars = Utilities.CalculateBeatBars(bpmChanges, resolution, timeSignature, true);
 
-            Assert.That(beatBars.Count, Is.EqualTo(440));
+            Assert.That(beatBars.Length, Is.EqualTo(440));
         }
 
         [Test]
         public void TestFindPositionNearGivenTick()
         {
-            var notes = new List<Note>
+            var notes = new Note[]
             {
-                new() { Position = 768 },
-                new() { Position = 960 },
-                new() { Position = 1152 },
-                new() { Position = 1536 },
-                new() { Position = 1728 },
-                new() { Position = 1920 },
-                new() { Position = 2304 },
-                new() { Position = 2496 },
-                new() { Position = 2688 },
-                new() { Position = 3072 },
-                new() { Position = 3264 },
+                new() { Position = 768 }, new() { Position = 960 }, new() { Position = 1152 },
+                new() { Position = 1536 }, new() { Position = 1728 }, new() { Position = 1920 },
+                new() { Position = 2304 }, new() { Position = 2496 }, new() { Position = 2688 },
+                new() { Position = 3072 }, new() { Position = 3264 },
             };
 
             Assert.That(Utilities.FindPositionNearGivenTick(notes, 100), Is.Null);
diff --git a/RhythmGameUtilities/Scripts/Utilities.cs b/RhythmGameUtilities/Scripts/Utilities.cs
@@ -84,34 +84,35 @@ public static int RoundUpToTheNearestMultiplier(int value, int multiplier)
             return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);
         }
 
-        public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,
+        public static BeatBar[] CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,
             bool includeHalfNotes = true)
         {
-            var beatBars = new List<BeatBar>();
 
             var ptrArray = UtilitiesInternal.CalculateBeatBarsInternal(bpmChanges.Keys.ToArray(),
                 bpmChanges.Values.ToArray(), bpmChanges.Count, resolution, ts, includeHalfNotes,
                 out var size);
 
             var beatBarSize = Marshal.SizeOf(typeof(BeatBar));
 
+            var beatBars = new BeatBar[size];
+
             for (var i = 0; i < size; i += 1)
             {
                 var beatBarSizePtr = new IntPtr(ptrArray.ToInt64() + beatBarSize * i);
                 var beatBar = Marshal.PtrToStructure<BeatBar>(beatBarSizePtr);
 
-                beatBars.Add(beatBar);
+                beatBars[i] = beatBar;
             }
 
             Marshal.FreeHGlobal(ptrArray);
 
             return beatBars;
         }
 
-        public static Note? FindPositionNearGivenTick(List<Note> notes, int tick, int delta = 50)
+        public static Note? FindPositionNearGivenTick(Note[] notes, int tick, int delta = 50)
         {
             var left = 0;
-            var right = notes.Count - 1;
+            var right = notes.Length - 1;
 
             while (left <= right)
             {
diff --git a/UnityPackage/Editor/Tests/UtilitiesTest.cs b/UnityPackage/Editor/Tests/UtilitiesTest.cs
@@ -70,25 +70,18 @@ public void TestCalculateBeatBars()
 
             var beatBars = Utilities.CalculateBeatBars(bpmChanges, resolution, timeSignature, true);
 
-            Assert.That(beatBars.Count, Is.EqualTo(440));
+            Assert.That(beatBars.Length, Is.EqualTo(440));
         }
 
         [Test]
         public void TestFindPositionNearGivenTick()
         {
-            var notes = new List<Note>
+            var notes = new Note[]
             {
-                new() { Position = 768 },
-                new() { Position = 960 },
-                new() { Position = 1152 },
-                new() { Position = 1536 },
-                new() { Position = 1728 },
-                new() { Position = 1920 },
-                new() { Position = 2304 },
-                new() { Position = 2496 },
-                new() { Position = 2688 },
-                new() { Position = 3072 },
-                new() { Position = 3264 },
+                new() { Position = 768 }, new() { Position = 960 }, new() { Position = 1152 },
+                new() { Position = 1536 }, new() { Position = 1728 }, new() { Position = 1920 },
+                new() { Position = 2304 }, new() { Position = 2496 }, new() { Position = 2688 },
+                new() { Position = 3072 }, new() { Position = 3264 },
             };
 
             Assert.That(Utilities.FindPositionNearGivenTick(notes, 100), Is.Null);
diff --git a/UnityPackage/Scripts/Utilities.cs b/UnityPackage/Scripts/Utilities.cs
@@ -84,34 +84,35 @@ public static int RoundUpToTheNearestMultiplier(int value, int multiplier)
             return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);
         }
 
-        public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,
+        public static BeatBar[] CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,
             bool includeHalfNotes = true)
         {
-            var beatBars = new List<BeatBar>();
 
             var ptrArray = UtilitiesInternal.CalculateBeatBarsInternal(bpmChanges.Keys.ToArray(),
                 bpmChanges.Values.ToArray(), bpmChanges.Count, resolution, ts, includeHalfNotes,
                 out var size);
 
             var beatBarSize = Marshal.SizeOf(typeof(BeatBar));
 
+            var beatBars = new BeatBar[size];
+
             for (var i = 0; i < size; i += 1)
             {
                 var beatBarSizePtr = new IntPtr(ptrArray.ToInt64() + beatBarSize * i);
                 var beatBar = Marshal.PtrToStructure<BeatBar>(beatBarSizePtr);
 
-                beatBars.Add(beatBar);
+                beatBars[i] = beatBar;
             }
 
             Marshal.FreeHGlobal(ptrArray);
 
             return beatBars;
         }
 
-        public static Note? FindPositionNearGivenTick(List<Note> notes, int tick, int delta = 50)
+        public static Note? FindPositionNearGivenTick(Note[] notes, int tick, int delta = 50)
         {
             var left = 0;
-            var right = notes.Count - 1;
+            var right = notes.Length - 1;
 
             while (left <= right)
             {

Original file line number	Diff line number	Diff line change
`@@ -84,34 +84,35 @@ public static int RoundUpToTheNearestMultiplier(int value, int multiplier)`
`84`	`84`	`return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);`
`85`	`85`	`}`
`86`	`86`
`87`		`- public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,`
	`87`	`+ public static BeatBar[] CalculateBeatBars(Dictionary<int, int> bpmChanges, int resolution = 192, int ts = 4,`
`88`	`88`	`bool includeHalfNotes = true)`
`89`	`89`	`{`
`90`		`- var beatBars = new List<BeatBar>();`
`91`	`90`
`92`	`91`	`var ptrArray = UtilitiesInternal.CalculateBeatBarsInternal(bpmChanges.Keys.ToArray(),`
`93`	`92`	`bpmChanges.Values.ToArray(), bpmChanges.Count, resolution, ts, includeHalfNotes,`
`94`	`93`	`out var size);`
`95`	`94`
`96`	`95`	`var beatBarSize = Marshal.SizeOf(typeof(BeatBar));`
`97`	`96`
	`97`	`+ var beatBars = new BeatBar[size];`
	`98`	`+`
`98`	`99`	`for (var i = 0; i < size; i += 1)`
`99`	`100`	`{`
`100`	`101`	`var beatBarSizePtr = new IntPtr(ptrArray.ToInt64() + beatBarSize * i);`
`101`	`102`	`var beatBar = Marshal.PtrToStructure<BeatBar>(beatBarSizePtr);`
`102`	`103`
`103`		`- beatBars.Add(beatBar);`
	`104`	`+ beatBars[i] = beatBar;`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`Marshal.FreeHGlobal(ptrArray);`
`107`	`108`
`108`	`109`	`return beatBars;`
`109`	`110`	`}`
`110`	`111`
`111`		`- public static Note? FindPositionNearGivenTick(List<Note> notes, int tick, int delta = 50)`
	`112`	`+ public static Note? FindPositionNearGivenTick(Note[] notes, int tick, int delta = 50)`
`112`	`113`	`{`
`113`	`114`	`var left = 0;`
`114`		`- var right = notes.Count - 1;`
	`115`	`+ var right = notes.Length - 1;`
`115`	`116`
`116`	`117`	`while (left <= right)`
`117`	`118`	`{`