h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 22:57:19 +08:00
Code Issues Releases Wiki Activity

Refactor implementation

Browse Source
This commit is contained in:
Dean Herbert 2020-12-18 16:20:54 +09:00
parent ceb2e4762d
commit c84807ed5c
1 changed files with 73 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Linq;
using Humanizer; using Humanizer;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
@ -11,7 +10,6 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.API;
using osu.Game.Users; using osu.Game.Users;
using osu.Game.Utils; using osu.Game.Utils;
using osuTK; using osuTK;
@ -26,7 +24,7 @@ namespace osu.Game.Screens.Play.HUD
private const float panel_height = 35f; private const float panel_height = 35f;
private OsuSpriteText positionText, scoreText, accuracyText, comboText; private OsuSpriteText positionText, scoreText, accuracyText, comboText, usernameText;
public readonly BindableDouble TotalScore = new BindableDouble(1000000); public readonly BindableDouble TotalScore = new BindableDouble(1000000);
public readonly BindableDouble Accuracy = new BindableDouble(1); public readonly BindableDouble Accuracy = new BindableDouble(1);
@ -45,6 +43,7 @@ namespace osu.Game.Screens.Play.HUD
positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}"; positionText.Text = $"#{scorePosition.Value.ToMetric(decimals: scorePosition < 100000 ? 1 : 0)}";
positionText.FadeTo(scorePosition.HasValue ? 1 : 0); positionText.FadeTo(scorePosition.HasValue ? 1 : 0);
updateColour();
} }
} }
@ -52,6 +51,9 @@ namespace osu.Game.Screens.Play.HUD
private readonly bool trackedPlayer; private readonly bool trackedPlayer;
private Container mainFillContainer;
private Box centralFill;
/// <summary> /// <summary>
/// Creates a new <see cref="GameplayLeaderboardScore"/>. /// Creates a new <see cref="GameplayLeaderboardScore"/>.
/// </summary> /// </summary>
@ -62,62 +64,93 @@ namespace osu.Game.Screens.Play.HUD
User = user; User = user;
this.trackedPlayer = trackedPlayer; this.trackedPlayer = trackedPlayer;
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.X;
Height = panel_height;
Anchor = Anchor.TopRight; Anchor = Anchor.TopRight;
Origin = Anchor.TopRight; Origin = Anchor.TopRight;
} }
[BackgroundDependencyLoader] protected override void LoadComplete()
private void load(IAPIProvider api)
{ {
const float panel_shear = 0.15f; base.LoadComplete();
const float shear_width = panel_height * panel_shear;
Color4 panelColour, textColour; updateColour();
float panelWidth; FinishTransforms(true);
}
if (trackedPlayer) private void updateColour()
{
if (scorePosition == 1)
{ {
panelWidth = extended_width; mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
panelColour = Color4Extensions.FromHex("7fcc33"); panelColour = Color4Extensions.FromHex("7fcc33");
textColour = Color4.White; textColour = Color4.White;
} }
else if (api.Friends.Any(f => User.Equals(f))) else if (trackedPlayer)
{ {
panelWidth = extended_width; mainFillContainer.ResizeWidthTo(extended_width, 200, Easing.OutQuint);
panelColour = Color4Extensions.FromHex("ffd966"); panelColour = Color4Extensions.FromHex("ffd966");
textColour = Color4Extensions.FromHex("2e576b"); textColour = Color4Extensions.FromHex("2e576b");
} }
else else
{ {
panelWidth = regular_width; mainFillContainer.ResizeWidthTo(regular_width, 200, Easing.OutQuint);
panelColour = Color4Extensions.FromHex("3399cc"); panelColour = Color4Extensions.FromHex("3399cc");
textColour = Color4.White; textColour = Color4.White;
} }
}
private Color4 panelColour
{
set
{
mainFillContainer.FadeColour(value, 200, Easing.OutQuint);
centralFill.FadeColour(value, 200, Easing.OutQuint);
}
}
private Color4 textColour
{
set
{
scoreText.FadeColour(value, 200, Easing.OutQuint);
accuracyText.FadeColour(value, 200, Easing.OutQuint);
comboText.FadeColour(value, 200, Easing.OutQuint);
usernameText.FadeColour(value, 200, Easing.OutQuint);
positionText.FadeColour(value, 200, Easing.OutQuint);
}
}
[BackgroundDependencyLoader]
private void load()
{
const float panel_shear = 0.15f;
const float shear_width = panel_height * panel_shear;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Container mainFillContainer = new Container
{ {
Width = regular_width,
RelativeSizeAxes = Axes.Y,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Masking = true, Masking = true,
CornerRadius = 5f, CornerRadius = 5f,
Shear = new Vector2(panel_shear, 0f), Shear = new Vector2(panel_shear, 0f),
Size = new Vector2(panelWidth, panel_height),
Child = new Box Child = new Box
{ {
Alpha = 0.5f, Alpha = 0.5f,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = panelColour,
} }
}, },
new GridContainer new GridContainer
{ {
Width = regular_width,
RelativeSizeAxes = Axes.Y,
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Size = new Vector2(regular_width, panel_height),
ColumnDimensions = new[] ColumnDimensions = new[]
{ {
new Dimension(GridSizeMode.Absolute, 35f), new Dimension(GridSizeMode.Absolute, 35f),
@ -133,7 +166,7 @@ namespace osu.Game.Screens.Play.HUD
Padding = new MarginPadding { Right = shear_width / 2 }, Padding = new MarginPadding { Right = shear_width / 2 },
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = textColour, Colour = Color4.White,
Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold), Font = OsuFont.Torus.With(size: 14, weight: FontWeight.Bold),
Shadow = false, Shadow = false,
}, },
@ -151,22 +184,22 @@ namespace osu.Game.Screens.Play.HUD
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new[] Children = new[]
{ {
new Box centralFill = new Box
{ {
Alpha = 0.5f, Alpha = 0.5f,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = panelColour, Colour = Color4Extensions.FromHex("3399cc"),
}, },
} }
}, },
new OsuSpriteText usernameText = new OsuSpriteText
{ {
Padding = new MarginPadding { Left = shear_width }, Padding = new MarginPadding { Left = shear_width },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Width = 0.8f, Width = 0.8f,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Colour = textColour, Colour = Color4.White,
Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold), Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold),
Text = User.Username, Text = User.Username,
Truncate = true, Truncate = true,
@ -180,41 +213,31 @@ namespace osu.Game.Screens.Play.HUD
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Colour = textColour, Colour = Color4.White,
Children = new Drawable[] Children = new Drawable[]
{ {
scoreText = new OsuSpriteText scoreText = new OsuSpriteText
{ {
Anchor = Anchor.TopLeft, Spacing = new Vector2(-1f, 0f),
Origin = Anchor.TopLeft, Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold, fixedWidth: true),
Spacing = new Vector2(0.5f, 0f),
Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
Shadow = false, Shadow = false,
}, },
new Container accuracyText = new OsuSpriteText
{ {
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Children = new Drawable[] Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
{ Spacing = new Vector2(-1f, 0f),
accuracyText = new OsuSpriteText Shadow = false,
{ },
Anchor = Anchor.CentreLeft, comboText = new OsuSpriteText
Origin = Anchor.CentreLeft, {
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold), Anchor = Anchor.BottomRight,
Shadow = false, Origin = Anchor.BottomRight,
}, Spacing = new Vector2(-1f, 0f),
comboText = new OsuSpriteText Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold, fixedWidth: true),
{ Shadow = false,
Anchor = Anchor.CentreRight, },
Origin = Anchor.CentreRight,
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
Shadow = false,
},
}
}
}, },
} }
} }