Merge pull request #21 from proepkes/develop

Develop

Author: proepkes

.gitignore

@@ -271,3 +271,6 @@ Unity/Assembly-CSharp-Editor\.csproj
 /Unity/Assets/Integration/FixMath.NET.pdb.meta
 /Unity/Assets/Integration/ECS.pdb.meta
 /Unity/Assets/Integration/BEPUutilities.pdb.meta
+/Unity/Assets/Editor Default Resources
+/Unity/Assets/Editor Default Resources.meta
+/Unity/Assets/Debug.meta

Engine/Client/Client.csproj

@@ -11,4 +11,8 @@
     <ProjectReference Include="..\Network\Network.csproj" />
   </ItemGroup>
 
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="xcopy /d /y  &quot;$(TargetDir)Lockstep.*.dll&quot; &quot;$(SolutionDir)..\Unity\Assets\Integration\&quot;&#xD;&#xA;xcopy /d /y  &quot;$(TargetDir)Lockstep.*.pdb&quot; &quot;$(SolutionDir)..\Unity\Assets\Integration\&quot;&#xD;&#xA;xcopy /d /y  &quot;$(TargetDir)Lockstep.*.json&quot; &quot;$(SolutionDir)..\Unity\Assets\Integration\&quot;" />
+  </Target>
+
 </Project>

Engine/Client/CommandBuffer.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Lockstep.Core.Data;
+using Lockstep.Core.Interfaces;
+
+namespace Lockstep.Client.Implementations
+{                
+    public class CommandBuffer : ICommandBuffer
+    {                                   
+        private readonly Dictionary<long, List<ICommand>> _commands = new Dictionary<long, List<ICommand>>();
+
+        public event Action<long, ICommand> Inserted;
+
+        public long Count
+        {
+            get
+            {
+                lock (_commands)
+                {
+                    return _commands.LongCount();
+                }
+            }
+        }
+
+        public long ItemIndex { get; private set; }
+
+        public long Remaining => Count - ItemIndex;
+
+        public virtual void Insert(long frameNumber, ICommand command)
+        {
+            lock (_commands)
+            {
+                if (!_commands.ContainsKey(frameNumber))
+                {
+                    _commands.Add(frameNumber, new List<ICommand>(10));
+                }
+
+                _commands[frameNumber].Add(command);
+
+                Inserted?.Invoke(frameNumber, command);
+            }              
+        }
+
+        public ICommand[] GetNext()
+        {                    
+            lock (_commands)
+            {
+                //If no commands were inserted then return an empty list
+                if (!_commands.ContainsKey(ItemIndex))
+                {
+                    _commands[ItemIndex] = new List<ICommand>();
+                }
+
+                return _commands[ItemIndex++].ToArray();    
+
+            }                 
+        }
+    }
+}

Engine/Client/FrameBuffer.cs

@@ -9,6 +9,6 @@ public interface INetwork
         /// <summary>
         /// Send data reliable ordered
         /// </summary>                    
-        void Send(byte[] data, int length);   
+        void Send(byte[] data);   
     }
 }

Engine/Client/Implementations/LocalDataReceiver.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.IO;       
+using Lockstep.Client.Implementations;
+using Lockstep.Client.Interfaces;
+using Lockstep.Core.Data;         
+using Lockstep.Network;
+using Lockstep.Network.Messages;
+using Lockstep.Network.Utils;
+
+namespace Lockstep.Client
+{
+    public class NetworkCommandBuffer : CommandBuffer
+    {
+        public event Action<Init> InitReceived;
+
+        private readonly INetwork _network;
+        private readonly IDictionary<ushort, Func<ISerializableCommand>> _commandFactories = new Dictionary<ushort, Func<ISerializableCommand>>();
+
+        public NetworkCommandBuffer(INetwork network)
+        {                        
+            _network = network;
+            _network.DataReceived += OnDataReceived;
+        }
+                  
+        public void RegisterCommand(Func<ISerializableCommand> commandFactory)
+        {
+            var tag = commandFactory.Invoke().Tag;
+            if (_commandFactories.ContainsKey(tag))
+            {
+                throw new InvalidDataException("The command tag " + tag + " is already registered. Every command tag must be unique.");
+            }
+            _commandFactories.Add(tag, commandFactory);
+        }         
+
+        public override void Insert(long frameNumber, ICommand command)
+        {
+            if (command is ISerializableCommand serializable)
+            {
+                //Tell the server
+                var writer = new Serializer();
+                writer.Put((byte)MessageTag.Input);
+                writer.Put(frameNumber);
+                writer.Put(serializable.Tag);
+                serializable.Serialize(writer);
+
+                _network.Send(Compressor.Compress(writer));
+            }
+        } 
+
+        private void OnDataReceived(byte[] data)
+        {
+            data = Compressor.Decompress(data);
+
+            var reader = new Deserializer(data);
+            var messageTag = (MessageTag)reader.GetByte();
+            switch (messageTag)
+            {
+                case MessageTag.StartSimulation:
+                    var init = new Init();
+                    init.Deserialize(reader);
+                    InitReceived?.Invoke(init);
+                    break;
+                case MessageTag.Input:
+                    var frameNumber = reader.GetLong();
+                    var tag = reader.GetUShort();
+
+                    if (_commandFactories.ContainsKey(tag))
+                    {
+                        var newCommand = _commandFactories[tag].Invoke();
+                        newCommand.Deserialize(reader);
+
+
+                        base.Insert(frameNumber, newCommand);                               
+                    }   
+
+                    break;
+            }
+        }    
+    }
+}