One hell of a GUI interface (minus graphical)

"how does this even work lol"
2014-05-26 02:37:45 +02:00
parent 07c74ff9f5
commit 22442708cc
34 changed files with 466 additions and 353 deletions
@@ -21,8 +21,9 @@
 class World
 {
 public:
-	World(std::shared_ptr<::EventBroker> eventBroker)
-		: m_EventBroker(eventBroker)
+	World(std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
+		: EventBroker(eventBroker)
+		, ResourceManager(resourceManager)
 		, m_LastEntityID(0) { }
 	~World() { }

@@ -88,11 +89,10 @@ public:

 	std::unordered_map<EntityID, EntityID>* GetEntities() { return &m_EntityParents; }

-	//ResourceManager* GetResourceManager() { return &m_ResourceManager; }
-	std::shared_ptr<::EventBroker> EventBroker() { return m_EventBroker; }
-
 protected:
-	std::shared_ptr<::EventBroker> m_EventBroker;
+	std::shared_ptr<::EventBroker> EventBroker;
+	std::shared_ptr<::ResourceManager> ResourceManager;
+
 	SystemFactory m_SystemFactory;
 	ComponentFactory m_ComponentFactory;