RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Load all catcher states ahead-of-time to avoid blocking loads

This commit is contained in:
Dean Herbert 2020-03-11 13:45:55 +09:00
parent 7069cef9ce
commit 1bad2ff879
1 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -6,6 +6,7 @@
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Input.Bindings;
@ -148,28 +149,62 @@ public Catcher(BeatmapDifficulty difficulty = null)
[BackgroundDependencyLoader]
private void load()
{
Children = new[]
Children = new Drawable[]
{
caughtFruit = new Container<DrawableHitObject>
{
Anchor = Anchor.TopCentre,
Origin = Anchor.BottomCentre,
},
catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
{
Anchor = Anchor.TopCentre,
Alpha = 0,
},
catcherKiai = new CatcherSprite(CatcherAnimationState.Kiai)
{
Anchor = Anchor.TopCentre,
Alpha = 0,
},
catcherFail = new CatcherSprite(CatcherAnimationState.Fail)
{
Anchor = Anchor.TopCentre,
Alpha = 0,
}
};
updateCatcher();
}
private Drawable catcherSprite;
private CatcherSprite catcherIdle;
private CatcherSprite catcherKiai;
private CatcherSprite catcherFail;
private void updateCatcher()
{
catcherSprite?.Expire();
catcherIdle.Hide();
catcherKiai.Hide();
catcherFail.Hide();
Add(catcherSprite = createCatcherSprite().With(c =>
CatcherSprite current;
switch (currentState)
{
c.Anchor = Anchor.TopCentre;
}));
default:
current = catcherIdle;
break;
case CatcherAnimationState.Fail:
current = catcherFail;
break;
case CatcherAnimationState.Kiai:
current = catcherKiai;
break;
}
current.Show();
(current.Drawable as IAnimation)?.GotoFrame(0);
}
private int currentDirection;