BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup! Merge branch 'master' of github.com:teamfisk/AgileBreakOut

Browse Source
This commit is contained in:
sippeangelo
2015-09-25 03:10:47 +02:00
parent 8b3d9eb842
commit c0f77dd32a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+3 -7
View File
@@ -338,14 +338,10 @@ public:
if (m_GameIsRunning) {
m_World->Update(dt);
}
if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_ENTER)) {
Events::GameStart e;
m_EventBroker->Publish(e);
}
if (glfwGetKey(m_Renderer->Window(), GLFW_KEY_R)) {
ResourceManager::Reload("Shaders/Deferred/3/Fragment.glsl");
}
m_EventBroker->Process<GUI::Frame>();
m_FrameStack->UpdateLayered(dt);
m_FrameStack->DrawLayered(m_RendererQueue);
//TODO Fill up the renderQueue with models (Temp fix)
if (m_GameIsRunning) {
TEMPAddToRenderQueue();