Skip to content

Commit 4b98764

Browse files
committed
Fixed issue where beatbars could double up.
1 parent 347293c commit 4b98764

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

RhythmGameUtilities.Tests/Mocks.cs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

RhythmGameUtilities.Tests/Mocks/song.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

RhythmGameUtilities.Tests/UtilitiesTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void TestCalculateBeatBars()
7070

7171
var beatBars = Utilities.CalculateBeatBars(bpmChanges, resolution, timeSignature, true);
7272

73-
Assert.That(beatBars.Count, Is.EqualTo(446));
73+
Assert.That(beatBars.Count, Is.EqualTo(440));
7474
}
7575

7676
}

UnityPackage/Editor/Tests/Mocks.cs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

UnityPackage/Editor/Tests/UtilitiesTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void TestCalculateBeatBars()
7070

7171
var beatBars = Utilities.CalculateBeatBars(bpmChanges, resolution, timeSignature, true);
7272

73-
Assert.That(beatBars.Count, Is.EqualTo(446));
73+
Assert.That(beatBars.Count, Is.EqualTo(440));
7474
}
7575

7676
}

includes/RhythmGameUtilities/Utilities.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ std::vector<BeatBar> CalculateBeatBars(std::map<int, int> bpmChanges,
9595
auto startTick = std::get<0>(keyValuePair);
9696
auto endTick = std::get<1>(keyValuePair);
9797

98-
for (auto tick = startTick; tick <= endTick; tick += resolution)
98+
for (auto tick = startTick; tick < endTick; tick += resolution)
9999
{
100100
beatBars.push_back({tick, bpmChanges[startTick]});
101101

tests/RhythmGameUtilities/Utilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void testCalculateBeatBars()
6464

6565
auto beatBars = CalculateBeatBars(bpmChanges, 192, 4, true);
6666

67-
assert(beatBars.size() == 446);
67+
assert(beatBars.size() == 440);
6868

6969
std::cout << ".";
7070
}

tests/RhythmGameUtilities/UtilitiesInternal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void testCalculateBeatBarsInternal()
5050
CalculateBeatBarsInternal(&bpmChangesKeys[0], &bpmChangesValues[0],
5151
bpmChanges.size(), 192, 4, true, outSize);
5252

53-
assert(*outSize == 446);
53+
assert(*outSize == 440);
5454

5555
std::cout << ".";
5656
}

0 commit comments

Comments
 (0)