mirror of
https://github.com/osukey/osukey.git
synced 2025-05-07 22:57:31 +09:00
It resolves mutual dependency of `Catcher` and `CatcherTrailDisplay`. Trail generation logic is moved to `Catcher`. The generation logic no longer uses delayed scheduling because the hidden state is hard to manage. Instead, the last time a trail is generated is calculated and used. The new logic has a different behavior when the dash key is pressed in succession under 50ms, but it is not noticeable for normal plays.
114 lines
3.8 KiB
C#
114 lines
3.8 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System.Linq;
|
|
using JetBrains.Annotations;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Graphics.Pooling;
|
|
using osuTK;
|
|
using osuTK.Graphics;
|
|
|
|
namespace osu.Game.Rulesets.Catch.UI
|
|
{
|
|
/// <summary>
|
|
/// Represents a component responsible for displaying
|
|
/// the appropriate catcher trails when requested to.
|
|
/// </summary>
|
|
public class CatcherTrailDisplay : CompositeDrawable
|
|
{
|
|
[CanBeNull]
|
|
public CatcherTrail LastDashTrail => dashTrails.Concat(hyperDashTrails)
|
|
.OrderByDescending(trail => trail.LifetimeStart)
|
|
.FirstOrDefault();
|
|
|
|
private readonly DrawablePool<CatcherTrail> trailPool;
|
|
|
|
private readonly Container<CatcherTrail> dashTrails;
|
|
private readonly Container<CatcherTrail> hyperDashTrails;
|
|
private readonly Container<CatcherTrail> endGlowSprites;
|
|
|
|
private Color4 hyperDashTrailsColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
|
|
|
|
public Color4 HyperDashTrailsColour
|
|
{
|
|
get => hyperDashTrailsColour;
|
|
set
|
|
{
|
|
if (hyperDashTrailsColour == value)
|
|
return;
|
|
|
|
hyperDashTrailsColour = value;
|
|
hyperDashTrails.Colour = hyperDashTrailsColour;
|
|
}
|
|
}
|
|
|
|
private Color4 endGlowSpritesColour = Catcher.DEFAULT_HYPER_DASH_COLOUR;
|
|
|
|
public Color4 EndGlowSpritesColour
|
|
{
|
|
get => endGlowSpritesColour;
|
|
set
|
|
{
|
|
if (endGlowSpritesColour == value)
|
|
return;
|
|
|
|
endGlowSpritesColour = value;
|
|
endGlowSprites.Colour = endGlowSpritesColour;
|
|
}
|
|
}
|
|
|
|
public CatcherTrailDisplay()
|
|
{
|
|
RelativeSizeAxes = Axes.Both;
|
|
|
|
InternalChildren = new Drawable[]
|
|
{
|
|
trailPool = new DrawablePool<CatcherTrail>(30),
|
|
dashTrails = new Container<CatcherTrail> { RelativeSizeAxes = Axes.Both },
|
|
hyperDashTrails = new Container<CatcherTrail> { RelativeSizeAxes = Axes.Both, Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR },
|
|
endGlowSprites = new Container<CatcherTrail> { RelativeSizeAxes = Axes.Both, Colour = Catcher.DEFAULT_HYPER_DASH_COLOUR },
|
|
};
|
|
}
|
|
|
|
/// <summary>
|
|
/// Displays a single end-glow catcher sprite.
|
|
/// </summary>
|
|
public void DisplayEndGlow(CatcherAnimationState animationState, float x, Vector2 scale)
|
|
{
|
|
var endGlow = createTrail(animationState, x, scale);
|
|
|
|
endGlowSprites.Add(endGlow);
|
|
|
|
endGlow.MoveToOffset(new Vector2(0, -10), 1200, Easing.In);
|
|
endGlow.ScaleTo(endGlow.Scale * 0.95f).ScaleTo(endGlow.Scale * 1.2f, 1200, Easing.In);
|
|
endGlow.FadeOut(1200);
|
|
endGlow.Expire(true);
|
|
}
|
|
|
|
public void DisplayDashTrail(CatcherAnimationState animationState, float x, Vector2 scale, bool hyperDashing)
|
|
{
|
|
var sprite = createTrail(animationState, x, scale);
|
|
|
|
if (hyperDashing)
|
|
hyperDashTrails.Add(sprite);
|
|
else
|
|
dashTrails.Add(sprite);
|
|
|
|
sprite.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
|
|
sprite.Expire(true);
|
|
}
|
|
|
|
private CatcherTrail createTrail(CatcherAnimationState animationState, float x, Vector2 scale)
|
|
{
|
|
CatcherTrail sprite = trailPool.Get();
|
|
|
|
sprite.AnimationState = animationState;
|
|
sprite.Scale = scale;
|
|
sprite.Position = new Vector2(x, 0);
|
|
|
|
return sprite;
|
|
}
|
|
}
|
|
}
|