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

Fix Main file issues

Browse Source
This commit is contained in:
Mk-56spn 2022-09-08 11:58:14 +02:00
parent cfa1ebd0cb
commit 07c16224d2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
View File

@ -18,7 +18,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
{ {
public class ColourHitErrorMeter : HitErrorMeter public class ColourHitErrorMeter : HitErrorMeter
{ {
private const int default_shape_alpha = 0;
private const int animation_duration = 200; private const int animation_duration = 200;
private const int drawable_judgement_size = 8; private const int drawable_judgement_size = 8;
@ -35,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
{ {
MinValue = 0.01f, MinValue = 0.01f,
MaxValue = 1, MaxValue = 1,
Precision = .01f, Precision = 0.01f,
}; };
[SettingSource("Spacing", "Space between hit error shapes")] [SettingSource("Spacing", "Space between hit error shapes")]
@ -43,10 +42,10 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
{ {
MinValue = 0, MinValue = 0,
MaxValue = 10, MaxValue = 10,
Precision = .1f Precision = 0.1f
}; };
[SettingSource("Shape", "What shape to use for hit errors")] [SettingSource("Shape", "The shape of each displayed error")]
public Bindable<ShapeStyle> HitShape { get; } = new Bindable<ShapeStyle>(); public Bindable<ShapeStyle> HitShape { get; } = new Bindable<ShapeStyle>();
private readonly JudgementFlow judgementsFlow; private readonly JudgementFlow judgementsFlow;
@ -81,7 +80,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
}, true); }, true);
HitShape.BindValueChanged(_ => HitShape.BindValueChanged(_ =>
{ {
judgementsFlow.ValueParser = getShapeStyle(HitShape.Value); judgementsFlow.Shape = getShapeStyle(HitShape.Value);
judgementsFlow.Clear(); judgementsFlow.Clear();
}, true); }, true);
} }
@ -91,7 +90,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
private class JudgementFlow : FillFlowContainer<HitErrorShape> private class JudgementFlow : FillFlowContainer<HitErrorShape>
{ {
public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse(); public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.Reverse();
internal string ValueParser = null!; internal string Shape = null!;
public JudgementFlow() public JudgementFlow()
{ {
@ -103,7 +102,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
public void Push(Color4 colour, int maxErrorShapeCount) public void Push(Color4 colour, int maxErrorShapeCount)
{ {
Add(new HitErrorShape(colour, drawable_judgement_size, ValueParser)); Add(new HitErrorShape(colour, drawable_judgement_size, Shape));
if (Children.Count > maxErrorShapeCount) if (Children.Count > maxErrorShapeCount)
Children.FirstOrDefault(c => !c.IsRemoved)?.Remove(); Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
@ -124,7 +123,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
Child = new Circle Child = new Circle
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = default_shape_alpha, Alpha = 0,
Colour = colour Colour = colour
}; };
break; break;
@ -133,7 +132,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
Child = new Box Child = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Alpha = default_shape_alpha, Alpha = 0,
Colour = colour Colour = colour
}; };
break; break;