Replace Frame with direct commandarray

proepkes · proepkes · commit b61ec94819cb · 2019-01-27T00:05:28.000+01:00
Testing Local/Networkbuffer (debugging)
diff --git a/.gitignore b/.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/Scripts/Debug.meta
+/Unity/Assets/Editor Default Resources.meta
diff --git a/Engine/Client/CommandBuffer.cs b/Engine/Client/CommandBuffer.cs
@@ -7,24 +7,24 @@ namespace Lockstep.Client.Implementations
 {                
     public class CommandBuffer : ICommandBuffer
     {                                   
-        private readonly Dictionary<ulong, List<ICommand>> _commands = new Dictionary<ulong, List<ICommand>>();
+        private readonly Dictionary<long, List<ICommand>> _commands = new Dictionary<long, List<ICommand>>();
 
-        public ulong Count
+        public long Count
         {
             get
             {
                 lock (_commands)
                 {
-                    return _commands.Keys.Max();
+                    return _commands.LongCount();
                 }
             }
         }
 
-        public ulong ItemIndex { get; private set; }
+        public long ItemIndex { get; private set; }
 
-        public ulong Remaining => Count - ItemIndex;
+        public long Remaining => Count - ItemIndex;
 
-        public void Insert(ulong frameNumber, ICommand command)
+        public void Insert(long frameNumber, ICommand command)
         {
             lock (_commands)
             {
diff --git a/Engine/Client/Simulation.cs b/Engine/Client/Simulation.cs
@@ -12,7 +12,7 @@ namespace Lockstep.Client
 {
     public class Simulation
     {                                       
-        public event Action<ulong> Ticked;
+        public event Action<long> Ticked;
 
         public bool Running { get; set; }
                                                                       
@@ -22,18 +22,19 @@ public class Simulation
         public float _tickDt;
         public float _accumulatedTime;
 
-        public ulong CurrentTick { get; private set; }
+        public long CurrentTick { get; private set; }
 
-        private readonly CommandBuffer _networkCommandBuffer;
-        private readonly IDictionary<ushort, Func<ISerializableCommand>> _commandFactories = new Dictionary<ushort, Func<ISerializableCommand>>();
+        public ICommandBuffer LocalCommandBuffer => _systems.CommandBuffer;
+        public readonly CommandBuffer NetworkCommandBuffer;
 
+        private readonly IDictionary<ushort, Func<ISerializableCommand>> _commandFactories = new Dictionary<ushort, Func<ISerializableCommand>>();   
 
         public Simulation(ISystems systems, INetwork network)
         {
             _systems = systems;
             _systems.CommandBuffer = new CommandBuffer();
 
-            _networkCommandBuffer = new CommandBuffer();
+            NetworkCommandBuffer = new CommandBuffer();
 
             _network = network;
             _network.DataReceived += OnDataReceived;         
@@ -52,7 +53,7 @@ public void RegisterCommand(Func<ISerializableCommand> commandFactory)
 
         public void Execute(ISerializableCommand command)
         {         
-            //Execute the command locally in the next tick
+            //Execute the command locally on the next tick
             _systems.CommandBuffer.Insert(CurrentTick + 1, command);
             
             //Tell the server
@@ -113,15 +114,15 @@ private void OnDataReceived(byte[] data)
                     StartSimulation(init.TargetFPS);
                     break;
                 case MessageTag.Input:
-                    var frameNumber = reader.GetULong();   
+                    var frameNumber = reader.GetLong();   
                     var tag = reader.GetUShort();
 
                     if (_commandFactories.ContainsKey(tag))
                     {
                         var newCommand = _commandFactories[tag].Invoke();
                         newCommand.Deserialize(reader);
 
-                        _networkCommandBuffer.Insert(frameNumber, newCommand);
+                        NetworkCommandBuffer.Insert(frameNumber, newCommand);
                     }  
                                                                                     
                     break;
diff --git a/Engine/Core/Core.csproj b/Engine/Core/Core.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -137,7 +137,6 @@
     <Compile Include="Components\GameState\PausedComponent.cs" />
     <Compile Include="Components\Input\EntityIdsComponent.cs" />
     <Compile Include="Data\AgentConfig.cs" />
-    <Compile Include="Data\Frame.cs" />
     <Compile Include="Data\ICommand.cs" />
     <Compile Include="DefaultServices\DefaultGameService.cs" />
     <Compile Include="DefaultServices\DefaultHashService.cs" />
diff --git a/Engine/Core/Data/Frame.cs b/Engine/Core/Data/Frame.cs
diff --git a/Engine/Core/Interfaces/ICommandBuffer.cs b/Engine/Core/Interfaces/ICommandBuffer.cs
@@ -4,11 +4,11 @@ namespace Lockstep.Core.Interfaces
 {
     public interface ICommandBuffer
     {
-        ulong Count { get; }
-        ulong ItemIndex { get; }
-        ulong Remaining { get; }
+        long Count { get; }
+        long ItemIndex { get; }
+        long Remaining { get; }
 
-        void Insert(ulong frameNumber, ICommand command);
+        void Insert(long frameNumber, ICommand command);
 
         ICommand[] GetNext();
     }
diff --git a/Unity/Assets/Integration/Lockstep.Client.dll b/Unity/Assets/Integration/Lockstep.Client.dll
diff --git a/Unity/Assets/Integration/Lockstep.Client.pdb b/Unity/Assets/Integration/Lockstep.Client.pdb
diff --git a/Unity/Assets/Integration/Lockstep.Core.dll b/Unity/Assets/Integration/Lockstep.Core.dll
diff --git a/Unity/Assets/Scenes/SampleScene.unity b/Unity/Assets/Scenes/SampleScene.unity
@@ -273,8 +273,38 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
+--- !u!1 &90465233
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 90465234}
+  m_Layer: 0
+  m_Name: Just_Delete_Me
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &90465234
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 90465233}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 7.8062973, y: 6.0821004, z: -7.0502815}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &97464389
 GameObject:
   m_ObjectHideFlags: 0
@@ -370,7 +400,7 @@ RectTransform:
   - {fileID: 1690724855}
   - {fileID: 1923207267}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -458,7 +488,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &739202181
 GameObject:
@@ -556,9 +586,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6fcb7be03dda3f642b1a24576215f536, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  EntityDatabase: {fileID: 11400000, guid: a0d4789ca6cc5ab42a1264102206ac3f, type: 2}
   ServerIp: 127.0.0.1
   ServerPort: 9050
+  EntityDatabase: {fileID: 11400000, guid: a0d4789ca6cc5ab42a1264102206ac3f, type: 2}
 --- !u!114 &1524441392
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -586,7 +616,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1549690249
 GameObject:
@@ -908,5 +938,5 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Unity/Assets/Scripts/RTSNetworkedSimulation.cs b/Unity/Assets/Scripts/RTSNetworkedSimulation.cs
@@ -1,41 +1,36 @@
-﻿using System.Collections;   
-using Lockstep.Client;
-using Lockstep.Client.Implementations;
+﻿using System.Collections;           
+using Lockstep.Client;                  
 using Lockstep.Client.Interfaces;
 using Lockstep.Commands;
-using Lockstep.Core;
-using Lockstep.Core.Interfaces;
-using Lockstep.Network;
-using Lockstep.Network.Messages;
+using Lockstep.Core;             
 using UnityEngine;           
                               
 public class RTSNetworkedSimulation : MonoBehaviour
-{
+{      
     public static RTSNetworkedSimulation Instance;
-                                        
-    private Simulation _simulation;
-    private readonly LiteNetLibClient _client = new LiteNetLibClient(); 
-                                           
-    public RTSEntityDatabase EntityDatabase;
-
-    public bool Connected => _client.Connected;
 
     public string ServerIp = "127.0.0.1";
     public int ServerPort = 9050;
-                                       
-    private LockstepSystems _systems;
+
+    public Simulation Simulation;
+    public LockstepSystems Systems;
+    public RTSEntityDatabase EntityDatabase;
+
+    public bool Connected => _client.Connected; 
+
+    private readonly LiteNetLibClient _client = new LiteNetLibClient();  
 
     private void Awake()
     {                                
         Instance = this;
 
-        _systems = new LockstepSystems(Contexts.sharedInstance, new UnityGameService(EntityDatabase));
+        Systems = new LockstepSystems(Contexts.sharedInstance, new UnityGameService(EntityDatabase));
 
-        _simulation = new Simulation(_systems, _client); 
-        _simulation.RegisterCommand(() => new SpawnCommand());
-        _simulation.RegisterCommand(() => new NavigateCommand());
+        Simulation = new Simulation(Systems, _client); 
+        Simulation.RegisterCommand(() => new SpawnCommand());
+        Simulation.RegisterCommand(() => new NavigateCommand());
 
-        _simulation.Ticked += id =>
+        Simulation.Ticked += id =>
         {
             //_dataReceiver.Receive(MessageTag.HashCode, new HashCode {FrameNumber = id, Value = _systems.HashCode});
         };
@@ -44,7 +39,7 @@ private void Awake()
 
     public void Execute(ISerializableCommand command)
     {
-        _simulation.Execute(command);
+        Simulation.Execute(command);
     }
 
     private void Start()
@@ -63,12 +58,12 @@ void Update()
     {
         _client.Update();
 
-        _simulation.Update(Time.deltaTime * 1000);
+        Simulation.Update(Time.deltaTime * 1000);
     }   
 
     void OnGUI()
     {
-        if (_simulation.Running)
+        if (Simulation.Running)
         {
             GUILayout.BeginVertical(GUILayout.Width(100f));
             GUI.color = Color.white;
diff --git a/Unity/ProjectSettings/ProjectVersion.txt b/Unity/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.3.1f1
+m_EditorVersion: 2018.3.3f1

Original file line number	Diff line number	Diff line change
`@@ -7,24 +7,24 @@ namespace Lockstep.Client.Implementations`
`7`	`7`	`{`
`8`	`8`	`public class CommandBuffer : ICommandBuffer`
`9`	`9`	`{`
`10`		`- private readonly Dictionary<ulong, List<ICommand>> _commands = new Dictionary<ulong, List<ICommand>>();`
	`10`	`+ private readonly Dictionary<long, List<ICommand>> _commands = new Dictionary<long, List<ICommand>>();`
`11`	`11`
`12`		`- public ulong Count`
	`12`	`+ public long Count`
`13`	`13`	`{`
`14`	`14`	`get`
`15`	`15`	`{`
`16`	`16`	`lock (_commands)`
`17`	`17`	`{`
`18`		`- return _commands.Keys.Max();`
	`18`	`+ return _commands.LongCount();`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`- public ulong ItemIndex { get; private set; }`
	`23`	`+ public long ItemIndex { get; private set; }`
`24`	`24`
`25`		`- public ulong Remaining => Count - ItemIndex;`
	`25`	`+ public long Remaining => Count - ItemIndex;`
`26`	`26`
`27`		`- public void Insert(ulong frameNumber, ICommand command)`
	`27`	`+ public void Insert(long frameNumber, ICommand command)`
`28`	`28`	`{`
`29`	`29`	`lock (_commands)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@ namespace Lockstep.Core.Interfaces`
`4`	`4`	`{`
`5`	`5`	`public interface ICommandBuffer`
`6`	`6`	`{`
`7`		`- ulong Count { get; }`
`8`		`- ulong ItemIndex { get; }`
`9`		`- ulong Remaining { get; }`
	`7`	`+ long Count { get; }`
	`8`	`+ long ItemIndex { get; }`
	`9`	`+ long Remaining { get; }`
`10`	`10`
`11`		`- void Insert(ulong frameNumber, ICommand command);`
	`11`	`+ void Insert(long frameNumber, ICommand command);`
`12`	`12`
`13`	`13`	`ICommand[] GetNext();`
`14`	`14`	`}`