Remove debug messages

Minor cleanup
Tested with 0 Lagcompensation, 550 ms ping, 10% drop

Author: proepkes

Engine/Client/Simulation.cs

@@ -15,14 +15,13 @@ public class Simulation
         /// <summary>
         /// Amount of ticks until a command gets executed
         /// </summary>
-        public uint LagCompensation { get; set; } = 10;
+        public uint LagCompensation { get; set; }
 
         public byte LocalPlayerId { get; private set; }   
 
         public bool Running { get; set; }
 
-        public readonly ICommandBuffer RemoteCommandBuffer;
-        private readonly ILogService _logger;
+        public readonly ICommandBuffer RemoteCommandBuffer;     
 
         public float _tickDt;
         public float _accumulatedTime;
@@ -38,9 +37,7 @@ public Simulation(ISystems systems, ICommandBuffer remoteCommandBuffer)
         {
             _systems = systems;                       
 
-            RemoteCommandBuffer = remoteCommandBuffer;
-
-            _logger = systems.Services.Get<ILogService>();
+            RemoteCommandBuffer = remoteCommandBuffer;      
         }
 
         public void Start(Init init)
@@ -73,10 +70,7 @@ public void Update(float deltaTime)
             _accumulatedTime += deltaTime; 
 
             while (_accumulatedTime >= _tickDt)
-            {
-
-                _logger.Warn(" ========= " + (_systems.CurrentTick + 1) + " ========= ");
-
+            {                                                                                
                 Tick();
 
                 _accumulatedTime -= _tickDt;
@@ -108,9 +102,7 @@ private void SyncCommandBuffer()
             var currentRemoteFrame = RemoteCommandBuffer.LastInsertedFrame;
 
             if (LastValidatedFrame < currentRemoteFrame)
-            {   
-                _logger.Warn("Catching up: " + LastValidatedFrame + " -> " + currentRemoteFrame + " of " + _systems.CurrentTick);
-
+            {                                                                                                                             
                 var revertFrame = currentRemoteFrame; //We guess everything was predicted correctly
 
                 for (var remoteFrame = LastValidatedFrame + 1; remoteFrame <= currentRemoteFrame; remoteFrame++)
@@ -124,39 +116,29 @@ private void SyncCommandBuffer()
 
                     if (remoteFrame < revertFrame)
                     {
-                        //Store the first frame where predicion was false (frame has commands)
+                        //Store the first frame where prediction was false (frame has commands)
                         revertFrame = remoteFrame;
                     }
 
                     //Merge commands into the local command buffer
                     foreach (var commandPerPlayer in allPlayerCommands)
-                    {
-
-                        _logger.Warn("Insert remote commands from " + remoteFrame);
+                    {                                                                       
                         LocalCommandBuffer.Insert(remoteFrame, commandPerPlayer.Key, commandPerPlayer.Value.ToArray());
                     }
                 }
 
                 //Only rollback if we are ahead (network can be ahead when lag compensation is higher than lag itself)
-                //if (_systems.CurrentTick > revertTick)
+                if (_systems.CurrentTick > revertFrame)
                 {      
                     var targetTick = _systems.CurrentTick;  
 
                     //Revert everything that happened one tick after the last validated input
                     _systems.RevertFromTick(revertFrame + 1);
 
-                    //Execute all commands again, beginning from the first frame that contains remote input
+                    //Execute all commands again, beginning from the first frame that contains remote input up to our last local state
                     while (revertFrame <= targetTick)
-                    {
-                        if (LocalCommandBuffer.GetMany(_systems.CurrentTick).Length > 0)
-                        {
-
-                            _logger.Warn("Execute " +  LocalCommandBuffer.GetMany(revertFrame).Length + " commands from tick " + revertFrame);
-                        }
-
-                        _logger.Warn(">>>>========= " + (revertFrame) + " ========= ");
+                    {   
                         _systems.Tick(LocalCommandBuffer.GetMany(revertFrame));
-
                         revertFrame++;
                     }
                 }

Engine/Core/Features/StatefulFeature.cs

@@ -4,13 +4,13 @@ namespace Lockstep.Core.Features
 {
     public abstract class StatefulFeature : Feature, IStateSystem
     {     
-        public void RevertToTick(uint tick)
+        public void RevertFromTick(uint tick)
         {
             foreach (var system in _executeSystems)
             {
                 if (system is IStateSystem stateSystem)
                 {
-                    stateSystem.RevertToTick(tick);
+                    stateSystem.RevertFromTick(tick);
                 }
             }
         }

Engine/Core/GameSystems.cs

@@ -2,8 +2,7 @@
 using Lockstep.Core.Data;
 using Lockstep.Core.Features;
 using Lockstep.Core.Interfaces;
-using Lockstep.Core.Systems.GameState;
-using Lockstep.Core.Systems.Input;
+using Lockstep.Core.Systems.GameState;    
 
 namespace Lockstep.Core
 {
@@ -51,10 +50,14 @@ public void RevertFromTick(uint tick)
             {
                 if (system is IStateSystem stateSystem)
                 {
-                    stateSystem.RevertToTick(tick);
+                    stateSystem.RevertFromTick(tick);
                 }
             }
-                                                        
+            
+            //Example: tick = 50, currentTick = 60
+            //All ticks from 50 to 60 are reverted
+            //The state is now the same it was as in 49
+            //=> Set new tick to 49 (= tick - 1)
             Contexts.gameState.ReplaceTick(tick - 1);   
         }
     }

Engine/Core/Interfaces/IStateSystem.cs

@@ -2,6 +2,6 @@
 {
     public interface IStateSystem
     {
-        void RevertToTick(uint tick);
+        void RevertFromTick(uint tick);
     }
 }

Engine/Core/Systems/Input/OnSpawnInputCreateEntity.cs

@@ -14,13 +14,11 @@ public class OnSpawnInputCreateEntity : ReactiveSystem<InputEntity>, IStateSyste
         private readonly GameContext _gameContext;
         private readonly GameStateContext _gameStateContext;
 
-        private readonly Dictionary<uint, List<uint>> _createdEntities = new Dictionary<uint, List<uint>>();
-        private readonly ILogService _logger;
+        private readonly Dictionary<uint, List<uint>> _createdEntities = new Dictionary<uint, List<uint>>();        
 
         public OnSpawnInputCreateEntity(Contexts contexts, ServiceContainer services) : base(contexts.input)
         {
-            _gameService = services.Get<IGameService>();
-            _logger = services.Get<ILogService>();
+            _gameService = services.Get<IGameService>();     
             _gameContext = contexts.game;
             _gameStateContext = contexts.gameState;
         }
@@ -54,31 +52,24 @@ protected override void Execute(List<InputEntity> inputs)
 
                 _createdEntities[_gameStateContext.tick.value].Add(_nextEntityId);      
                 _nextEntityId++;  
-            }
-
-            _logger?.Warn(_gameStateContext.tick.value + ": " + inputs.Count + " added");
+            }                                                                                    
         }
 
-        public void RevertToTick(uint tick)
-        {
-            var t = tick;
-            var count = 0;
+        public void RevertFromTick(uint tick)
+        {                  
             for (;tick <= _gameStateContext.tick.value; tick++)
             {                             
                 if (_createdEntities.ContainsKey(tick))
                 {
                     foreach (var entityId in _createdEntities[tick])
                     {
                         _gameContext.GetEntities().First(entity => entity.id.value == entityId).Destroy();
-                        _nextEntityId--;
-                        count++;
+                        _nextEntityId--;   
                     }
 
                     _createdEntities[tick].Clear();
                 }
-            }
-
-            _logger?.Warn(t + " -> " + tick + ": " + count + " destroyed");
+            }                                                                     
         }
     }
 }

Engine/Server/Room.cs

@@ -1,6 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
+using System.Collections.Generic;     
 using Lockstep.Network;
 using Lockstep.Network.Messages;
 using Lockstep.Network.Utils;
@@ -12,7 +11,7 @@ namespace Server
     /// </summary>
     public class Room
     {
-        private const int TargetFps = 20;
+        private const int TargetFps = 40;
 
         private byte _nextPlayerId;
         private readonly int _size;
@@ -107,7 +106,8 @@ private void OnClientDisconnected(int clientId)
 
         private void StartSimulationOnConnectedPeers()
         {
-            Serializer writer = new Serializer();
+            var writer = new Serializer();
+
             //Create a new seed and send it with a start-message to all clients
             //The message also contains the respective player-id and the servers' frame rate 
             var seed = new Random().Next(int.MinValue, int.MaxValue);

Server.LiteNetLib/Server.LiteNetLib/Program.cs

@@ -10,7 +10,7 @@ class Program
         static void Main(string[] args)
         {
             int roomSize = 2;
-            int waitInSeconds = 1;
+            int waitInSeconds = 5;
 
             var sw = new Stopwatch();
             sw.Start();