diff --git a/README.md b/README.md index c6808a5..5a5c5ef 100644 --- a/README.md +++ b/README.md @@ -223,7 +223,7 @@ using RhythmGameUtilities; var value = Utilities.RoundUpToTheNearestMultiplier(12, 10); ``` -#### `Utilities.CalculateScore` +#### `Utilities.CalculateAccuracyRatio` #### `Utilities.CalculateBeatBarsInternal` diff --git a/RhythmGameUtilities.Tests/UtilitiesTest.cs b/RhythmGameUtilities.Tests/UtilitiesTest.cs index 224ae77..15c4361 100644 --- a/RhythmGameUtilities.Tests/UtilitiesTest.cs +++ b/RhythmGameUtilities.Tests/UtilitiesTest.cs @@ -98,11 +98,11 @@ public void TestFindPositionNearGivenTick() } [Test] - public void TestCalculateScore() + public void TestCalculateAccuracyRatio() { - Assert.That(Utilities.CalculateScore(750, 100), Is.EqualTo(0)); - Assert.That(Utilities.CalculateScore(750, 750), Is.EqualTo(1)); - Assert.That(Utilities.CalculateScore(750, 725), Is.EqualTo(0.5f)); + Assert.That(Utilities.CalculateAccuracyRatio(750, 100), Is.EqualTo(0)); + Assert.That(Utilities.CalculateAccuracyRatio(750, 750), Is.EqualTo(1)); + Assert.That(Utilities.CalculateAccuracyRatio(750, 725), Is.EqualTo(0.5f)); } } diff --git a/RhythmGameUtilities/Scripts/Utilities.cs b/RhythmGameUtilities/Scripts/Utilities.cs index d6a7c89..89549aa 100644 --- a/RhythmGameUtilities/Scripts/Utilities.cs +++ b/RhythmGameUtilities/Scripts/Utilities.cs @@ -53,7 +53,7 @@ public static extern int ConvertSecondsToTicksInternal(float seconds, int resolu #elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] #endif - public static extern float CalculateScore(int position, int tickOffset, int delta); + public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta); #if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] @@ -144,9 +144,9 @@ public static List CalculateBeatBars(Dictionary bpmChanges, i return null; } - public static float CalculateScore(int position, int tickOffset, int delta = 50) + public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50) { - return UtilitiesInternal.CalculateScore(position, tickOffset, delta); + return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta); } } diff --git a/UnityPackage/Editor/Tests/UtilitiesTest.cs b/UnityPackage/Editor/Tests/UtilitiesTest.cs index 224ae77..15c4361 100644 --- a/UnityPackage/Editor/Tests/UtilitiesTest.cs +++ b/UnityPackage/Editor/Tests/UtilitiesTest.cs @@ -98,11 +98,11 @@ public void TestFindPositionNearGivenTick() } [Test] - public void TestCalculateScore() + public void TestCalculateAccuracyRatio() { - Assert.That(Utilities.CalculateScore(750, 100), Is.EqualTo(0)); - Assert.That(Utilities.CalculateScore(750, 750), Is.EqualTo(1)); - Assert.That(Utilities.CalculateScore(750, 725), Is.EqualTo(0.5f)); + Assert.That(Utilities.CalculateAccuracyRatio(750, 100), Is.EqualTo(0)); + Assert.That(Utilities.CalculateAccuracyRatio(750, 750), Is.EqualTo(1)); + Assert.That(Utilities.CalculateAccuracyRatio(750, 725), Is.EqualTo(0.5f)); } } diff --git a/UnityPackage/README.md b/UnityPackage/README.md index c6808a5..5a5c5ef 100644 --- a/UnityPackage/README.md +++ b/UnityPackage/README.md @@ -223,7 +223,7 @@ using RhythmGameUtilities; var value = Utilities.RoundUpToTheNearestMultiplier(12, 10); ``` -#### `Utilities.CalculateScore` +#### `Utilities.CalculateAccuracyRatio` #### `Utilities.CalculateBeatBarsInternal` diff --git a/UnityPackage/Scripts/Utilities.cs b/UnityPackage/Scripts/Utilities.cs index d6a7c89..89549aa 100644 --- a/UnityPackage/Scripts/Utilities.cs +++ b/UnityPackage/Scripts/Utilities.cs @@ -53,7 +53,7 @@ public static extern int ConvertSecondsToTicksInternal(float seconds, int resolu #elif LINUX_BUILD || UNITY_EDITOR_LINUX || UNITY_STANDALONE_LINUX [DllImport("libRhythmGameUtilities.so", CallingConvention = CallingConvention.Cdecl)] #endif - public static extern float CalculateScore(int position, int tickOffset, int delta); + public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta); #if WINDOWS_BUILD || UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN [DllImport("libRhythmGameUtilities.dll", CallingConvention = CallingConvention.Cdecl)] @@ -144,9 +144,9 @@ public static List CalculateBeatBars(Dictionary bpmChanges, i return null; } - public static float CalculateScore(int position, int tickOffset, int delta = 50) + public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50) { - return UtilitiesInternal.CalculateScore(position, tickOffset, delta); + return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta); } } diff --git a/includes/RhythmGameUtilities/Utilities.hpp b/includes/RhythmGameUtilities/Utilities.hpp index 32e2d25..d5af816 100644 --- a/includes/RhythmGameUtilities/Utilities.hpp +++ b/includes/RhythmGameUtilities/Utilities.hpp @@ -180,10 +180,10 @@ extern "C" return (int)std::ceil((float)value / multiplier) * multiplier; } - PACKAGE_API float CalculateScore(int position, int tickOffset, - int delta = 50) + PACKAGE_API float CalculateAccuracyRatio(int position, int currentPosition, + int delta = 50) { - auto diff = position - tickOffset; + auto diff = position - currentPosition; auto ratio = InverseLerp(delta, 0, std::abs(diff)); diff --git a/tests/RhythmGameUtilities/Utilities.cpp b/tests/RhythmGameUtilities/Utilities.cpp index f130afe..3a38ad2 100644 --- a/tests/RhythmGameUtilities/Utilities.cpp +++ b/tests/RhythmGameUtilities/Utilities.cpp @@ -49,11 +49,11 @@ void testFindPositionNearGivenTick() std::cout << "."; } -void testCalculateScore() +void testCalculateAccuracyRatio() { - assert(0 == CalculateScore(750, 100)); - assert(1 == CalculateScore(750, 750)); - assert(0.5f == CalculateScore(750, 725)); + assert(0 == CalculateAccuracyRatio(750, 100)); + assert(1 == CalculateAccuracyRatio(750, 750)); + assert(0.5f == CalculateAccuracyRatio(750, 725)); std::cout << "."; } @@ -99,7 +99,7 @@ int main() testConvertSecondsToTicks(); testIsOnTheBeat(); testFindPositionNearGivenTick(); - testCalculateScore(); + testCalculateAccuracyRatio(); testRoundUpToTheNearestMultiplier(); testGenerateAdjacentKeyPairs(); testCalculateBeatBars();