New dumps, testing some stuff to get synced framerate...

proepkes · Feb 13, 2019 · e892db7 · e892db7
1 parent b0ad5b2
commit e892db7
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 16 deletions.
diff --git a/Engine/Network.Server/Room.cs b/Engine/Network.Server/Room.cs
@@ -35,6 +35,8 @@ public class Room
         /// </summary>
         private readonly Dictionary<ulong, long> _hashCodes = new Dictionary<ulong, long>();
 
+        private uint inputMessageCounter = 0;
+
         public Room(IServer server, int size)
         {
             _server = server;
@@ -73,9 +75,11 @@ private void OnDataReceived(int clientId, byte[] data)
             switch (messageTag)
             {
                 case MessageTag.Input:
+                    ++inputMessageCounter;
+
                     var clientTick = reader.GetUInt();
                     var commandsCount = reader.GetInt();
-                    if (commandsCount > 0)
+                    if (commandsCount > 0 || inputMessageCounter % 8 == 0)
                     {
                         _server.Distribute(clientId, data);
                     } 

diff --git a/Engine/Test/DumpTests.cs b/Engine/Test/DumpTests.cs
@@ -34,8 +34,8 @@ public void TestDump()
         [Fact]
         public void TestDumpRVO()
         {
-            TestFileDump(@"RVO\342696725855");
-            //TestFileDump(@"RVO\93654088888");   
+            TestFileDump(@"RVO\445401195417");
+            TestFileDump(@"RVO\526795398181");
         }
 
         /// <summary>

diff --git a/Engine/Test/Dumps/RVO/342696785265.bin b/Engine/Test/Dumps/RVO/342696785265.bin
diff --git a/Engine/Test/Dumps/RVO/342696725855.bin → Engine/Test/Dumps/RVO/445401195417.bin b/Engine/Test/Dumps/RVO/342696725855.bin → Engine/Test/Dumps/RVO/445401195417.bin
diff --git a/Engine/Test/Dumps/RVO/526795398181.bin b/Engine/Test/Dumps/RVO/526795398181.bin
diff --git a/Engine/Test/Test.csproj b/Engine/Test/Test.csproj
@@ -46,13 +46,13 @@
     <None Update="Dumps\58013408818.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Dumps\RVO\342696725855.bin">
+    <None Update="Dumps\RVO\445401195417.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Dumps\RVO\342696785265.bin">
+    <None Update="Dumps\RVO\4949504550.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Dumps\RVO\4949504550.bin">
+    <None Update="Dumps\RVO\526795398181.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/Server.LiteNetLib/Integration/Lockstep.Network.Server.dll b/Server.LiteNetLib/Integration/Lockstep.Network.Server.dll
diff --git a/Unity/Assets/Integration/Lockstep.Game.dll b/Unity/Assets/Integration/Lockstep.Game.dll
diff --git a/Unity/Assets/Scripts/RTSNetworkedSimulation.cs b/Unity/Assets/Scripts/RTSNetworkedSimulation.cs
@@ -32,7 +32,10 @@ private void Awake()
 
         Log.OnMessage += (sender, args) => Debug.Log(args.Message);
 
-        _commandQueue = new NetworkCommandQueue(_client);
+        _commandQueue = new NetworkCommandQueue(_client)
+        {
+            LagCompensation = 3
+        };
         _commandQueue.InitReceived += (sender, init) =>
         {
             AllActorIds = init.AllActors;
@@ -46,15 +49,7 @@ private void Awake()
 
     public void DumpGameLog()
     {
-        Stream stream = new FileStream(@"C:\Log\" + Math.Abs(Contexts.sharedInstance.gameState.hashCode.value) + ".bin", FileMode.Create, FileAccess.Write);
-        var serializer = new Serializer();
-        serializer.Put(Contexts.sharedInstance.gameState.hashCode.value);
-        serializer.Put(Contexts.sharedInstance.gameState.tick.value);      
-        stream.Write(serializer.Data, 0, serializer.Length);
-
-        Simulation.GameLog.WriteTo(stream);
-
-        stream.Close();                    
+        Simulation.DumpGameLog(new FileStream(@"C:\Log\" + Math.Abs(Contexts.sharedInstance.gameState.hashCode.value) + ".bin", FileMode.Create, FileAccess.Write));                   
     }
 
     public void Execute(ICommand command)