epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change FPS counter behaviour.

Browse Source 
Calculate a rolling average of FPS over the last second. This allows the FPS counter to be updated every frame - and in particular means it can display a rough figure immediately rather than needing to wait one second to collect information at the start of a game.
This commit is contained in:
RoosterDragon
2023-11-13 18:12:05 +00:00
committed by Gustas
parent 43f339b91e
commit 58e447d8d0
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
View File

@@ -9,6 +9,8 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Support; using OpenRA.Support;
@@ -28,22 +30,22 @@ namespace OpenRA.Mods.Common.Widgets.Logic
perfText.IsVisible = () => Game.Settings.Debug.PerfText; perfText.IsVisible = () => Game.Settings.Debug.PerfText;
var fpsTimer = Stopwatch.StartNew(); var fpsTimer = Stopwatch.StartNew();
var fpsReferenceFrame = Game.RenderFrame; var frameTimings = new List<(int Frame, TimeSpan Time)>(32) { (Game.RenderFrame, TimeSpan.Zero) };
var fps = 0;
perfText.GetText = () => perfText.GetText = () =>
{ {
var elapsed = fpsTimer.ElapsedMilliseconds; // Calculate FPS as a rolling average over the last ~1 second of frames.
if (elapsed > 1000) frameTimings.Add((Game.RenderFrame, fpsTimer.Elapsed));
{ var cutoffTime = frameTimings[^1].Time - TimeSpan.FromSeconds(1);
// Round to closest integer var firstIndexPastCutoff = frameTimings.FindIndex(ft => ft.Time >= cutoffTime);
fps = (int)(1000.0f * (Game.RenderFrame - fpsReferenceFrame) / fpsTimer.ElapsedMilliseconds + 0.5f); if (frameTimings.Count - firstIndexPastCutoff >= 2) // Keep at least 2 items for comparing.
fpsTimer.Restart(); frameTimings.RemoveRange(0, firstIndexPastCutoff);
fpsReferenceFrame = Game.RenderFrame; var (oldestFrame, oldestTime) = frameTimings[0];
} var (newestFrame, newestTime) = frameTimings[^1];
var fps = (newestFrame - oldestFrame) / (newestTime - oldestTime).TotalSeconds;
var wfbSize = Game.Renderer.WorldFrameBufferSize; var wfbSize = Game.Renderer.WorldFrameBufferSize;
var viewportSize = worldRenderer.Viewport.Rectangle.Size; var viewportSize = worldRenderer.Viewport.Rectangle.Size;
return $"FPS: {fps}\nTick {Game.LocalTick} @ {PerfHistory.Items["tick_time"].Average(Game.Settings.Debug.Samples):F1} ms\n" + return $"FPS: {fps:0}\nTick {Game.LocalTick} @ {PerfHistory.Items["tick_time"].Average(Game.Settings.Debug.Samples):F1} ms\n" +
$"Render {Game.RenderFrame} @ {PerfHistory.Items["render"].Average(Game.Settings.Debug.Samples):F1} ms\n" + $"Render {Game.RenderFrame} @ {PerfHistory.Items["render"].Average(Game.Settings.Debug.Samples):F1} ms\n" +
$"Batches: {PerfHistory.Items["batches"].LastValue}\n" + $"Batches: {PerfHistory.Items["batches"].LastValue}\n" +
$"Viewport Size: {viewportSize.Width} x {viewportSize.Height} / {Game.Renderer.WorldDownscaleFactor}\n" + $"Viewport Size: {viewportSize.Width} x {viewportSize.Height} / {Game.Renderer.WorldDownscaleFactor}\n" +