RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new difficulty colours permanently

This commit is contained in:
Salman Ahmed 2021-08-04 17:06:07 +03:00
parent 7f9af0ae65
commit b2332eb5b3
3 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game.Tests/Visual/UserInterface/TestSceneStarRatingDisplay.cs
View File

@ -14,34 +14,10 @@ namespace osu.Game.Tests.Visual.UserInterface
{
public class TestSceneStarRatingDisplay : OsuTestScene
{
[Test]
public void TestOldColoursDisplay()
{
AddStep("load displays", () => Child = new FillFlowContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
ChildrenEnumerable = new[]
{
1.23,
2.34,
3.45,
4.56,
5.67,
6.78,
10.11,
}.Select(starRating => new StarRatingDisplay(new StarDifficulty(starRating, 0))
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
})
});
}
[TestCase(52f, 20f)]
[TestCase(52f, 16f)]
[TestCase(50f, 14f)]
public void TestNewColoursDisplay(float width, float height)
public void TestDisplay(float width, float height)
{
AddStep("load displays", () =>
{
@ -59,7 +35,7 @@ public void TestNewColoursDisplay(float width, float height)
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(2f),
Direction = FillDirection.Vertical,
ChildrenEnumerable = Enumerable.Range(0, 10).Select(j => new StarRatingDisplay(new StarDifficulty(i + j * 0.1f, 0), true)
ChildrenEnumerable = Enumerable.Range(0, 10).Select(j => new StarRatingDisplay(new StarDifficulty(i + j * 0.1f, 0))
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -71,11 +47,11 @@ public void TestNewColoursDisplay(float width, float height)
}
[Test]
public void TestChangingStarRatingDisplay([Values(false, true)] bool useNewColours)
public void TestChangingStarRatingDisplay()
{
StarRatingDisplay starRating = null;
AddStep("load display", () => Child = starRating = new StarRatingDisplay(new StarDifficulty(5.55, 1), useNewColours)
AddStep("load display", () => Child = starRating = new StarRatingDisplay(new StarDifficulty(5.55, 1))
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,

10
osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
View File

@ -22,7 +22,6 @@ namespace osu.Game.Beatmaps.Drawables
/// </summary>
public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
{
private readonly bool useNewDifficultyColours;
private readonly Box background;
private readonly SpriteIcon starIcon;
private readonly OsuSpriteText starsText;
@ -45,11 +44,8 @@ public Bindable<StarDifficulty> Current
/// Creates a new <see cref="StarRatingDisplay"/> using an already computed <see cref="StarDifficulty"/>.
/// </summary>
/// <param name="starDifficulty">The already computed <see cref="StarDifficulty"/> to display.</param>
/// <param name="useNewDifficultyColours">Use the new spectrum-based difficulty colours for the display, rather than the old.</param>
public StarRatingDisplay(StarDifficulty starDifficulty, bool useNewDifficultyColours = false)
public StarRatingDisplay(StarDifficulty starDifficulty)
{
this.useNewDifficultyColours = useNewDifficultyColours;
Current.Value = starDifficulty;
Size = new Vector2(52f, 20f);
@ -92,9 +88,7 @@ protected override void LoadComplete()
{
starsText.Text = c.NewValue.Stars.ToString("0.00");
background.Colour = useNewDifficultyColours
? colours.ForStarDifficulty(c.NewValue.Stars)
: colours.ForDifficultyRating(c.NewValue.DifficultyRating);
background.Colour = colours.ForStarDifficulty(c.NewValue.Stars);
starIcon.Colour = c.NewValue.Stars >= 6.5 ? colours.Orange1 : colourProvider?.Background5 ?? Color4Extensions.FromHex("303d47");
starsText.Colour = c.NewValue.Stars >= 6.5 ? colours.Orange1 : colourProvider?.Background5 ?? Color4.Black.Opacity(0.75f);

6
osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
View File

@ -16,8 +16,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
{
public class StarRatingRangeDisplay : OnlinePlayComposite
{
private readonly bool useNewDifficultyColours;
[Resolved]
private OsuColour colours { get; set; }
@ -26,10 +24,8 @@ public class StarRatingRangeDisplay : OnlinePlayComposite
private StarRatingDisplay maxDisplay;
private Drawable maxBackground;
public StarRatingRangeDisplay(bool useNewDifficultyColours = false)
public StarRatingRangeDisplay()
{
this.useNewDifficultyColours = useNewDifficultyColours;
AutoSizeAxes = Axes.Both;
}