h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:02:55 +08:00
Code Issues Releases Wiki Activity

Resolving bdach's requested to change the enum member names and reduce the amount of selectable easing types

Browse Source
This commit is contained in:
BlauFx 2020-03-16 20:34:53 +01:00
parent bc705616ab
commit 405030da47
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game.Rulesets.Osu/Mods/OsuModApproachCircle.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public override IconUsage? Icon { get; } = FontAwesome.Regular.Circle; public override IconUsage? Icon { get; } = FontAwesome.Regular.Circle;
[SettingSource("Easing", "Change the easing type of the approach circles.", 0)] [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)] [SettingSource("Scale the size", "Change the factor of the approach circle scale.", 1)]
public BindableFloat Scale { get; } = new BindableFloat public BindableFloat Scale { get; } = new BindableFloat
@ -49,11 +49,25 @@ namespace osu.Game.Rulesets.Osu.Mods
hitCircle.ApproachCircle.ScaleTo(Scale.Value); hitCircle.ApproachCircle.ScaleTo(Scale.Value);
hitCircle.ApproachCircle.FadeIn(Math.Min(obj.TimeFadeIn, obj.TimePreempt)); 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); 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,
}
} }
} }