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

Use ApplyCustomUpdateState for dropping transformation

Browse Source 
We cannot just apply the transforms because DHO clears transforms when state is updated
This commit is contained in:
ekrctb 2020-12-03 18:45:10 +09:00
parent be456f9c6b
commit 7e66714c2f
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -517,40 +517,40 @@ namespace osu.Game.Rulesets.Catch.UI
drop(caughtObject, animation); drop(caughtObject, animation);
} }
private void drop(Drawable d, DroppedObjectAnimation animation) private void drop(DrawablePalpableCatchHitObject d, DroppedObjectAnimation animation)
{ {
var originalX = d.X * Scale.X; var originalX = d.X * Scale.X;
var startTime = Clock.CurrentTime;
d.Anchor = Anchor.TopLeft; d.Anchor = Anchor.TopLeft;
d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget); d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget);
animate(d, animation, originalX); // we cannot just apply the transforms because DHO clears transforms when state is updated
d.ApplyCustomUpdateState += (o, state) => animate(o, animation, originalX, startTime);
if (d.IsLoaded)
animate(d, animation, originalX, startTime);
} }
private void animate(Drawable d, DroppedObjectAnimation animation, float originalX) private void animate(Drawable d, DroppedObjectAnimation animation, float originalX, double startTime)
{ {
// temporary hack to make sure transforms are not cleared by DHO state update using (d.BeginAbsoluteSequence(startTime))
if (!d.IsLoaded)
{ {
d.OnLoadComplete += _ => animate(d, animation, originalX); switch (animation)
return; {
case DroppedObjectAnimation.Drop:
d.MoveToY(d.Y + 75, 750, Easing.InSine);
d.FadeOut(750);
break;
case DroppedObjectAnimation.Explode:
d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
d.MoveToX(d.X + originalX * 6, 1000);
d.FadeOut(750);
break;
}
d.Expire();
} }
switch (animation)
{
case DroppedObjectAnimation.Drop:
d.MoveToY(d.Y + 75, 750, Easing.InSine);
d.FadeOut(750);
break;
case DroppedObjectAnimation.Explode:
d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
d.MoveToX(d.X + originalX * 6, 1000);
d.FadeOut(750);
break;
}
d.Expire();
} }
private enum DroppedObjectAnimation private enum DroppedObjectAnimation