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

Merge pull request #26600 from peppy/frame-stable-catchup-zoom

Browse Source 
Change frame stable catch-up method to allow for much faster sync
This commit is contained in:
Bartłomiej Dach 2024-01-22 11:29:15 +01:00 committed by GitHub
commit c8053a8077
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
View File

@ -129,10 +129,8 @@ namespace osu.Game.Tests.Visual.Gameplay
checkRate(1);
}
private const int max_frames_catchup = 50;
private void createStabilityContainer(double gameplayStartTime = double.MinValue) => AddStep("create container", () =>
mainContainer.Child = new FrameStabilityContainer(gameplayStartTime) { MaxCatchUpFrames = max_frames_catchup }
mainContainer.Child = new FrameStabilityContainer(gameplayStartTime)
.WithChild(consumer = new ClockConsumingChild()));
private void seekManualTo(double time) => AddStep($"seek manual clock to {time}", () => manualClock.CurrentTime = time);

12
osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Linq;
using System.Threading;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
@ -47,7 +48,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
Child = frameStabilityContainer = new FrameStabilityContainer
{
MaxCatchUpFrames = 1
Child = new FakeLoad()
}
}
});
@ -56,6 +57,15 @@ namespace osu.Game.Tests.Visual.Gameplay
Dependencies.CacheAs<IFrameStableClock>(frameStabilityContainer);
}
private partial class FakeLoad : Drawable
{
protected override void Update()
{
base.Update();
Thread.Sleep(1);
}
}
[SetUpSteps]
public void SetupSteps()
{

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

@ -25,9 +25,9 @@ namespace osu.Game.Rulesets.UI
public ReplayInputHandler? ReplayInputHandler { get; set; }
/// <summary>
/// The number of frames (per parent frame) which can be run in an attempt to catch-up to real-time.
/// The number of CPU milliseconds to spend at most during seek catch-up.
/// </summary>
public int MaxCatchUpFrames { get; set; } = 5;
private const double max_catchup_milliseconds = 10;
/// <summary>
/// Whether to enable frame-stable playback.
@ -59,6 +59,8 @@ namespace osu.Game.Rulesets.UI
/// </summary>
private readonly FramedClock framedClock;
private readonly Stopwatch stopwatch = new Stopwatch();
/// <summary>
/// The current direction of playback to be exposed to frame stable children.
/// </summary>
@ -97,7 +99,7 @@ namespace osu.Game.Rulesets.UI
public override bool UpdateSubTree()
{
int loops = MaxCatchUpFrames;
stopwatch.Restart();
do
{
@ -110,7 +112,7 @@ namespace osu.Game.Rulesets.UI
base.UpdateSubTree();
UpdateSubTreeMasking(this, ScreenSpaceDrawQuad.AABBFloat);
} while (state == PlaybackState.RequiresCatchUp && loops-- > 0);
} while (state == PlaybackState.RequiresCatchUp && stopwatch.ElapsedMilliseconds < max_catchup_milliseconds);
return true;
}