Merge branch 'master' into Networking

This commit is contained in:
stiffly
2015-12-10 17:26:01 +01:00
7 changed files with 138 additions and 37 deletions
+2 -1
View File
@@ -16,7 +16,7 @@ Game::Game(int argc, char* argv[])
m_RenderQueueFactory = new RenderQueueFactory();
// Create the renderer
m_Renderer = new Renderer();
m_Renderer = new Renderer(m_EventBroker);
m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
m_Renderer->SetResolution(Rectangle::Rectangle(
@@ -80,6 +80,7 @@ void Game::Tick()
// DO SYSTEM SHIT HERE
m_EventBroker->Process<Client>();
testTick(dt);
m_Renderer->Update(dt);
m_RenderQueueFactory->Update(m_World);
m_Renderer->Update(dt);