From 95d15a703eb33b37baa10d90d56fdc0ce4df550f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Tue, 12 Sep 2023 11:36:41 +0200 Subject: [PATCH] Improve legibility of scoring test scene - Add black background to avoid clashes with background images. - Use sorta-tetradic colours for the four plots. --- .../Visual/Gameplay/TestSceneScoring.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs index c722d67ac9..4cbc046877 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoring.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; +using osu.Framework.Allocation; using osu.Framework.Bindables; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -36,6 +37,9 @@ namespace osu.Game.Tests.Visual.Gameplay private FillFlowContainer legend = null!; + [Resolved] + private OsuColour colours { get; set; } = null!; + [Test] public void TestBasic() { @@ -43,6 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay { Children = new Drawable[] { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Colour4.Black + }, new GridContainer { RelativeSizeAxes = Axes.Both, @@ -125,8 +134,8 @@ namespace osu.Game.Tests.Visual.Gameplay graphs.Clear(); legend.Clear(); - runForProcessor("lazer-standardised", Color4.YellowGreen, new OsuScoreProcessor(), ScoringMode.Standardised); - runForProcessor("lazer-classic", Color4.MediumPurple, new OsuScoreProcessor(), ScoringMode.Classic); + runForProcessor("lazer-standardised", colours.Green1, new OsuScoreProcessor(), ScoringMode.Standardised); + runForProcessor("lazer-classic", colours.Blue1, new OsuScoreProcessor(), ScoringMode.Classic); runScoreV1(); runScoreV2(); @@ -156,7 +165,7 @@ namespace osu.Game.Tests.Visual.Gameplay currentCombo++; } - runForAlgorithm("ScoreV1 (classic)", Color4.Purple, + runForAlgorithm("ScoreV1 (classic)", colours.Purple1, () => applyHitV1(base_great), () => applyHitV1(base_ok), () => applyHitV1(0), @@ -199,7 +208,7 @@ namespace osu.Game.Tests.Visual.Gameplay currentHits++; } - runForAlgorithm("ScoreV2", Color4.OrangeRed, + runForAlgorithm("ScoreV2", colours.Red1, () => applyHitV2(base_great), () => applyHitV2(base_ok), () =>