h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 18:47:27 +08:00
Code Issues Releases Wiki Activity

Merge pull request #26593 from peppy/rolling-counter-unstick

Browse Source 
Change rolling counters to use quicker easing types
This commit is contained in:
Bartłomiej Dach 2024-01-17 14:37:52 +01:00 committed by GitHub
commit b718897b30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/PercentageCounter.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary> /// </summary>
public partial class PercentageCounter : RollingCounter<double> public partial class PercentageCounter : RollingCounter<double>
{ {
protected override double RollingDuration => 750; protected override double RollingDuration => 375;
private float epsilon => 1e-10f; private float epsilon => 1e-10f;

2
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
/// <summary> /// <summary>
/// Easing for the counter rollover animation. /// Easing for the counter rollover animation.
/// </summary> /// </summary>
protected virtual Easing RollingEasing => Easing.OutQuint; protected virtual Easing RollingEasing => Easing.OutQuad;
private T displayedCount; private T displayedCount;

2
osu.Game/Overlays/Mods/BeatmapAttributesDisplay.cs
View File

@ -196,7 +196,7 @@ namespace osu.Game.Overlays.Mods
private partial class BPMDisplay : RollingCounter<double> private partial class BPMDisplay : RollingCounter<double>
{ {
protected override double RollingDuration => 500; protected override double RollingDuration => 250;
protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0 BPM"); protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0 BPM");

2
osu.Game/Overlays/Mods/ScoreMultiplierDisplay.cs
View File

@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Mods
private partial class EffectCounter : RollingCounter<double> private partial class EffectCounter : RollingCounter<double>
{ {
protected override double RollingDuration => 500; protected override double RollingDuration => 250;
protected override LocalisableString FormatCount(double count) => ModUtils.FormatScoreMultiplier(count); protected override LocalisableString FormatCount(double count) => ModUtils.FormatScoreMultiplier(count);

2
osu.Game/Overlays/Mods/VerticalAttributeDisplay.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
private partial class EffectCounter : RollingCounter<double> private partial class EffectCounter : RollingCounter<double>
{ {
protected override double RollingDuration => 500; protected override double RollingDuration => 250;
protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0#"); protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0#");

3
osu.Game/Screens/Play/HUD/ArgonAccuracyCounter.cs
View File

@ -17,8 +17,7 @@ namespace osu.Game.Screens.Play.HUD
{ {
public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisableDrawable public partial class ArgonAccuracyCounter : GameplayAccuracyCounter, ISerialisableDrawable
{ {
protected override double RollingDuration => 500; protected override double RollingDuration => 250;
protected override Easing RollingEasing => Easing.OutQuint;
[SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")] [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f) public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f)

3
osu.Game/Screens/Play/HUD/ArgonComboCounter.cs
View File

@ -21,8 +21,7 @@ namespace osu.Game.Screens.Play.HUD
{ {
private ArgonCounterTextComponent text = null!; private ArgonCounterTextComponent text = null!;
protected override double RollingDuration => 500; protected override double RollingDuration => 250;
protected override Easing RollingEasing => Easing.OutQuint;
[SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")] [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f) public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f)

3
osu.Game/Screens/Play/HUD/ArgonScoreCounter.cs
View File

@ -18,8 +18,7 @@ namespace osu.Game.Screens.Play.HUD
{ {
private ArgonScoreTextComponent scoreText = null!; private ArgonScoreTextComponent scoreText = null!;
protected override double RollingDuration => 500; protected override double RollingDuration => 250;
protected override Easing RollingEasing => Easing.OutQuint;
[SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")] [SettingSource("Wireframe opacity", "Controls the opacity of the wire frames behind the digits.")]
public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f) public BindableFloat WireframeOpacity { get; } = new BindableFloat(0.25f)

2
osu.Game/Screens/Play/HUD/BPMCounter.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD
{ {
public partial class BPMCounter : RollingCounter<double>, ISerialisableDrawable public partial class BPMCounter : RollingCounter<double>, ISerialisableDrawable
{ {
protected override double RollingDuration => 750; protected override double RollingDuration => 375;
[Resolved] [Resolved]
private IBindable<WorkingBeatmap> beatmap { get; set; } = null!; private IBindable<WorkingBeatmap> beatmap { get; set; } = null!;

2
osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCounter.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
[Resolved] [Resolved]
private ClicksPerSecondController controller { get; set; } = null!; private ClicksPerSecondController controller { get; set; } = null!;
protected override double RollingDuration => 350; protected override double RollingDuration => 175;
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }

2
osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play.HUD
protected override bool IsRollingProportional => true; protected override bool IsRollingProportional => true;
protected override double RollingDuration => 1000; protected override double RollingDuration => 500;
private const float alpha_when_invalid = 0.3f; private const float alpha_when_invalid = 0.3f;

2
osu.Game/Screens/Play/HUD/UnstableRateCounter.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play.HUD
{ {
public bool UsesFixedAnchor { get; set; } public bool UsesFixedAnchor { get; set; }
protected override double RollingDuration => 750; protected override double RollingDuration => 375;
private const float alpha_when_invalid = 0.3f; private const float alpha_when_invalid = 0.3f;
private readonly Bindable<bool> valid = new Bindable<bool>(); private readonly Bindable<bool> valid = new Bindable<bool>();

7
osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
View File

@ -44,9 +44,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
private partial class Counter : RollingCounter<double> private partial class Counter : RollingCounter<double>
{ {
protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION; // FormatAccuracy doesn't round, which means if we use the OutPow10 easing the number will stick 0.01% short for some time.
// To avoid that let's use a shorter easing which looks roughly the same.
protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING; protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION / 2;
protected override Easing RollingEasing => Easing.OutQuad;
protected override LocalisableString FormatCount(double count) => count.FormatAccuracy(); protected override LocalisableString FormatCount(double count) => count.FormatAccuracy();