Merge branch 'master' into TCPConnections

# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/Server.h
#	include/Game/Game.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Game/Game.cpp

include/Engine/Network/Client.h

@@ -22,19 +22,24 @@
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
 #include "Network/EInterpolate.h"
+#include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
 
 class Client : public Network
 {
 public:
-    Client(ConfigFile* config);
+    Client(World* world, EventBroker* eventBroker);
+    Client(World* world, EventBroker* eventBroker, std::unique_ptr<SnapshotFilter> snapshotFilter);
     ~Client();
-    void Start(World* world, EventBroker* eventBroker) override;
+
+    void Connect(std::string address, int port);
     void Update() override;
-protected:
+
     // Save for children
-    std::string address;
-    int port = 0;
+    std::unique_ptr<SnapshotFilter> m_SnapshotFilter = nullptr;
+
+    std::string m_Address;
+    int m_Port = 0;
     // Sending message to server logic
     size_t bytesRead = 0;
 
@@ -44,10 +49,8 @@ protected:
     PacketID m_SendPacketID = 0;
 
     // Game logic
-    World* m_World;
     std::string m_PlayerName;
     PlayerID m_PlayerID = -1;
-    EntityID m_ServerEntityID = std::numeric_limits<EntityID>::max();
     bool m_IsConnected = false;
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     // Server Client Lookup map
@@ -70,7 +73,9 @@ protected:
     size_t  receive(char* data);
     void disconnect();
     void parseMessageType(Packet& packet);
-    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);
+    void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID);
+    SharedComponentWrapper createSharedComponent(Packet& packet, EntityID entityID, const ComponentInfo& componentInfo);
+    void ignoreFields(Packet& packet, const ComponentInfo& componentInfo);
     void parseUDPConnect(Packet& packet);
     void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
@@ -96,7 +101,6 @@ protected:
     void deleteFromServerClientMaps(EntityID serverEntityID, EntityID clientEntityID);
 
     // Events
-    EventBroker* m_EventBroker;
     EventRelay<Client, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
     EventRelay<Client, Events::PlayerDamage> m_EPlayerDamage;

include/Engine/Network/EInterpolate.h

@@ -11,8 +11,13 @@ namespace Events
 
 struct Interpolate : Event
 {
-    EntityID Entity;
-    boost::shared_array<char> DataArray;
+    Interpolate(EntityWrapper Entity, SharedComponentWrapper Component)
+        : Entity(Entity)
+        , Component(Component)
+    { }
+
+    EntityWrapper Entity;
+    SharedComponentWrapper Component;
 };
 
 }

include/Engine/Network/Network.h

@@ -19,10 +19,15 @@ typedef unsigned int PacketID;
 class Network
 {
 public:
+    Network(World* world, EventBroker* eventBroker);
     virtual ~Network() { };
-    virtual void Start(World* m_world, EventBroker *eventBroker) = 0;
+
     virtual void Update() = 0;
+
 protected:
+    World* m_World;
+    EventBroker* m_EventBroker;
+
     // For Debug 
     bool isReadingData = false;
     NetworkData m_NetworkData;
@@ -34,7 +39,6 @@ protected:
     void logReceivedData(int bytesReceived);
     void saveToFile();
     void updateNetworkData();
-    void initialize();
 };
 
 #endif

include/Engine/Network/Server.h

@@ -23,17 +23,18 @@
 class Server : public Network
 {
 public:
-    Server();
+    Server(World* world, EventBroker* eventBroker, int port);
     ~Server();
-    void Start(World* m_world, EventBroker *eventBroker) override;
+
     void Update() override;
+
 private:
     // Network channels
     TCPServer m_Reliable;
     UDPServer m_Unreliable;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
-    unsigned short m_Port;
+    int m_Port = 27666;
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
     std::vector<PlayerID> m_PlayersToDisconnect;
@@ -50,13 +51,10 @@ private:
     float snapshotInterval;
     int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
+    std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
-
-    // Game logic
-    World* m_World;
-    EventBroker* m_EventBroker;
-
+    
     // Packet loss logic
     PacketID m_PacketID = 0;
     PacketID m_PreviousPacketID = 0;
@@ -67,6 +65,7 @@ private:
     void unreliableBroadcast(Packet& packet);
     void sendSnapshot();
     void addChildrenToPacket(Packet& packet, EntityID entityID);
+    void addInputCommandsToPacket(Packet& packet);
     void sendPing();
     void checkForTimeOuts();
     void disconnect(PlayerID playerID);

include/Engine/Network/SnapshotFilter.h

@@ -0,0 +1,19 @@
+#ifndef SnapshotFilter_h__
+#define SnapshotFilter_h__
+
+#include "../Core/EntityWrapper.h"
+#include "../Core/ComponentWrapper.h"
+
+class SnapshotFilter
+{
+public:
+    // Filters an incoming snapshot. 
+    // Modify the component and return true if the component snapshot should be applied. 
+    // Otherwise return false and it will be ignored.
+    virtual bool FilterComponent(EntityWrapper entity, SharedComponentWrapper& component) 
+    {
+        return true;
+    }
+};
+
+#endif