Revamp results screen statistics display

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -26,7 +26,10 @@
 using osu.Game.Rulesets.Replays.Types;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch
 {
@@ -218,5 +221,13 @@ public override LocalisableString GetDisplayNameForHitResult(HitResult result)
  public override HitObjectComposer CreateHitObjectComposer() => new CatchHitObjectComposer(this);
 
  public override IBeatmapVerifier CreateBeatmapVerifier() => new CatchBeatmapVerifier();
+
+ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap)
+ {
+ return new[]
+ {
+ new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap), relativeSize: new Vector2(1, 0.25f)),
+ };
+ }
  }
 }

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -38,6 +38,7 @@
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Mania
 {
@@ -402,21 +403,13 @@ public override LocalisableString GetDisplayNameForHitResult(HitResult result)
 
  public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatmap playableBeatmap) => new[]
  {
- new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y
- }),
- new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents)
- {
- RelativeSizeAxes = Axes.X,
- Height = 250
- }, true),
- new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+ new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap), relativeSize: new Vector2(1, 0.25f)),
+ new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(score.HitEvents), true, relativeSize: new Vector2(1, 0.2f)),
+ new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
  {
  new AverageHitError(score.HitEvents),
  new UnstableRate(score.HitEvents)
- }), true)
+ }), true, new Vector2(1, 0.1f))
  };
 
  public override IRulesetFilterCriteria CreateRulesetFilterCriteria()

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -38,6 +38,7 @@
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu
 {
@@ -304,26 +305,17 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm
 
  return new[]
  {
- new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y
- }),
- new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents)
- {
- RelativeSizeAxes = Axes.X,
- Height = 250
- }, true),
+ new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap), relativeSize: new Vector2(1, 0.25f)),
+ new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents), true, relativeSize: new Vector2(0.6f, 0.25f)),
  new StatisticItem("Accuracy Heatmap", () => new AccuracyHeatmap(score, playableBeatmap)
  {
- RelativeSizeAxes = Axes.X,
- Height = 250
- }, true),
- new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+ RelativeSizeAxes = Axes.Both,
+ }, true, relativeSize: new Vector2(0.4f, 0.25f)),
+ new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
  {
  new AverageHitError(timedHitEvents),
  new UnstableRate(timedHitEvents)
- }), true)
+ }), true, new Vector2(1, 0.1f))
  };
  }
 

osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs

@@ -11,6 +11,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Scoring;
@@ -120,18 +121,22 @@ private void load()
  new OsuSpriteText
  {
  Text = "Overshoot",
+ Font = OsuFont.GetFont(size: 12),
  Anchor = Anchor.Centre,
- Origin = Anchor.BottomCentre,
- Padding = new MarginPadding(3),
+ Origin = Anchor.BottomLeft,
+ Padding = new MarginPadding(2),
+ Rotation = -rotation,
  RelativePositionAxes = Axes.Both,
  Y = -(inner_portion + line_extension) / 2,
  },
  new OsuSpriteText
  {
  Text = "Undershoot",
+ Font = OsuFont.GetFont(size: 12),
  Anchor = Anchor.Centre,
- Origin = Anchor.TopCentre,
- Padding = new MarginPadding(3),
+ Origin = Anchor.TopRight,
+ Rotation = -rotation,
+ Padding = new MarginPadding(2),
  RelativePositionAxes = Axes.Both,
  Y = (inner_portion + line_extension) / 2,
  },

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -35,6 +35,7 @@
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Taiko.Configuration;
+using osuTK;
 
 namespace osu.Game.Rulesets.Taiko
 {
@@ -246,21 +247,13 @@ public override StatisticItem[] CreateStatisticsForScore(ScoreInfo score, IBeatm
 
  return new[]
  {
- new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap)
- {
- RelativeSizeAxes = Axes.X,
- AutoSizeAxes = Axes.Y
- }),
- new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents)
- {
- RelativeSizeAxes = Axes.X,
- Height = 250
- }, true),
- new StatisticItem(string.Empty, () => new SimpleStatisticTable(3, new SimpleStatisticItem[]
+ new StatisticItem("Performance Breakdown", () => new PerformanceBreakdownChart(score, playableBeatmap), relativeSize: new Vector2(1, 0.25f)),
+ new StatisticItem("Timing Distribution", () => new HitEventTimingDistributionGraph(timedHitEvents), true, relativeSize: new Vector2(1, 0.2f)),
+ new StatisticItem("Statistics", () => new SimpleStatisticTable(2, new SimpleStatisticItem[]
  {
  new AverageHitError(timedHitEvents),
  new UnstableRate(timedHitEvents)
- }), true)
+ }), true, new Vector2(1, 0.1f))
  };
  }
  }

osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs

@@ -69,6 +69,30 @@ public void TestScaling()
  }));
  }
 
+ [TestCase(1, ScoreRank.X)]
+ [TestCase(0.9999, ScoreRank.S)]
+ [TestCase(0.975, ScoreRank.S)]
+ [TestCase(0.925, ScoreRank.A)]
+ [TestCase(0.85, ScoreRank.B)]
+ [TestCase(0.75, ScoreRank.C)]
+ [TestCase(0.5, ScoreRank.D)]
+ [TestCase(0.2, ScoreRank.D)]
+ public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
+ {
+ TestResultsScreen screen = null;
+
+ var score = TestResources.CreateTestScoreInfo();
+
+ score.OnlineID = 1234;
+ score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
+ score.Accuracy = accuracy;
+ score.Rank = rank;
+
+ loadResultsScreen(() => screen = createResultsScreen(score));
+ AddUntilStep("wait for loaded", () => screen.IsLoaded);
+ AddAssert("retry overlay present", () => screen.RetryOverlay != null);
+ }
+
  [Test]
  public void TestResultsWithoutPlayer()
  {
@@ -82,34 +106,14 @@ public void TestResultsWithoutPlayer()
  RelativeSizeAxes = Axes.Both
  };
 
- stack.Push(screen = createResultsScreen());
+ var score = TestResources.CreateTestScoreInfo();
+
+ stack.Push(screen = createResultsScreen(score));
  });
  AddUntilStep("wait for loaded", () => screen.IsLoaded);
  AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
  }
 
- [TestCase(0.2, ScoreRank.D)]
- [TestCase(0.5, ScoreRank.D)]
- [TestCase(0.75, ScoreRank.C)]
- [TestCase(0.85, ScoreRank.B)]
- [TestCase(0.925, ScoreRank.A)]
- [TestCase(0.975, ScoreRank.S)]
- [TestCase(0.9999, ScoreRank.S)]
- [TestCase(1, ScoreRank.X)]
- public void TestResultsWithPlayer(double accuracy, ScoreRank rank)
- {
- TestResultsScreen screen = null;
-
- var score = TestResources.CreateTestScoreInfo();
-
- score.Accuracy = accuracy;
- score.Rank = rank;
-
- loadResultsScreen(() => screen = createResultsScreen(score));
- AddUntilStep("wait for loaded", () => screen.IsLoaded);
- AddAssert("retry overlay present", () => screen.RetryOverlay != null);
- }
-
  [Test]
  public void TestResultsForUnranked()
  {
@@ -328,13 +332,14 @@ public TestResultsContainer(IScreen screen)
  }
  }
 
- private partial class TestResultsScreen : ResultsScreen
+ private partial class TestResultsScreen : SoloResultsScreen
  {
  public HotkeyRetryOverlay RetryOverlay;
 
  public TestResultsScreen(ScoreInfo score)
  : base(score, true)
  {
+ ShowUserStatistics = true;
  }
 
  protected override void LoadComplete()