h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:15:45 +08:00
Code Issues Releases Wiki Activity

Reuse existing code in hit error bar fix

Browse Source 
Use `UprightAspectMaintainingContainer` instead of a local fix for
hit error bar orientation
This commit is contained in:
outfoxxed 2022-10-16 10:06:38 -07:00
parent cd1885a17b
commit d6030891a2
No known key found for this signature in database
GPG Key ID: 5775F651AC84FFE6
1 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
@ -273,45 +274,74 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
break; break;
case LabelStyles.Icons: case LabelStyles.Icons:
labelEarly = new SpriteIcon labelEarly = new UprightAspectMaintainingContainer
{ {
Y = -10, AutoSizeAxes = Axes.Both,
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.ShippingFast,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = -10,
Children = new Drawable[]
{
new SpriteIcon
{
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.ShippingFast,
}
}
}; };
labelLate = new SpriteIcon labelLate = new UprightAspectMaintainingContainer
{ {
Y = 10, AutoSizeAxes = Axes.Both,
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.Bicycle,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = 10,
Children = new Drawable[]
{
new SpriteIcon
{
Y = 10,
Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.Bicycle,
}
}
}; };
break; break;
case LabelStyles.Text: case LabelStyles.Text:
labelEarly = new OsuSpriteText labelEarly = new UprightAspectMaintainingContainer
{ {
Y = -10, AutoSizeAxes = Axes.Both,
Text = "Early",
Font = OsuFont.Default.With(size: 10),
Height = 12,
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = -10,
Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Early",
Font = OsuFont.Default.With(size: 10),
Height = 12,
}
}
}; };
labelLate = new OsuSpriteText labelLate = new UprightAspectMaintainingContainer
{ {
Y = 10, AutoSizeAxes = Axes.Both,
Text = "Late",
Font = OsuFont.Default.With(size: 10),
Height = 12,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = 10,
Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Late",
Font = OsuFont.Default.With(size: 10),
Height = 12,
}
}
}; };
break; break;
@ -333,33 +363,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
} }
} }
protected override void Update()
{
base.Update();
// undo any layout rotation to display icons in the correct orientation
bool xFlipped = Scale.X < 0;
bool yFlipped = Scale.Y < 0;
bool horizontal = Rotation == 90 || Rotation == -90;
bool flipX = (xFlipped && yFlipped) || (xFlipped && !horizontal) || (yFlipped && horizontal);
bool flipY = (xFlipped && yFlipped) || (xFlipped && horizontal) || (yFlipped && !horizontal);
Vector2 flipScale = new Vector2(flipX ? -1 : 1, flipY ? -1 : 1);
if (labelEarly != null)
{
labelEarly.Rotation = -Rotation;
labelEarly.Scale = flipScale;
}
if (labelLate != null)
{
labelLate.Rotation = -Rotation;
labelLate.Scale = flipScale;
}
}
private void createColourBars((HitResult result, double length)[] windows) private void createColourBars((HitResult result, double length)[] windows)
{ {
// max to avoid div-by-zero. // max to avoid div-by-zero.