Merge remote-tracking branch 'origin/master' into Forward+

2016-01-15 11:02:27 +01:00
parent ecf524eb4e 627108c6ee
commit 14bc850fab
7 changed files with 126 additions and 124 deletions
@@ -31,6 +31,7 @@ Game::Game(int argc, char* argv[])
        ));
    m_Renderer->Initialize();
    //m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get<float>("Video.FOV", 90.f)));
+    m_RenderFrame = new RenderFrame();

    // Create input manager
    m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker);
@@ -57,8 +58,6 @@ Game::Game(int argc, char* argv[])
    //SO MUCH TEMP PLEASE REMOVE ME OMFG VIKTOR HELP
    m_Renderer->m_World = m_World;

-    m_RenderFrame = new RenderFrame();
-
    // Create system pipeline
    m_SystemPipeline = new SystemPipeline(m_EventBroker);
    
@@ -74,7 +73,6 @@ Game::Game(int argc, char* argv[])
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel);
    m_SystemPipeline->AddSystem<TriggerSystem>(updateOrderLevel);
-
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);