sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-07 06:37:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into handle-submitting-player-request-timeout

Browse Source
This commit is contained in:
Dean Herbert 2022-10-17 18:51:13 +09:00 committed by GitHub
commit 516320edd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
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;
@ -44,8 +45,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
public Bindable<LabelStyles> LabelStyle { get; } = new Bindable<LabelStyles>(LabelStyles.Icons); public Bindable<LabelStyles> LabelStyle { get; } = new Bindable<LabelStyles>(LabelStyles.Icons);
private SpriteIcon arrow; private SpriteIcon arrow;
private Drawable labelEarly; private UprightAspectMaintainingContainer labelEarly;
private Drawable labelLate; private UprightAspectMaintainingContainer labelLate;
private Container colourBarsEarly; private Container colourBarsEarly;
private Container colourBarsLate; private Container colourBarsLate;
@ -122,6 +123,20 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = judgement_line_width, 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 arrowContainer = new Container
@ -261,57 +276,39 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
{ {
const float icon_size = 14; const float icon_size = 14;
labelEarly?.Expire();
labelEarly = null;
labelLate?.Expire();
labelLate = null;
switch (style) switch (style)
{ {
case LabelStyles.None: case LabelStyles.None:
break; break;
case LabelStyles.Icons: case LabelStyles.Icons:
labelEarly = new SpriteIcon labelEarly.Child = new SpriteIcon
{ {
Y = -10,
Size = new Vector2(icon_size), Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.ShippingFast, Icon = FontAwesome.Solid.ShippingFast,
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
}; };
labelLate = new SpriteIcon labelLate.Child = new SpriteIcon
{ {
Y = 10,
Size = new Vector2(icon_size), Size = new Vector2(icon_size),
Icon = FontAwesome.Solid.Bicycle, Icon = FontAwesome.Solid.Bicycle,
Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre,
}; };
break; break;
case LabelStyles.Text: case LabelStyles.Text:
labelEarly = new OsuSpriteText labelEarly.Child = new OsuSpriteText
{ {
Y = -10,
Text = "Early", Text = "Early",
Font = OsuFont.Default.With(size: 10), Font = OsuFont.Default.With(size: 10),
Height = 12, Height = 12,
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
}; };
labelLate = new OsuSpriteText labelLate.Child = new OsuSpriteText
{ {
Y = 10,
Text = "Late", Text = "Late",
Font = OsuFont.Default.With(size: 10), Font = OsuFont.Default.With(size: 10),
Height = 12, Height = 12,
Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre,
}; };
break; break;
@ -320,26 +317,8 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
throw new ArgumentOutOfRangeException(nameof(style), style, null); throw new ArgumentOutOfRangeException(nameof(style), style, null);
} }
if (labelEarly != null) labelEarly.FadeInFromZero(500);
{ labelLate.FadeInFromZero(500);
colourBars.Add(labelEarly);
labelEarly.FadeInFromZero(500);
}
if (labelLate != null)
{
colourBars.Add(labelLate);
labelLate.FadeInFromZero(500);
}
}
protected override void Update()
{
base.Update();
// undo any layout rotation to display icons in the correct orientation
if (labelEarly != null) labelEarly.Rotation = -Rotation;
if (labelLate != null) labelLate.Rotation = -Rotation;
} }
private void createColourBars((HitResult result, double length)[] windows) private void createColourBars((HitResult result, double length)[] windows)