h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 22:07:25 +08:00
Code Issues Releases Wiki Activity

Only create hit error bar icon containers once

Browse Source 
Move icon container creation to BDL, and only recreate the contained
icon when `recreateLabels` is called
This commit is contained in:
outfoxxed 2022-10-16 11:47:21 -07:00
parent d6030891a2
commit 85de802793
No known key found for this signature in database
GPG Key ID: 5775F651AC84FFE6
1 changed files with 30 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
View File

@ -45,8 +45,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
public Bindable<LabelStyles> LabelStyle { get; } = new Bindable<LabelStyles>(LabelStyles.Icons);
private SpriteIcon arrow;
private Drawable labelEarly;
private Drawable labelLate;
private UprightAspectMaintainingContainer labelEarly;
private UprightAspectMaintainingContainer labelLate;
private Container colourBarsEarly;
private Container colourBarsLate;
@ -123,6 +123,18 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
RelativeSizeAxes = Axes.Y,
Width = judgement_line_width,
},
labelEarly = new UprightAspectMaintainingContainer {
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
Y = -10,
},
labelLate = new UprightAspectMaintainingContainer {
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre,
Y = 10,
},
}
},
arrowContainer = new Container
@ -262,86 +274,39 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
{
const float icon_size = 14;
labelEarly?.Expire();
labelEarly = null;
labelLate?.Expire();
labelLate = null;
switch (style)
{
case LabelStyles.None:
break;
case LabelStyles.Icons:
labelEarly = new UprightAspectMaintainingContainer
labelEarly.Child = new SpriteIcon
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
Y = -10,
Children = new Drawable[]
{
new SpriteIcon
{
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.ShippingFast,
}
}
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.ShippingFast,
};
labelLate = new UprightAspectMaintainingContainer
labelLate.Child = new SpriteIcon
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre,
Y = 10,
Children = new Drawable[]
{
new SpriteIcon
{
Y = 10,
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.Bicycle,
}
}
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.Bicycle,
};
break;
case LabelStyles.Text:
labelEarly = new UprightAspectMaintainingContainer
labelEarly.Child = new OsuSpriteText
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
Y = -10,
Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Early",
Font = OsuFont.Default.With(size: 10),
Height = 12,
}
}
Text = "Early",
Font = OsuFont.Default.With(size: 10),
Height = 12,
};
labelLate = new UprightAspectMaintainingContainer
labelLate.Child = new OsuSpriteText
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre,
Y = 10,
Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Late",
Font = OsuFont.Default.With(size: 10),
Height = 12,
}
}
Text = "Late",
Font = OsuFont.Default.With(size: 10),
Height = 12,
};
break;
@ -350,17 +315,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
throw new ArgumentOutOfRangeException(nameof(style), style, null);
}
if (labelEarly != null)
{
colourBars.Add(labelEarly);
labelEarly.FadeInFromZero(500);
}
if (labelLate != null)
{
colourBars.Add(labelLate);
labelLate.FadeInFromZero(500);
}
labelEarly.FadeInFromZero(500);
labelLate.FadeInFromZero(500);
}
private void createColourBars((HitResult result, double length)[] windows)