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

Make IGameplayClock optional in GameplaySampleTriggerSource to ease testing

Browse Source
This commit is contained in:
Dean Herbert 2023-06-21 17:33:42 +09:00
parent a7172e7469
commit 4ff5275208
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Rulesets/UI/GameplaySampleTriggerSource.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.UI
private HitObjectLifetimeEntry? mostValidObject; private HitObjectLifetimeEntry? mostValidObject;
[Resolved] [Resolved]
private IGameplayClock gameplayClock { get; set; } = null!; private IGameplayClock? gameplayClock { get; set; }
public GameplaySampleTriggerSource(HitObjectContainer hitObjectContainer) public GameplaySampleTriggerSource(HitObjectContainer hitObjectContainer)
{ {
@ -87,7 +87,7 @@ namespace osu.Game.Rulesets.UI
} }
else else
{ {
if (isCloseEnoughToCurrentTime(candidate)) if (isCloseEnoughToCurrentTime(candidate.HitObject))
{ {
mostValidObject = candidate; mostValidObject = candidate;
} }
@ -107,11 +107,13 @@ namespace osu.Game.Rulesets.UI
// Else we want the earliest valid nested. // Else we want the earliest valid nested.
// In cases of nested objects, they will always have earlier sample data than their parent object. // In cases of nested objects, they will always have earlier sample data than their parent object.
return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > gameplayClock.CurrentTime) ?? mostValidObject.HitObject; return getAllNested(mostValidObject.HitObject).OrderBy(h => h.StartTime).FirstOrDefault(h => h.StartTime > getReferenceTime()) ?? mostValidObject.HitObject;
} }
private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true; private bool isAlreadyHit(HitObjectLifetimeEntry h) => h.Result?.HasResult == true;
private bool isCloseEnoughToCurrentTime(HitObjectLifetimeEntry h) => gameplayClock.CurrentTime >= h.HitObject.StartTime - h.HitObject.HitWindows.WindowFor(HitResult.Miss) * 2; private bool isCloseEnoughToCurrentTime(HitObject h) => getReferenceTime() >= h.StartTime - h.HitWindows.WindowFor(HitResult.Miss) * 2;
private double getReferenceTime() => (gameplayClock?.CurrentTime ?? Clock.CurrentTime);
private IEnumerable<HitObject> getAllNested(HitObject hitObject) private IEnumerable<HitObject> getAllNested(HitObject hitObject)
{ {