h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 04:13:11 +08:00
Code Issues Releases Wiki Activity

Make score wireframes display up to required digits count

Browse Source
This commit is contained in:
Salman Ahmed 2023-11-07 00:54:34 +03:00
parent 4c7db4c262
commit ce36884ef0
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
View File

@ -1,9 +1,11 @@
// 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;
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
@ -19,7 +21,7 @@ namespace osu.Game.Screens.Play.HUD
public partial class ArgonScoreCounter : GameplayScoreCounter, ISerialisableDrawable public partial class ArgonScoreCounter : GameplayScoreCounter, ISerialisableDrawable
{ {
[SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")] [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
public BindableFloat WireframeOpactiy { get; } = new BindableFloat(0.4f) public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.4f)
{ {
Precision = 0.01f, Precision = 0.01f,
MinValue = 0, MinValue = 0,
@ -28,9 +30,12 @@ namespace osu.Game.Screens.Play.HUD
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
protected override LocalisableString FormatCount(long count) => count.ToLocalisableString();
protected override IHasText CreateText() => new ArgonScoreTextComponent protected override IHasText CreateText() => new ArgonScoreTextComponent
{ {
WireframeOpactiy = { BindTarget = WireframeOpactiy }, RequiredDisplayDigits = { BindTarget = RequiredDisplayDigits },
WireframeOpacity = { BindTarget = WireframeOpacity },
}; };
private partial class ArgonScoreTextComponent : CompositeDrawable, IHasText private partial class ArgonScoreTextComponent : CompositeDrawable, IHasText
@ -38,14 +43,15 @@ namespace osu.Game.Screens.Play.HUD
private readonly ArgonScoreSpriteText wireframesPart; private readonly ArgonScoreSpriteText wireframesPart;
private readonly ArgonScoreSpriteText textPart; private readonly ArgonScoreSpriteText textPart;
public IBindable<float> WireframeOpactiy { get; } = new BindableFloat(); public IBindable<int> RequiredDisplayDigits { get; } = new BindableInt();
public IBindable<float> WireframeOpacity { get; } = new BindableFloat();
public LocalisableString Text public LocalisableString Text
{ {
get => textPart.Text; get => textPart.Text;
set set
{ {
wireframesPart.Text = value; wireframesPart.Text = new string('#', Math.Max(value.ToString().Length, RequiredDisplayDigits.Value));
textPart.Text = value; textPart.Text = value;
} }
} }
@ -56,15 +62,23 @@ namespace osu.Game.Screens.Play.HUD
InternalChildren = new[] InternalChildren = new[]
{ {
wireframesPart = new ArgonScoreSpriteText(@"wireframes"), wireframesPart = new ArgonScoreSpriteText(@"wireframes")
textPart = new ArgonScoreSpriteText(), {
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
},
textPart = new ArgonScoreSpriteText
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
},
}; };
} }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
WireframeOpactiy.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true); WireframeOpacity.BindValueChanged(v => wireframesPart.Alpha = v.NewValue, true);
} }
private partial class ArgonScoreSpriteText : OsuSpriteText private partial class ArgonScoreSpriteText : OsuSpriteText