RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-17 10:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put caught fruit in their own container to reduce casting

Browse Source
This commit is contained in:
Dean Herbert 2017-09-18 12:33:01 +09:00
parent cfcb0c1c6e
commit e52a4fe72c
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Bindings;
using osu.Framework.MathUtils;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Catch.Objects.Drawable;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
@ -39,7 +38,6 @@ namespace osu.Game.Rulesets.Catch.UI
{
RelativePositionAxes = Axes.Both,
ExplodingFruitTarget = explodingFruitContainer,
Anchor = Anchor.TopLeft,
Origin = Anchor.TopCentre,
X = 0.5f,
}
@ -57,12 +55,22 @@ namespace osu.Game.Rulesets.Catch.UI
{
private Texture texture;
private Container<DrawableHitObject> caughtFruit;
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
texture = textures.Get(@"Play/Catch/fruit-catcher-idle");
Child = createCatcherSprite();
Children = new Drawable[]
{
createCatcherSprite(),
caughtFruit = new Container<DrawableHitObject>
{
Anchor = Anchor.TopCentre,
Origin = Anchor.BottomCentre,
}
};
}
private int currentDirection;
@ -176,13 +184,13 @@ namespace osu.Game.Rulesets.Catch.UI
float distance = fruit.DrawSize.X / 2 * fruit.Scale.X;
while (Children.OfType<DrawableFruit>().Any(f => f.LifetimeEnd == double.PositiveInfinity && Vector2Extensions.DistanceSquared(f.Position, fruit.Position) < distance * distance))
while (caughtFruit.Any(f => f.LifetimeEnd == double.PositiveInfinity && Vector2Extensions.DistanceSquared(f.Position, fruit.Position) < distance * distance))
{
fruit.X += RNG.Next(-5, 5);
fruit.Y -= RNG.Next(0, 5);
}
Add(fruit);
caughtFruit.Add(fruit);
if (((CatchBaseHit)fruit.HitObject).LastInCombo)
explode();
@ -190,29 +198,31 @@ namespace osu.Game.Rulesets.Catch.UI
private void explode()
{
foreach (var existingFruit in Children.OfType<DrawableFruit>().ToArray())
var fruit = caughtFruit.ToArray();
caughtFruit.Clear(false);
foreach (var f in fruit)
{
var originalX = existingFruit.X * Scale.X;
var originalX = f.X * Scale.X;
if (ExplodingFruitTarget != null)
{
existingFruit.Anchor = Anchor.TopLeft;
existingFruit.Position = ToSpaceOfOtherDrawable(existingFruit.DrawPosition, ExplodingFruitTarget);
f.Anchor = Anchor.TopLeft;
f.Position = ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);
Remove(existingFruit);
caughtFruit.Remove(f);
ExplodingFruitTarget.Add(existingFruit);
ExplodingFruitTarget.Add(f);
}
existingFruit
.MoveToY(existingFruit.Y - 50, 250, Easing.OutSine)
.Then()
.MoveToY(existingFruit.Y + 50, 500, Easing.InSine);
f.MoveToY(f.Y - 50, 250, Easing.OutSine)
.Then()
.MoveToY(f.Y + 50, 500, Easing.InSine);
existingFruit.MoveToX(existingFruit.X + originalX * 6, 1000);
existingFruit.FadeOut(750);
f.MoveToX(f.X + originalX * 6, 1000);
f.FadeOut(750);
existingFruit.Expire();
f.Expire();
}
}
}