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

Update FadeIn animation for new judgement

Browse Source
This commit is contained in:
Andrei Zavatski 2019-12-22 03:17:56 +03:00
parent 46501cf0ac
commit eb75c6c70f
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
public class ColourHitErrorMeter : HitErrorMeter public class ColourHitErrorMeter : HitErrorMeter
{ {
private const int max_available_judgements = 20; private const int max_available_judgements = 20;
private const int animation_duration = 200;
private readonly JudgementFlow judgementsFlow; private readonly JudgementFlow judgementsFlow;
private readonly BindableList<(Color4 colour, JudgementResult result)> judgements = new BindableList<(Color4 colour, JudgementResult result)>(); private readonly BindableList<(Color4 colour, JudgementResult result)> judgements = new BindableList<(Color4 colour, JudgementResult result)>();
@ -46,7 +47,6 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
{ {
private const int drawable_judgement_size = 8; private const int drawable_judgement_size = 8;
private const int spacing = 2; private const int spacing = 2;
private const int animation_duration = 200;
public readonly BindableList<(Color4 colour, JudgementResult result)> Judgements = new BindableList<(Color4 colour, JudgementResult result)>(); public readonly BindableList<(Color4 colour, JudgementResult result)> Judgements = new BindableList<(Color4 colour, JudgementResult result)>();
@ -72,13 +72,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
private void push(IEnumerable<(Color4 colour, JudgementResult result)> judgements) private void push(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
{ {
var (colour, result) = judgements.Single(); var (colour, result) = judgements.Single();
var drawableJudgement = new DrawableResult(colour, result, drawable_judgement_size) Insert(runningDepth--, new DrawableResult(colour, result, drawable_judgement_size));
{
Alpha = 0,
};
Insert(runningDepth--, drawableJudgement);
drawableJudgement.FadeInFromZero(animation_duration, Easing.OutQuint);
} }
private void pop(IEnumerable<(Color4 colour, JudgementResult result)> judgements) private void pop(IEnumerable<(Color4 colour, JudgementResult result)> judgements)
@ -88,22 +82,37 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
} }
} }
private class DrawableResult : CircularContainer private class DrawableResult : Container
{ {
public JudgementResult Result { get; private set; } public JudgementResult Result { get; private set; }
private readonly CircularContainer content;
public DrawableResult(Color4 colour, JudgementResult result, int size) public DrawableResult(Color4 colour, JudgementResult result, int size)
{ {
Result = result; Result = result;
Masking = true;
Size = new Vector2(size); Size = new Vector2(size);
Child = content = new CircularContainer
{
RelativeSizeAxes = Axes.Both,
Masking = true,
Alpha = 0,
Child = new Box Child = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colour Colour = colour
},
}; };
} }
protected override void LoadComplete()
{
base.LoadComplete();
content.FadeInFromZero(animation_duration, Easing.OutQuint);
content.MoveToY(-DrawSize.Y);
content.MoveToY(0, animation_duration, Easing.OutQuint);
}
} }
} }
} }