mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 23:05:37 +08:00
Resolving bdach's requested to change the enum member names and reduce the amount of selectable easing types
This commit is contained in:
parent
bc705616ab
commit
405030da47
@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
|
||||
public override IconUsage? Icon { get; } = FontAwesome.Regular.Circle;
|
||||
|
||||
[SettingSource("Easing", "Change the easing type of the approach circles.", 0)]
|
||||
public Bindable<Easing> BindableEasing { get; } = new Bindable<Easing>();
|
||||
public Bindable<ReadableEasing> BindableEasing { get; } = new Bindable<ReadableEasing>();
|
||||
|
||||
[SettingSource("Scale the size", "Change the factor of the approach circle scale.", 1)]
|
||||
public BindableFloat Scale { get; } = new BindableFloat
|
||||
@ -49,11 +49,25 @@ namespace osu.Game.Rulesets.Osu.Mods
|
||||
hitCircle.ApproachCircle.ScaleTo(Scale.Value);
|
||||
|
||||
hitCircle.ApproachCircle.FadeIn(Math.Min(obj.TimeFadeIn, obj.TimePreempt));
|
||||
hitCircle.ApproachCircle.ScaleTo(1f, obj.TimePreempt, BindableEasing.Value);
|
||||
|
||||
hitCircle.ApproachCircle.ScaleTo(1f, obj.TimePreempt, (Easing)BindableEasing.Value);
|
||||
|
||||
hitCircle.ApproachCircle.Expire(true);
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
internal enum ReadableEasing
|
||||
{
|
||||
Accelerate = 2,
|
||||
Accelerate2 = 6,
|
||||
Accelerate3 = 12,
|
||||
AccelerateInAfterDeceleraingeOut = 29,
|
||||
CasualBounces = 32,
|
||||
CasualBouncesWhileAccelerating = 24,
|
||||
Decelerate = 1,
|
||||
DecelerateAfterAccelerating = 8,
|
||||
Default = 0,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user