mirror of
https://github.com/ppy/osu
synced 2024-12-15 19:36:34 +00:00
Add support for spinner "clear" text in legacy skins
This commit is contained in:
parent
5e387e92cd
commit
71253cb5e9
@ -3,6 +3,7 @@
|
||||
|
||||
using System;
|
||||
using osu.Framework.Allocation;
|
||||
using osu.Framework.Bindables;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Sprites;
|
||||
@ -20,6 +21,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
|
||||
protected DrawableSpinner DrawableSpinner { get; private set; }
|
||||
|
||||
private Sprite spin;
|
||||
private Sprite clear;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(DrawableHitObject drawableHitObject, ISkinSource source)
|
||||
@ -39,17 +41,50 @@ namespace osu.Game.Rulesets.Osu.Skinning
|
||||
Scale = new Vector2(SPRITE_SCALE),
|
||||
Y = 120 - 45 // offset temporarily to avoid overlapping default spin counter
|
||||
},
|
||||
clear = new Sprite
|
||||
{
|
||||
Anchor = Anchor.Centre,
|
||||
Origin = Anchor.Centre,
|
||||
Depth = float.MinValue,
|
||||
Alpha = 0,
|
||||
Texture = source.GetTexture("spinner-clear"),
|
||||
Scale = new Vector2(SPRITE_SCALE),
|
||||
Y = -60
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
private readonly Bindable<bool> completed = new Bindable<bool>();
|
||||
|
||||
protected override void LoadComplete()
|
||||
{
|
||||
base.LoadComplete();
|
||||
|
||||
completed.BindTo(DrawableSpinner.RotationTracker.Complete);
|
||||
completed.BindValueChanged(onCompletedChanged, true);
|
||||
|
||||
DrawableSpinner.ApplyCustomUpdateState += UpdateStateTransforms;
|
||||
UpdateStateTransforms(DrawableSpinner, DrawableSpinner.State.Value);
|
||||
}
|
||||
|
||||
private void onCompletedChanged(ValueChangedEvent<bool> completed)
|
||||
{
|
||||
if (completed.NewValue)
|
||||
{
|
||||
clear.FadeInFromZero(400, Easing.Out);
|
||||
clear.ScaleTo(SPRITE_SCALE * 2).Then().ScaleTo(SPRITE_SCALE, 400, Easing.OutElastic);
|
||||
|
||||
const double fade_out_duration = 50;
|
||||
using (BeginAbsoluteSequence(DrawableSpinner.HitStateUpdateTime - fade_out_duration, true))
|
||||
clear.FadeOut(fade_out_duration);
|
||||
}
|
||||
else
|
||||
{
|
||||
clear.ClearTransforms();
|
||||
clear.Alpha = 0;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void UpdateStateTransforms(DrawableHitObject drawableHitObject, ArmedState state)
|
||||
{
|
||||
switch (drawableHitObject)
|
||||
@ -59,7 +94,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
|
||||
|
||||
using (BeginAbsoluteSequence(drawableHitObject.HitStateUpdateTime - fadeOutLength, true))
|
||||
spin.FadeOutFromOne(fadeOutLength);
|
||||
|
||||
break;
|
||||
|
||||
case DrawableSpinnerTick d:
|
||||
|
Loading…
Reference in New Issue
Block a user