Moved menu code into GUI

Button events are now sent when you click.

src/Engine/GUI/ButtonSystem.cpp

@@ -0,0 +1,78 @@
+#include "GUI/ButtonSystem.h"
+
+ButtonSystem::ButtonSystem(SystemParams params, IRenderer* renderer)
+    : System(params)
+    , PureSystem("Button")
+    , m_Renderer(renderer)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &ButtonSystem::OnMousePress);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &ButtonSystem::OnMouseRelease);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseLock, &ButtonSystem::OnMouseLock);
+    EVENT_SUBSCRIBE_MEMBER(m_EMouseUnlock, &ButtonSystem::OnMouseUnlock);
+}
+
+
+bool ButtonSystem::OnMouseLock(const Events::LockMouse& e)
+{
+    m_MouseIsLocked = true;
+    return true;
+}
+
+
+bool ButtonSystem::OnMouseUnlock(const Events::UnlockMouse& e)
+{
+    m_MouseIsLocked = false;
+    return true;
+}
+
+
+bool ButtonSystem::OnMousePress(const Events::MousePress& e)
+{
+    if (e.Button == GLFW_MOUSE_BUTTON_1 && !m_MouseIsLocked) {
+        m_PickData = m_Renderer->Pick(glm::vec2(e.X, e.Y));
+        if (m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
+            if(m_World->HasComponent(m_PickData.Entity, "Button")) {
+                //Entity is a button, save it and send pressed event.
+
+                m_PickEntity = EntityWrapper(m_World, m_PickData.Entity);
+
+                //You have clicked on a button entity, send pressed event.
+                Events::ButtonPressed ePressed;
+                ePressed.EntityName = m_PickEntity.Name();
+                m_EventBroker->Publish(ePressed);
+            }
+        }
+    }
+    return true;
+}
+
+bool ButtonSystem::OnMouseRelease(const Events::MouseRelease& e)
+{
+    if(!m_MouseIsLocked) {
+        //Mouse is not locked, send release event.
+        Events::ButtonReleased eReleased;
+        m_EventBroker->Publish(eReleased);
+        m_PickData = m_Renderer->Pick(glm::vec2(e.X, e.Y));
+        if(m_PickData.Entity != EntityID_Invalid && m_PickData.World == m_World) {
+            if(m_World->HasComponent(m_PickData.Entity, "Button")) {
+                EntityWrapper ent = EntityWrapper(m_World, m_PickData.Entity);
+                if (ent == m_PickEntity) {
+                    //The entity you released the mouse button on is the same as you pressed it on. "Clicked"
+                    Events::ButtonClicked eClicked;
+                    eClicked.EntityName = m_PickEntity.Name();
+                    m_EventBroker->Publish(eClicked);
+                }
+            }
+        }
+    }
+    return true;
+}
+
+void ButtonSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cHealth, double dt)
+{
+
+}
+
+
+
+   

src/Engine/GUI/MainMenuSystem.cpp

@@ -0,0 +1,37 @@
+#include "GUI/MainMenuSystem.h"
+
+MainMenuSystem::MainMenuSystem(SystemParams params, IRenderer* renderer)
+    : System(params)
+    , ImpureSystem()
+    , m_Renderer(renderer)
+{
+    EVENT_SUBSCRIBE_MEMBER(m_EPressed, &MainMenuSystem::OnButtonPress);
+    EVENT_SUBSCRIBE_MEMBER(m_EReleased, &MainMenuSystem::OnButtonRelease);
+    EVENT_SUBSCRIBE_MEMBER(m_EClicked, &MainMenuSystem::OnButtonClick);
+}
+
+void MainMenuSystem::Update(double dt)
+{
+
+}
+
+bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
+{
+    printf("\nClicked: %s", e.EntityName);
+    return true;
+}
+
+bool MainMenuSystem::OnButtonRelease(const Events::ButtonReleased& e)
+{
+    printf("\nReleased");
+
+    return true;
+}
+
+bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
+{
+    printf("\nPressed: %s", e.EntityName);
+
+    return true;
+}
+

src/Game/Game.cpp

@@ -26,6 +26,8 @@
 #include "Network/MultiplayerSnapshotFilter.h"
 #include "Game/Systems/AmmunitionHUDSystem.h"
 #include "Game/Systems/KillFeedSystem.h"
+#include "GUI/ButtonSystem.h"
+#include "GUI/MainMenuSystem.h"
 
 
 Game::Game(int argc, char* argv[])
@@ -72,11 +74,6 @@ Game::Game(int argc, char* argv[])
     m_InputProxy->AddHandler<MouseInputHandler>();
     m_InputProxy->LoadBindings("Input.ini");
 
-    // Create the root level GUI frame
-    m_FrameStack = new GUI::Frame(m_EventBroker);
-    m_FrameStack->Width = m_Renderer->Resolution().Width;
-    m_FrameStack->Height = m_Renderer->Resolution().Height;
-
     // Create a world
     m_World = new World(m_EventBroker);
     std::string mapToLoad = m_Config->Get<std::string>("Debug.LoadMap", "");
@@ -132,6 +129,8 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<DamageIndicatorSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<AmmunitionHUDSystem>(updateOrderLevel);
     m_SystemPipeline->AddSystem<KillFeedSystem>(updateOrderLevel);
+    m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
+    m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
     // Populate Octree with collidables
     ++updateOrderLevel;
     m_SystemPipeline->AddSystem<FillOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
@@ -168,7 +167,6 @@ Game::~Game()
         delete m_NetworkServer;
     }
     delete m_World;
-    delete m_FrameStack;
     delete m_InputProxy;
     delete m_InputManager;
     delete m_RenderFrame;