RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add proper frame rate limiting and fix mouse cursor missing at results

This commit is contained in:
Dean Herbert 2022-06-07 19:31:56 +09:00
parent c0e88d9577
commit 2e7a966218
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
osu.Game/Screens/LatencyComparerScreen.cs
View File

@ -37,7 +37,7 @@ public class LatencyComparerScreen : OsuScreen
public override bool HideOverlaysOnEnter => true;
public override bool CursorVisible => false;
public override bool CursorVisible => mainArea.Count == 0;
public override float BackgroundParallaxAmount => 0;
@ -181,17 +181,15 @@ private void loadNextRound()
mainArea.Clear();
const int induced_latency = 500;
int betterSide = RNG.Next(0, 2);
mainArea.Add(new LatencyArea(Key.Number1, betterSide == 1 ? induced_latency / difficulty : 0)
mainArea.Add(new LatencyArea(Key.Number1, betterSide == 1 ? mapDifficultyToTargetFrameRate(difficulty) : 0)
{
Width = 0.5f,
ReportBetter = () => recordResult(betterSide == 0)
});
mainArea.Add(new LatencyArea(Key.Number2, betterSide == 0 ? induced_latency / difficulty : 0)
mainArea.Add(new LatencyArea(Key.Number2, betterSide == 0 ? mapDifficultyToTargetFrameRate(difficulty) : 0)
{
Width = 0.5f,
Anchor = Anchor.TopRight,
@ -218,7 +216,7 @@ private void showResults()
statusText.AddParagraph($"You scored {correctCount} out of {targetRoundCount} ({successRate:P0})!", cp => cp.Colour = isPass ? colours.Green : colours.Red);
statusText.AddParagraph($"Level {difficulty} (comparing {host.UpdateThread.Clock.FramesPerSecond:N0}hz and {mapDifficultyToTargetFrameRate(difficulty):N0}hz)",
statusText.AddParagraph($"Level {difficulty} (comparing {mapDifficultyToTargetFrameRate(difficulty):N0}hz with {host.UpdateThread.Clock.FramesPerSecond:N0}hz)",
cp => cp.Font = OsuFont.Default.With(size: 15));
statusText.AddParagraph($"Refresh rate: {displayMode.RefreshRate:N0} ExclusiveFullscren: {exclusive}", cp => cp.Font = OsuFont.Default.With(size: 15));
@ -229,7 +227,7 @@ private void showResults()
cannotIncreaseReason = "You didn't score high enough (over 80% required)!";
else if (mapDifficultyToTargetFrameRate(difficulty + 1) > target_host_update_frames)
cannotIncreaseReason = "You've reached the limits of this comparison mode.";
else if (mapDifficultyToTargetFrameRate(difficulty + 1) < host.UpdateThread.ActiveHz)
else if (mapDifficultyToTargetFrameRate(difficulty + 1) > Clock.FramesPerSecond)
cannotIncreaseReason = "Game is not running fast enough to test this level";
resultsArea.Add(new FillFlowContainer
@ -244,13 +242,14 @@ private void showResults()
Text = "Increase confidence at current level",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
TooltipText = "The longer you chain, the more sure you will be!",
Action = () =>
{
resultsArea.Clear();
targetRoundCount += rounds_to_complete;
loadNextRound();
}
},
TooltipText = isPass ? "The longer you chain, the more sure you will be!" : "You've reached your limits",
Enabled = { Value = string.IsNullOrEmpty(cannotIncreaseReason) },
},
new Button(Key.I)
{
@ -334,14 +333,12 @@ public class LatencyArea : CompositeDrawable
private Drawable? background;
private readonly Key key;
private readonly int inducedLatency;
private readonly int targetFrameRate;
private long frameCount;
public LatencyArea(Key key, int inducedLatency)
public LatencyArea(Key key, int targetFrameRate)
{
this.key = key;
this.inducedLatency = inducedLatency;
this.targetFrameRate = targetFrameRate;
RelativeSizeAxes = Axes.Both;
Masking = true;
@ -358,6 +355,15 @@ protected override void LoadComplete()
Colour = overlayColourProvider.Background6,
RelativeSizeAxes = Axes.Both,
},
new Button(key)
{
Text = "Feels better",
Y = 20,
Width = 0.8f,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Action = () => ReportBetter?.Invoke(),
},
new Container
{
RelativeSizeAxes = Axes.Both,
@ -373,15 +379,6 @@ protected override void LoadComplete()
},
}
},
new Button(key)
{
Text = "Feels better",
Y = 20,
Width = 0.8f,
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Action = () => ReportBetter?.Invoke(),
},
};
}
@ -397,11 +394,16 @@ protected override void OnHoverLost(HoverLostEvent e)
base.OnHoverLost(e);
}
private double lastFrameTime;
public override bool UpdateSubTree()
{
if (background?.Alpha == 1 && inducedLatency > 0 && ++frameCount % inducedLatency != 0)
double elapsed = Clock.CurrentTime - lastFrameTime;
if (targetFrameRate > 0 && elapsed < 1000.0 / targetFrameRate)
return false;
lastFrameTime = Clock.CurrentTime;
return base.UpdateSubTree();
}