Send input on every frame, even without commands

Serverside packet inspection
=> todo: analyze input on server and speed up slow clients/slow down fast clients

Author: proepkes

Engine/Common/Logging/Log.cs

@@ -4,7 +4,7 @@ namespace Lockstep.Common.Logging
 {
     public static class Log
     {                                                                                                                                 
-        public static LogSeverity LogSeverityLevel = 0;
+        public static LogSeverity LogSeverityLevel = LogSeverity.Info | LogSeverity.Warn | LogSeverity.Error | LogSeverity.Exception;
 
         public static event EventHandler<LogEventArgs> OnMessage;
 

Engine/CopySourceToUnity.cmd

@@ -0,0 +1,7 @@
+del ..\Unity\Assets\Integration\Lockstep.*
+xcopy "Game" "..\Unity\Assets\GitIgnored\Game\" /exclude:excludeList.txt /y /S
+xcopy "Common" "..\Unity\Assets\GitIgnored\Common\" /exclude:excludeList.txt /y /S
+xcopy "Core.Logic" "..\Unity\Assets\GitIgnored\Core.Logic\" /exclude:excludeList.txt /y /S
+xcopy "Core.State" "..\Unity\Assets\GitIgnored\Core.State\" /exclude:excludeList.txt /y /S
+xcopy "Network" "..\Unity\Assets\GitIgnored\Network\" /exclude:excludeList.txt /y /S
+xcopy "Network.Client" "..\Unity\Assets\GitIgnored\Network.Client\" /exclude:excludeList.txt /y /S

Engine/Core.Logic/Systems/WorldSystems.cs

@@ -21,7 +21,8 @@ public WorldSystems(Contexts contexts, params Feature[] features)
 
             Add(new CalculateHashCode(contexts));   
 
-            Add(new VerifyNoDuplicateBackups(contexts));              
+            //Performance-hit, only use for serious debugging
+            //Add(new VerifyNoDuplicateBackups(contexts));              
 
             Add(new DestroyDestroyedGameSystem(contexts));
 

Engine/Game.UrhoSharp.Desktop/Scenes/StaticScene.cs

@@ -80,7 +80,7 @@ private void CreateWorld()
                         mushroomObject.SetMaterial(ResourceCache.GetMaterial("Materials/Mushroom.xml"));
                     }
 
-                    simulation.Start(init.TargetFPS, init.ActorID, init.AllActors);
+                    simulation.Start(init.SimulationSpeed, init.ActorID, init.AllActors);
                 };
 
             simulation = new Simulation(Contexts.sharedInstance, networkCommandQueue, new ViewService(ResourceCache, scene.GetChild("Jacks")));

…gine/Game/Services/DefaultViewService.cs …me/DefaultServices/DefaultViewService.csEngine/Game/Services/DefaultViewService.cs renamed to Engine/Game/DefaultServices/DefaultViewService.cs Engine/Game/Services/DefaultViewService.cs renamed to Engine/Game/DefaultServices/DefaultViewService.cs

@@ -1,6 +1,6 @@
 using Lockstep.Game.Interfaces;
 
-namespace Lockstep.Game.Services
+namespace Lockstep.Game.DefaultServices
 {
     public class DefaultViewService : IViewService
     {           

Engine/Game/Features/Input/InputFeature.cs

@@ -7,7 +7,7 @@ public InputFeature(Contexts contexts, ServiceContainer services) : base("Input"
             //TODO: Add InputValidationSystem  
             Add(new ExecuteSpawnInput(contexts, services));
 
-            //Massive performance-hit:
+            //Performance-hit, only use for serious debugging
             //Add(new VerifySelectionIdExists(contexts));
 
             Add(new ExecuteNavigationInput(contexts, services));

Engine/Game/Simulation.cs

@@ -63,8 +63,7 @@ public void Start(int targetFps, byte localActorId, byte[] allActors)
             Running = true;
 
             Started?.Invoke(this, EventArgs.Empty);
-        }
-
+        }   
 
         public void Update(float elapsedMilliseconds)
         {
@@ -78,12 +77,9 @@ public void Update(float elapsedMilliseconds)
             while (_accumulatedTime >= _tickDt)
             {
                 lock (_localCommandBuffer)
-                {
-                    //if (_localCommandBuffer.Any())
-                    {          
-                        _commandQueue.Enqueue(new Input(_world.Tick, LocalActorId, _localCommandBuffer.ToArray()));
-                        _localCommandBuffer.Clear();
-                    }
+                {            
+                    _commandQueue.Enqueue(new Input(_world.Tick, LocalActorId, _localCommandBuffer.ToArray()));
+                    _localCommandBuffer.Clear();    
 
                     ProcessInputQueue();
 
@@ -105,8 +101,7 @@ public void Execute(ICommand command)
             {
                 _localCommandBuffer.Add(command);
             }
-        }
-
+        }          
 
         public void DumpGameLog(Stream outputStream, bool closeStream = true)
         {

Engine/Network.Client/NetworkCommandQueue.cs

@@ -46,9 +46,9 @@ public override void Enqueue(Input input)
             //Tell the server
             var writer = new Serializer();
             writer.Put((byte)MessageTag.Input);
-            writer.Put(input.ActorId);
             writer.Put(input.Tick + LagCompensation);
             writer.Put(input.Commands.Count());
+            writer.Put(input.ActorId);
             foreach (var command in input.Commands)
             {
                 writer.Put(command.Tag);
@@ -73,9 +73,9 @@ private void NetworkOnDataReceived(byte[] rawData)
                     InitReceived?.Invoke(this, paket);
                     break;
                 case MessageTag.Input:
-                    var actorId = reader.GetByte();
                     var tick = reader.GetUInt();
                     var countCommands = reader.GetInt();
+                    var actorId = reader.GetByte();
                     var commands = new ICommand[countCommands];
                     for (var i = 0; i < countCommands; i++)
                     {

Engine/Network.Server/Room.cs

@@ -13,7 +13,10 @@ namespace Lockstep.Network.Server
     /// </summary>
     public class Room
     {
-        private const int TargetFps = 20;
+        /// <summary>
+        /// Server determines the default speed of the simulation measured in FPS
+        /// </summary>
+        private const int SimulationSpeed = 20;
 
         private byte _nextPlayerId;
         private readonly int _size;
@@ -70,7 +73,12 @@ private void OnDataReceived(int clientId, byte[] data)
             switch (messageTag)
             {
                 case MessageTag.Input:
-                    _server.Distribute(clientId, data);    
+                    var clientTick = reader.GetUInt();
+                    var commandsCount = reader.GetInt();
+                    if (commandsCount > 0)
+                    {
+                        _server.Distribute(clientId, data);
+                    } 
                     break;
 
                 case MessageTag.HashCode:                                 
@@ -111,7 +119,7 @@ private void StartSimulationOnConnectedPeers()
             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 
+            //The message also contains the respective player-id and the initial simulation speed
             var seed = new Random().Next(int.MinValue, int.MaxValue);
 
             foreach (var player in _playerIds)
@@ -123,7 +131,7 @@ private void StartSimulationOnConnectedPeers()
                     Seed = seed,
                     ActorID = player.Value,
                     AllActors = _playerIds.Values.ToArray(),
-                    TargetFPS = TargetFps
+                    SimulationSpeed = SimulationSpeed
                 }.Serialize(writer);
 
                 _server.Send(player.Key, Compressor.Compress(writer));

Engine/Network/Messages/Init.cs

@@ -11,22 +11,22 @@ public class Init : ISerializable
 
         public byte[] AllActors { get; set; }
 
-        public int TargetFPS { get; set; } 
+        public int SimulationSpeed { get; set; } 
 
         public void Serialize(Serializer writer)
         {
             writer.Put(Seed);
             writer.Put(ActorID);
             writer.PutBytesWithLength(AllActors);
-            writer.Put(TargetFPS);
+            writer.Put(SimulationSpeed);
         }
 
         public void Deserialize(Deserializer reader)
         {
             Seed = reader.GetInt();
             ActorID = reader.GetByte();
             AllActors = reader.GetBytesWithLength();
-            TargetFPS = reader.GetInt();
+            SimulationSpeed = reader.GetInt();
         }
     }
 }