h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 19:27:31 +08:00
Code Issues Releases Wiki Activity

Use Enum for Settings

Browse Source
This commit is contained in:
Mk-56spn 2022-09-16 02:57:21 +02:00
parent eb84c513e3
commit 5a9b027ebc
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game.Rulesets.Osu/Mods/OsuModFreezeFrame.cs
View File

@ -29,12 +29,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public override Type[] IncompatibleMods => new[] { typeof(OsuModTarget), typeof(OsuModStrictTracking) }; public override Type[] IncompatibleMods => new[] { typeof(OsuModTarget), typeof(OsuModStrictTracking) };
[SettingSource("Beat divisor")] [SettingSource("Beat divisor")]
public BindableFloat BeatDivisor { get; } = new BindableFloat(1) public Bindable<BeatDivisor> Divisor { get; } = new Bindable<BeatDivisor>(BeatDivisor.Measure);
{
MinValue = .25f,
MaxValue = 5,
Precision = .25f
};
public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset) public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
{ {
@ -48,11 +43,11 @@ namespace osu.Game.Rulesets.Osu.Mods
foreach (var obj in beatmap.HitObjects.OfType<OsuHitObject>()) foreach (var obj in beatmap.HitObjects.OfType<OsuHitObject>())
{ {
var lastTimingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime + 1); var lastTimingPoint = beatmap.ControlPointInfo.TimingPointAt(obj.StartTime + 1);
// +1 is added due to First HitCircle in each measure not appearing appropriately without it
double controlPointDifference = obj.StartTime + 1 - lastTimingPoint.Time; double controlPointDifference = obj.StartTime + 1 - lastTimingPoint.Time;
double remainder = controlPointDifference % (lastTimingPoint.BeatLength * BeatDivisor.Value); double remainder = controlPointDifference % (lastTimingPoint.BeatLength * getMeasure(Divisor.Value));
double finalPreempt = obj.TimePreempt + remainder; double finalPreempt = obj.TimePreempt + remainder;
obj.TimePreempt = finalPreempt;
applyFadeInAdjustment(obj); applyFadeInAdjustment(obj);
void applyFadeInAdjustment(OsuHitObject osuObject) void applyFadeInAdjustment(OsuHitObject osuObject)
@ -64,14 +59,41 @@ namespace osu.Game.Rulesets.Osu.Mods
} }
} }
protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) protected override void ApplyIncreasedVisibilityState(DrawableHitObject hitObject, ArmedState state) { }
protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) { }
private float getMeasure(BeatDivisor divisor)
{ {
switch (divisor)
{
case BeatDivisor.Quarter_Measure:
return 0.25f;
case BeatDivisor.Half_Measure:
return 0.5f;
case BeatDivisor.Measure:
return 1;
case BeatDivisor.Double_Measure:
return 2;
case BeatDivisor.Quadruple_Measure:
return 4;
default:
throw new ArgumentOutOfRangeException(nameof(divisor), divisor, null);
}
} }
protected override void ApplyNormalVisibilityState(DrawableHitObject hitObject, ArmedState state) => applyFrozenState(hitObject, state); public enum BeatDivisor
private void applyFrozenState(DrawableHitObject drawableObject, ArmedState state)
{ {
Quarter_Measure,
Half_Measure,
Measure,
Double_Measure,
Quadruple_Measure
} }
} }
} }