RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-20 04:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use local helper for selecting adjusted property

Browse Source
This commit is contained in:
Ronnie Moir 2020-06-13 16:32:43 +01:00
parent 77eb428184
commit dc5bb12fa8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Rulesets/Mods/ModTimeRamp.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
[SettingSource("Final rate", "The final speed to ramp to")] [SettingSource("Final rate", "The final speed to ramp to")]
public abstract BindableNumber<double> FinalRate { get; } public abstract BindableNumber<double> FinalRate { get; }
[SettingSource("Adjust Pitch", "Should pitch be adjusted with speed")] [SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
public abstract BindableBool AdjustPitch { get; } public abstract BindableBool AdjustPitch { get; }
public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x"; public override string SettingDescription => $"{InitialRate.Value:N2}x to {FinalRate.Value:N2}x";
@ -55,9 +55,8 @@ namespace osu.Game.Rulesets.Mods
{ {
this.track = track; this.track = track;
track.AddAdjustment(AdjustPitch.Value ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange);
FinalRate.TriggerChange(); FinalRate.TriggerChange();
AdjustPitch.TriggerChange();
} }
public virtual void ApplyToBeatmap(IBeatmap beatmap) public virtual void ApplyToBeatmap(IBeatmap beatmap)
@ -85,9 +84,12 @@ namespace osu.Game.Rulesets.Mods
private void updatePitchAdjustment(ValueChangedEvent<bool> value) private void updatePitchAdjustment(ValueChangedEvent<bool> value)
{ {
// remove existing old adjustment // remove existing old adjustment
track.RemoveAdjustment(value.OldValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange); track.RemoveAdjustment(adjustmentForPitchSetting(value.OldValue), SpeedChange);
track.AddAdjustment(value.NewValue ? AdjustableProperty.Frequency : AdjustableProperty.Tempo, SpeedChange); track.AddAdjustment(adjustmentForPitchSetting(value.NewValue), SpeedChange);
} }
private AdjustableProperty adjustmentForPitchSetting(bool value)
=> value ? AdjustableProperty.Frequency : AdjustableProperty.Tempo;
} }
} }