From 190c0c3143d4ebec0978abca9b20b2b8c079484d Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sun, 7 Apr 2024 20:29:09 +0200
Subject: [PATCH] more consistent tick pacing

---
 .../GameTickService.cs => GameTickWorker.cs}       | 14 ++++++++++----
 TanksServer/Program.cs                             |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)
 rename TanksServer/{Services/GameTickService.cs => GameTickWorker.cs} (76%)

diff --git a/TanksServer/Services/GameTickService.cs b/TanksServer/GameTickWorker.cs
similarity index 76%
rename from TanksServer/Services/GameTickService.cs
rename to TanksServer/GameTickWorker.cs
index d21b2ca..1ca47e1 100644
--- a/TanksServer/Services/GameTickService.cs
+++ b/TanksServer/GameTickWorker.cs
@@ -1,11 +1,12 @@
+using System.Diagnostics;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using TanksServer.TickSteps;
 
-namespace TanksServer.Services;
+namespace TanksServer;
 
-internal sealed class GameTickService(
-    IEnumerable<ITickStep> steps, IHostApplicationLifetime lifetime, ILogger<GameTickService> logger
+internal sealed class GameTickWorker(
+    IEnumerable<ITickStep> steps, IHostApplicationLifetime lifetime, ILogger<GameTickWorker> logger
 ) : IHostedService, IDisposable
 {
     private readonly CancellationTokenSource _cancellation = new();
@@ -22,11 +23,16 @@ internal sealed class GameTickService(
     {
         try
         {
+            var sw = new Stopwatch();
             while (!_cancellation.IsCancellationRequested)
             {
+                logger.LogTrace("since last frame: {}", sw.Elapsed);
+                sw.Restart();
+
                 foreach (var step in _steps)
                     await step.TickAsync();
-                await Task.Delay(1000 / 25);
+                
+                await Task.Delay(TimeSpan.FromMilliseconds(1000 / 25) - sw.Elapsed);
             }
         }
         catch (Exception ex)
diff --git a/TanksServer/Program.cs b/TanksServer/Program.cs
index 13d2659..9549f55 100644
--- a/TanksServer/Program.cs
+++ b/TanksServer/Program.cs
@@ -88,7 +88,7 @@ internal static class Program
         builder.Services.AddSingleton<LastFinishedFrameProvider>();
         builder.Services.AddSingleton<SpawnQueueProvider>();
 
-        builder.Services.AddHostedService<GameTickService>();
+        builder.Services.AddHostedService<GameTickWorker>();
         builder.Services.AddHostedService(sp => sp.GetRequiredService<ControlsServer>());
         builder.Services.AddHostedService(sp => sp.GetRequiredService<ClientScreenServer>());