h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:06:06 +08:00
Code Issues Releases Wiki Activity

Merge pull request #22273 from peppy/frame-stable-cache

Browse Source 
Cache `IFrameStableClock` in `Player` for easier access
This commit is contained in:
Dean Herbert 2023-01-18 22:31:35 +09:00 committed by GitHub
commit 0f3a586738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
View File

@ -15,14 +15,12 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
[Resolved] [Resolved]
private IGameplayClock gameplayClock { get; set; } = null!; private IGameplayClock gameplayClock { get; set; } = null!;
[Resolved(canBeNull: true)] [Resolved]
private DrawableRuleset? drawableRuleset { get; set; } private IFrameStableClock? frameStableClock { get; set; }
public int Value { get; private set; } public int Value { get; private set; }
// Even though `FrameStabilityContainer` caches as a `GameplayClock`, we need to check it directly via `drawableRuleset` private IGameplayClock clock => frameStableClock ?? gameplayClock;
// as this calculator is not contained within the `FrameStabilityContainer` and won't see the dependency.
private IGameplayClock clock => drawableRuleset?.FrameStableClock ?? gameplayClock;
public ClicksPerSecondCalculator() public ClicksPerSecondCalculator()
{ {

18
osu.Game/Screens/Play/HUD/SongProgress.cs
View File

@ -25,10 +25,15 @@ namespace osu.Game.Screens.Play.HUD
[Resolved] [Resolved]
protected IGameplayClock GameplayClock { get; private set; } = null!; protected IGameplayClock GameplayClock { get; private set; } = null!;
[Resolved(canBeNull: true)] [Resolved]
private DrawableRuleset? drawableRuleset { get; set; } private IFrameStableClock? frameStableClock { get; set; }
/// <summary>
/// The reference clock is used to accurately tell the current playfield's time (including catch-up lag).
/// However, if none is available (i.e. used in tests), we fall back to the gameplay clock.
/// </summary>
protected IClock FrameStableClock => frameStableClock ?? GameplayClock;
private IClock? referenceClock;
private IEnumerable<HitObject>? objects; private IEnumerable<HitObject>? objects;
public IEnumerable<HitObject> Objects public IEnumerable<HitObject> Objects
@ -58,12 +63,11 @@ namespace osu.Game.Screens.Play.HUD
protected virtual void UpdateObjects(IEnumerable<HitObject> objects) { } protected virtual void UpdateObjects(IEnumerable<HitObject> objects) { }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load(DrawableRuleset? drawableRuleset)
{ {
if (drawableRuleset != null) if (drawableRuleset != null)
{ {
Objects = drawableRuleset.Objects; Objects = drawableRuleset.Objects;
referenceClock = drawableRuleset.FrameStableClock;
} }
} }
@ -74,9 +78,7 @@ namespace osu.Game.Screens.Play.HUD
if (objects == null) if (objects == null)
return; return;
// The reference clock is used to accurately tell the playfield's time. This is obtained from the drawable ruleset. double currentTime = FrameStableClock.CurrentTime;
// However, if no drawable ruleset is available (i.e. used in tests), we fall back to the gameplay clock.
double currentTime = referenceClock?.CurrentTime ?? GameplayClock.CurrentTime;
bool isInIntro = currentTime < FirstHitTime; bool isInIntro = currentTime < FirstHitTime;

2
osu.Game/Screens/Play/Player.cs
View File

@ -309,6 +309,8 @@ namespace osu.Game.Screens.Play
}); });
} }
dependencies.CacheAs(DrawableRuleset.FrameStableClock);
// add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components. // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
// also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.) // also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.)
// we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there. // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.