Merge remote-tracking branch 'origin/Networking' into Networking

include/Engine/Network/Client.h

@@ -19,6 +19,7 @@
 #include "Core/ConfigFile.h"
 #include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
+#include "Network/EInterpolate.h"
 
 class Client : public Network
 {

include/Engine/Network/EInterpolate.h

@@ -0,0 +1,20 @@
+#ifndef Events_Interpolate_h__
+#define Events_Interpolate_h__
+
+#include <boost/shared_array.hpp>
+
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
+
+namespace Events
+{
+
+struct Interpolate : Event
+{
+    EntityID Entity;
+    boost::shared_array<char> DataArray;
+};
+
+}
+
+#endif

include/Game/InterpolationSystem.h

@@ -0,0 +1,42 @@
+#ifndef Systems_InterpolationSystem_h__
+#define Systems_InterpolationSystem_h__
+
+#include <queue>
+#include <unordered_map>
+#include <boost/shared_array.hpp>
+#include <glm/common.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Core/EventBroker.h"
+
+#include "Network/EInterpolate.h"
+
+struct Transform {
+    glm::vec3 Position;
+    glm::vec3 Scale;
+    glm::vec3 Orientation;
+    double interpolationTime;
+};
+
+class InterpolationSystem : public PureSystem
+{
+public:
+    InterpolationSystem(EventBroker* eventbroker)
+        : PureSystem(eventbroker, "Transform")
+    {
+        EVENT_SUBSCRIBE_MEMBER(m_EInterpolate, &InterpolationSystem::OnInterpolate);
+    }
+    ~InterpolationSystem() { }
+
+    virtual void UpdateComponent(World* world, ComponentWrapper& transform, double dt) override;
+private:
+    std::unordered_map<EntityID, std::queue<Transform>> m_InterpolationPoints;
+
+    glm::vec3 vectorInterpolation(glm::vec3 prev, glm::vec3 next, double currentTime);
+
+    EventRelay<InterpolationSystem, Events::Interpolate> m_EInterpolate;
+    bool InterpolationSystem::OnInterpolate(const Events::Interpolate& e);
+};
+
+#endif

src/Engine/Network/Client.cpp

@@ -118,12 +118,16 @@ void Client::InterpolateFields(Packet& packet, const ComponentInfo& componentInf
     int sizeOfFields = 0;
     for (auto field : componentInfo.FieldsInOrder) {
         ComponentInfo::Field_t fieldInfo = componentInfo.Fields.at(field);
-        sizeOfFields = fieldInfo.Stride;
+        sizeOfFields += fieldInfo.Stride;
     }
     // Is the size correct?
     boost::shared_array<char> eventData(new char[componentInfo.Meta.Stride]);
     memcpy(eventData.get(), packet.ReadData(componentInfo.Meta.Stride), componentInfo.Meta.Stride);
     //Send event to interpolat system
+    Events::Interpolate e;
+    e.Entity = entityID;
+    e.DataArray = eventData;
+    m_EventBroker->Publish(e);
 
 }
 

src/Engine/Network/Server.cpp

@@ -27,6 +27,7 @@ void Server::Update()
     m_EventBroker->Process<Server>();
 }
 
+
 void Server::readFromClients()
 {
     while (m_Socket.available()) {

src/Game/InterpolationSystem.cpp

@@ -0,0 +1,50 @@
+#include "InterpolationSystem.h"
+
+void InterpolationSystem::UpdateComponent(World * world, ComponentWrapper & transform, double dt)
+{
+    if (m_InterpolationPoints[transform.EntityID].size() > 0) {
+        Transform& sTransform = m_InterpolationPoints[transform.EntityID].front();
+        sTransform.interpolationTime += dt;
+        if (sTransform.interpolationTime > 0.05) {
+            double time = std::fmod(sTransform.interpolationTime, 0.05f);
+            m_InterpolationPoints[transform.EntityID].pop();
+            if (m_InterpolationPoints[transform.EntityID].size() <= 0) {
+                return;
+            }
+            sTransform = m_InterpolationPoints[transform.EntityID].front();
+            sTransform.interpolationTime = time;
+        }
+        glm::vec3 nextPosition = sTransform.Position;
+        glm::vec3 currentPosition = static_cast<glm::vec3>(transform["Position"]);
+        transform["Position"] = vectorInterpolation(currentPosition, nextPosition, sTransform.interpolationTime);
+    }
+}
+
+glm::vec3 InterpolationSystem::vectorInterpolation(glm::vec3 prev, glm::vec3 next, double currentTime)
+{
+    glm::vec3 difference = next - prev;
+    glm::vec3 position = difference / 0.05f * static_cast<float>(currentTime);
+    return position;
+}
+
+bool InterpolationSystem::OnInterpolate(const Events::Interpolate & e)
+{
+    Transform transform;
+    int offset = 0;
+    // Read the data
+    memcpy(&transform.Position, e.DataArray.get() + offset, sizeof(glm::vec3));
+    offset += sizeof(glm::vec3);
+    memcpy(&transform.Orientation, e.DataArray.get() + offset, sizeof(glm::vec3));
+    offset += sizeof(glm::vec3);
+    memcpy(&transform.Scale, e.DataArray.get() + offset, sizeof(glm::vec3));
+
+    // Check if queue already exists
+    if (m_InterpolationPoints.find(e.Entity) != m_InterpolationPoints.end()) { // Did exist, push to queue
+        m_InterpolationPoints[e.Entity].push(transform);
+    } else { // Did not exist, create queue
+        std::queue<Transform> transformQueue;
+        transformQueue.push(transform);
+        m_InterpolationPoints[e.Entity] = transformQueue;
+    }
+    return false;
+}