h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-19 08:27:19 +08:00
Code Issues Releases Wiki Activity

Merge pull request from peppy/fix-hit-distribution-rounding

Browse Source 
Fix hit distribution graph midpoint rounding not looking great around zero
This commit is contained in:
Dean Herbert 2022-03-04 22:16:30 +09:00 committed by GitHub
commit d6e78e7d95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
osu.Game.Tests/Visual/Ranking
TestSceneHitEventTimingDistributionGraph.cs
osu.Game/Screens/Ranking/Statistics
HitEventTimingDistributionGraph.cs

6
osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs

@ -23,6 +23,12 @@ namespace osu.Game.Tests.Visual.Ranking
createTest(CreateDistributedHitEvents());
}
[Test]
public void TestManyDistributedEventsOffset()
{
createTest(CreateDistributedHitEvents(-3.5));
}
[Test]
public void TestAroundCentre()
{

16
osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs

@ -64,10 +64,22 @@ namespace osu.Game.Screens.Ranking.Statistics
// Prevent div-by-0 by enforcing a minimum bin size
binSize = Math.Max(1, binSize);
bool roundUp = true;
foreach (var e in hitEvents)
{
int binOffset = (int)Math.Round(e.TimeOffset / binSize, MidpointRounding.AwayFromZero);
bins[timing_distribution_centre_bin_index + binOffset]++;
double binOffset = e.TimeOffset / binSize;
// .NET's round midpoint handling doesn't provide a behaviour that works amazingly for display
// purposes here. We want midpoint rounding to roughly distribute evenly to each adjacent bucket
// so the easiest way is to cycle between downwards and upwards rounding as we process events.
if (Math.Abs(binOffset - (int)binOffset) == 0.5)
{
binOffset = (int)binOffset + Math.Sign(binOffset) * (roundUp ? 1 : 0);
roundUp = !roundUp;
}
bins[timing_distribution_centre_bin_index + (int)Math.Round(binOffset, MidpointRounding.AwayFromZero)]++;
}
int maxCount = bins.Max();