WIP Frame

2014-04-29 13:58:37 +02:00
parent d0211ef8d6
commit 9e8c3161e0
2 changed files with 26 additions and 6 deletions
@@ -2,6 +2,7 @@
 #include <sstream>

 #include "EventBroker.h"
+#include "GUI/Frame.h"
 #include "Renderer.h"
 #include "GameWorld.h"

@@ -15,6 +16,8 @@ public:
 		m_Renderer = std::make_shared<Renderer>();
 		m_Renderer->Initialize();

+		m_UIParent = std::make_shared<GUI::Frame>(0, 0, m_Renderer->Width(), m_Renderer->Height());
+
 		m_World = std::make_shared<GameWorld>(m_EventBroker, m_Renderer);
 		m_World->Initialize();

@@ -38,6 +41,7 @@ public:
 private:
 	std::shared_ptr<EventBroker> m_EventBroker;
 	std::shared_ptr<Renderer> m_Renderer;
+	std::shared_ptr<GUI::Frame> m_UIParent;
 	// TODO: This should ultimately live in GameFrame
 	std::shared_ptr<GameWorld> m_World;