h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:03:08 +08:00
Code Issues Releases Wiki Activity

Make KPS counter strictly depending only on KPS calculator

Browse Source 
`KeysPerSecondCounter` now depends on `KeysPerSecondCalculator` via the
`BackgroundDependencyLoaderAttribute` method, making it appear only in a
gameplay context without requiring `GameplayClock` without using it.
This commit is contained in:
Ryuki 2022-08-11 00:46:31 +02:00
parent 46e372cb99
commit 0a94fb4039
No known key found for this signature in database
GPG Key ID: A353889EAEACBF49
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Play/HUD/KPSCounter/KeysPerSecondCounter.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.UI;
// using osu.Game.Rulesets.UI;
using osu.Game.Skinning;
using osuTK;
@ -22,15 +22,7 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
private readonly Bindable<bool> valid = new Bindable<bool>();
[Resolved]
private KeysPerSecondCalculator? calculator { get; set; }
// This is to force the skin editor to show the component only in a Gameplay context
[Resolved]
private GameplayClock? gameplayClock { get; set; }
[Resolved(canBeNull: true)]
private DrawableRuleset? drawableRuleset { get; set; }
private KeysPerSecondCalculator? calculator;
protected override double RollingDuration => 350;
@ -42,8 +34,9 @@ namespace osu.Game.Screens.Play.HUD.KPSCounter
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load(OsuColour colours, KeysPerSecondCalculator calculator)
{
this.calculator = calculator;
Colour = colours.BlueLighter;
valid.BindValueChanged(e =>
DrawableCount.FadeTo(e.NewValue ? 1 : alpha_when_invalid, 1000, Easing.OutQuint));