From 765509b51095da7c96cf815e0a44778fc907f429 Mon Sep 17 00:00:00 2001 From: stiffly Date: Mon, 18 Jan 2016 17:34:17 +0100 Subject: [PATCH] Added interpolationsystem to pipeline. --- include/Game/Game.h | 2 +- src/Engine/Network/Client.cpp | 1 + src/Game/Game.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/Game/Game.h b/include/Game/Game.h index dfe1cff6..6614957f 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -20,7 +20,7 @@ #include "Core/EntityFile.h" #include "Rendering/RenderSystem.h" #include "Core/EntityFileParser.h" - +#include "InterpolationSystem.h" // Network #include #include "Network/Network.h" diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp index 9ffd570b..139d15ae 100644 --- a/src/Engine/Network/Client.cpp +++ b/src/Engine/Network/Client.cpp @@ -33,6 +33,7 @@ void Client::Start(World* world, EventBroker* eventBroker) void Client::Update() { + m_EventBroker->Process(); readFromServer(); } diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index ba660a7d..7ccd7fac 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -66,6 +66,7 @@ Game::Game(int argc, char* argv[]) m_SystemPipeline->AddSystem(updateOrderLevel); m_SystemPipeline->AddSystem(updateOrderLevel, m_Renderer); m_SystemPipeline->AddSystem(updateOrderLevel); + m_SystemPipeline->AddSystem(updateOrderLevel); //Collision and TriggerSystem should update after player. ++updateOrderLevel; @@ -119,7 +120,6 @@ void Game::Tick() // Iterate through systems and update world! m_SystemPipeline->Update(m_World, dt); m_Renderer->Update(dt); - m_EventBroker->Process(); GLERROR("Game::Tick m_RenderQueueFactory->Update"); m_Renderer->Draw(*m_RenderFrame);