fixup! Merge branch 'master' of github.com:teamfisk/AgileBreakOut
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "GUI/TextureFrame.h"
|
||||
#include "GUI/Button.h"
|
||||
#include "Game/EGameStart.h"
|
||||
|
||||
namespace dd
|
||||
{
|
||||
@@ -55,6 +56,8 @@ private:
|
||||
virtual bool OnButtonRelease(const Events::ButtonRelease& event)
|
||||
{
|
||||
if (event.Button == m_SquidoutButton) {
|
||||
Events::GameStart e;
|
||||
EventBroker->Publish(e);
|
||||
m_Parent->Hide();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user