sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move shared followcircle code into abstract base class

Browse Source
This commit is contained in:
Alden Wu
2022-07-14 16:52:45 -07:00
parent 0bc42ef67d
commit 66932f1af6
3 changed files with 92 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyFollowCircle.cs
View File

@ -2,20 +2,14 @@
// See the LICENCE file in the repository root for full licence text.
using System.Diagnostics;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects.Drawables;
namespace osu.Game.Rulesets.Osu.Skinning.Legacy
{
public class LegacyFollowCircle : CompositeDrawable
public class LegacyFollowCircle : FollowCircle
{
[Resolved(canBeNull: true)]
private DrawableHitObject? parentObject { get; set; }
public LegacyFollowCircle(Drawable animationContent)
{
// follow circles are 2x the hitcircle resolution in legacy skins (since they are scaled down from >1x
@ -27,41 +21,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
InternalChild = animationContent;
}
[BackgroundDependencyLoader]
private void load()
protected override void OnTrackingChanged(ValueChangedEvent<bool> tracking)
{
if (parentObject != null)
{
var slider = (DrawableSlider)parentObject;
slider.Tracking.BindValueChanged(trackingChanged, true);
}
}
Debug.Assert(ParentObject != null);
protected override void LoadComplete()
{
base.LoadComplete();
if (parentObject != null)
{
parentObject.HitObjectApplied += onHitObjectApplied;
onHitObjectApplied(parentObject);
parentObject.ApplyCustomUpdateState += updateStateTransforms;
updateStateTransforms(parentObject, parentObject.State.Value);
}
}
private void trackingChanged(ValueChangedEvent<bool> tracking)
{
Debug.Assert(parentObject != null);
if (parentObject.Judged)
if (ParentObject.Judged)
return;
const float scale_duration = 180f;
const float fade_duration = 90f;
double maxScaleDuration = parentObject.HitStateUpdateTime - Time.Current;
double maxScaleDuration = ParentObject.HitStateUpdateTime - Time.Current;
double realScaleDuration = scale_duration;
if (tracking.NewValue && maxScaleDuration < realScaleDuration && maxScaleDuration >= 0)
realScaleDuration = maxScaleDuration;
@ -71,39 +41,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
.FadeTo(tracking.NewValue ? 1f : 0f, realFadeDuration, Easing.OutQuad);
}
private void onHitObjectApplied(DrawableHitObject drawableObject)
protected override void OnSliderEnd()
{
this.ScaleTo(1f)
.FadeOut();
}
private void updateStateTransforms(DrawableHitObject drawableObject, ArmedState state)
{
// see comment in LegacySliderBall.updateStateTransforms
if (drawableObject is not DrawableSlider)
return;
const float shrink_duration = 200f;
const float fade_delay = 175f;
const float fade_duration = 35f;
using (BeginAbsoluteSequence(drawableObject.HitStateUpdateTime))
{
this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 0.75f, shrink_duration, Easing.OutQuad)
.Delay(fade_delay)
.FadeOut(fade_duration);
}
}
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (parentObject != null)
{
parentObject.HitObjectApplied -= onHitObjectApplied;
parentObject.ApplyCustomUpdateState -= updateStateTransforms;
}
this.ScaleTo(DrawableSliderBall.FOLLOW_AREA * 0.75f, shrink_duration, Easing.OutQuad)
.Delay(fade_delay)
.FadeOut(fade_duration);
}
}
}