sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge both variants of the star rating display

Browse Source
This commit is contained in:
Salman Ahmed
2021-07-17 06:54:11 +03:00
parent 0a8d37defa
commit d4399f10f9
8 changed files with 56 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Beatmaps/Drawables/StarRatingDisplayV2.cs → osu.Game/Beatmaps/Drawables/StarRatingDisplay.cs
View File

@ -17,8 +17,12 @@ using osuTK.Graphics;
namespace osu.Game.Beatmaps.Drawables
{
public class StarRatingDisplayV2 : CompositeDrawable, IHasCurrentValue<StarDifficulty>
/// <summary>
/// A pill that displays the star rating of a beatmap.
/// </summary>
public class StarRatingDisplay : CompositeDrawable, IHasCurrentValue<StarDifficulty>
{
private readonly bool useNewDifficultyColours;
private readonly Box background;
private readonly SpriteIcon starIcon;
private readonly OsuSpriteText starsText;
@ -38,13 +42,18 @@ namespace osu.Game.Beatmaps.Drawables
private OverlayColourProvider colourProvider { get; set; }
/// <summary>
/// Creates a new <see cref="StarRatingDisplayV2"/> using an already computed <see cref="StarDifficulty"/>.
/// 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 the star difficulty of.</param>
public StarRatingDisplayV2(StarDifficulty starDifficulty)
/// <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)
{
this.useNewDifficultyColours = useNewDifficultyColours;
Current.Value = starDifficulty;
Size = new Vector2(52f, 20f);
InternalChild = new CircularContainer
{
Masking = true,
@ -82,7 +91,9 @@ namespace osu.Game.Beatmaps.Drawables
{
starsText.Text = c.NewValue.Stars.ToString("0.00");
background.Colour = colours.ForStarDifficulty(c.NewValue.Stars);
background.Colour = useNewDifficultyColours
? colours.ForStarDifficulty(c.NewValue.Stars)
: colours.ForDifficultyRating(c.NewValue.DifficultyRating);
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);