From abdb99192397e21964706822c9d9fa8948a54c8f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Aug 2020 14:15:47 +0900
Subject: [PATCH 1/2] Hide misses from timing distribution graph
---
.../TestSceneHitEventTimingDistributionGraph.cs | 12 ++++++++++++
.../Statistics/HitEventTimingDistributionGraph.cs | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
index 7ca1fc842f..144f8da2fa 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -35,6 +35,18 @@ namespace osu.Game.Tests.Visual.Ranking
createTest(new List<HitEvent>());
}
+ [Test]
+ public void TestMissesDontShow()
+ {
+ createTest(Enumerable.Range(0, 100).Select(i =>
+ {
+ if (i % 2 == 0)
+ return new HitEvent(0, HitResult.Perfect, new HitCircle(), new HitCircle(), null);
+
+ return new HitEvent(30, HitResult.Miss, new HitCircle(), new HitCircle(), null);
+ }).ToList());
+ }
+
private void createTest(List<HitEvent> events) => AddStep("create test", () =>
{
Children = new Drawable[]
diff --git a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
index 527da429ed..45fdc3ff33 100644
--- a/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
+++ b/osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Ranking.Statistics
/// <param name="hitEvents">The <see cref="HitEvent"/>s to display the timing distribution of.</param>
public HitEventTimingDistributionGraph(IReadOnlyList<HitEvent> hitEvents)
{
- this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows)).ToList();
+ this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result != HitResult.Miss).ToList();
}
[BackgroundDependencyLoader]
From bee01bdd38cf13bfeddac343c68ad315daef570f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 31 Aug 2020 18:01:16 +0900
Subject: [PATCH 2/2] Fix first scroll wheel in editor incorrectly advancing
twice
---
osu.Game/Screens/Edit/Editor.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d92f3922c3..e178459d5c 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -284,7 +284,7 @@ namespace osu.Game.Screens.Edit
// this is a special case to handle the "pivot" scenario.
// if we are precise scrolling in one direction then change our mind and scroll backwards,
// the existing accumulation should be applied in the inverse direction to maintain responsiveness.
- if (Math.Sign(scrollAccumulation) != scrollDirection)
+ if (scrollAccumulation != 0 && Math.Sign(scrollAccumulation) != scrollDirection)
scrollAccumulation = scrollDirection * (precision - Math.Abs(scrollAccumulation));
scrollAccumulation += scrollComponent * (e.IsPrecise ? 0.1 : 1);