mirror of
https://github.com/ppy/osu.git
synced 2024-11-06 09:07:25 +08:00
Use smooth speed change
This commit is contained in:
parent
c6934b4bce
commit
6caecf79a0
@ -7,6 +7,7 @@ using System.Linq;
|
|||||||
using osu.Framework.Audio;
|
using osu.Framework.Audio;
|
||||||
using osu.Framework.Audio.Track;
|
using osu.Framework.Audio.Track;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Audio;
|
using osu.Framework.Graphics.Audio;
|
||||||
using osu.Framework.Utils;
|
using osu.Framework.Utils;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
@ -14,10 +15,11 @@ using osu.Game.Configuration;
|
|||||||
using osu.Game.Rulesets.Objects;
|
using osu.Game.Rulesets.Objects;
|
||||||
using osu.Game.Rulesets.Objects.Drawables;
|
using osu.Game.Rulesets.Objects.Drawables;
|
||||||
using osu.Game.Rulesets.Scoring;
|
using osu.Game.Rulesets.Scoring;
|
||||||
|
using osu.Game.Screens.Play;
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Mods
|
namespace osu.Game.Rulesets.Mods
|
||||||
{
|
{
|
||||||
public class ModAdaptiveSpeed : Mod, IApplicableToRate, IApplicableToDrawableHitObject, IApplicableToBeatmap
|
public class ModAdaptiveSpeed : Mod, IApplicableToRate, IApplicableToDrawableHitObject, IApplicableToBeatmap, IApplicableToHUD
|
||||||
{
|
{
|
||||||
// use a wider range so there's still room for adjustment when the initial rate is extreme
|
// use a wider range so there's still room for adjustment when the initial rate is extreme
|
||||||
private const double fastest_rate = 2.5f;
|
private const double fastest_rate = 2.5f;
|
||||||
@ -65,6 +67,7 @@ namespace osu.Game.Rulesets.Mods
|
|||||||
};
|
};
|
||||||
|
|
||||||
private ITrack track;
|
private ITrack track;
|
||||||
|
private HUDOverlay overlay;
|
||||||
|
|
||||||
private readonly List<double> recentRates = Enumerable.Range(0, average_count).Select(_ => 1d).ToList();
|
private readonly List<double> recentRates = Enumerable.Range(0, average_count).Select(_ => 1d).ToList();
|
||||||
|
|
||||||
@ -82,6 +85,12 @@ namespace osu.Game.Rulesets.Mods
|
|||||||
AdjustPitch.BindValueChanged(applyPitchAdjustment);
|
AdjustPitch.BindValueChanged(applyPitchAdjustment);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ApplyToHUD(HUDOverlay overlay)
|
||||||
|
{
|
||||||
|
// this is only used to transform the SpeedChange bindable
|
||||||
|
this.overlay = overlay;
|
||||||
|
}
|
||||||
|
|
||||||
public void ApplyToTrack(ITrack track)
|
public void ApplyToTrack(ITrack track)
|
||||||
{
|
{
|
||||||
this.track = track;
|
this.track = track;
|
||||||
@ -127,7 +136,7 @@ namespace osu.Game.Rulesets.Mods
|
|||||||
recentRates.RemoveAt(0);
|
recentRates.RemoveAt(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
SpeedChange.Value = recentRates.Average();
|
overlay.TransformBindableTo(SpeedChange, recentRates.Average(), 100);
|
||||||
};
|
};
|
||||||
drawable.OnRevertResult += (o, result) =>
|
drawable.OnRevertResult += (o, result) =>
|
||||||
{
|
{
|
||||||
@ -146,7 +155,7 @@ namespace osu.Game.Rulesets.Mods
|
|||||||
recentRates.RemoveAt(recentRates.Count - 1);
|
recentRates.RemoveAt(recentRates.Count - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
SpeedChange.Value = recentRates.Average();
|
overlay.TransformBindableTo(SpeedChange, recentRates.Average(), 100);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user