Skip to content

[hotfix] Renamed method and variables. #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2024
Merged

[hotfix] Renamed method and variables. #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ using RhythmGameUtilities;
var value = Utilities.RoundUpToTheNearestMultiplier(12, 10);
```

#### `Utilities.CalculateScore`
#### `Utilities.CalculateAccuracyRatio`

#### `Utilities.CalculateBeatBarsInternal`

Expand Down
8 changes: 4 additions & 4 deletions RhythmGameUtilities.Tests/UtilitiesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

}
Expand Down
6 changes: 3 additions & 3 deletions RhythmGameUtilities/Scripts/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -144,9 +144,9 @@ public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> 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);
}

}
Expand Down
8 changes: 4 additions & 4 deletions UnityPackage/Editor/Tests/UtilitiesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

}
Expand Down
2 changes: 1 addition & 1 deletion UnityPackage/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ using RhythmGameUtilities;
var value = Utilities.RoundUpToTheNearestMultiplier(12, 10);
```

#### `Utilities.CalculateScore`
#### `Utilities.CalculateAccuracyRatio`

#### `Utilities.CalculateBeatBarsInternal`

Expand Down
6 changes: 3 additions & 3 deletions UnityPackage/Scripts/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -144,9 +144,9 @@ public static List<BeatBar> CalculateBeatBars(Dictionary<int, int> 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);
}

}
Expand Down
6 changes: 3 additions & 3 deletions includes/RhythmGameUtilities/Utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
10 changes: 5 additions & 5 deletions tests/RhythmGameUtilities/Utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 << ".";
}
Expand Down Expand Up @@ -99,7 +99,7 @@ int main()
testConvertSecondsToTicks();
testIsOnTheBeat();
testFindPositionNearGivenTick();
testCalculateScore();
testCalculateAccuracyRatio();
testRoundUpToTheNearestMultiplier();
testGenerateAdjacentKeyPairs();
testCalculateBeatBars();
Expand Down