Moved menu code into GUI

Button events are now sent when you click.
2016-02-17 13:44:11 +01:00
parent 8f84a5ddd6
commit 657125b469
19 changed files with 273 additions and 655 deletions
@@ -8,7 +8,6 @@
 #include "Core/EventBroker.h"
 #include "Rendering/Renderer.h"
 #include "Core/InputManager.h"
-#include "GUI/Frame.h"
 #include "Core/World.h"
 #include "Input/InputProxy.h"
 #include "Input/KeyboardInputHandler.h"
@@ -53,7 +52,6 @@ private:
 	IRenderer* m_Renderer;
 	InputManager* m_InputManager;
    InputProxy* m_InputProxy;
-	GUI::Frame* m_FrameStack;
    World* m_World;
    Octree<EntityAABB>* m_OctreeCollision;
    Octree<EntityAABB>* m_OctreeTrigger;