WIP

include/Engine/Core/EntityWrapper.h

@@ -29,7 +29,7 @@ struct EntityWrapper
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
     bool IsChildOf(EntityWrapper potentialParent);
-    bool Valid();
+    bool Valid() const;
 
     ComponentWrapper operator[](const char* componentName);
     bool operator==(const EntityWrapper& e) const;

include/Engine/Core/EventBroker.h

@@ -5,6 +5,7 @@
 #include <functional>
 #include <list>
 #include <tuple>
+#include <set>
 
 #include "../Common.h"
 #include "Event.h"
@@ -107,7 +108,7 @@ private:
     typedef std::unordered_map<ContextTypeName_t, EventRelays_t> ContextRelays_t;
     ContextRelays_t m_ContextRelays;
     std::vector<BaseEventRelay*> m_RelaysToSubscribe;
-    std::vector<std::tuple<EventID, ContextTypeName_t, EventTypeName_t>> m_RelaysToUnsubscribe;
+    std::unordered_map<BaseEventRelay*, std::tuple<EventID, ContextTypeName_t, EventTypeName_t>> m_RelaysToUnsubscribe;
 
     typedef std::list<std::pair<EventTypeName_t, std::shared_ptr<Event>>> EventQueue_t;
     std::shared_ptr<EventQueue_t> m_EventQueueRead;

include/Engine/Core/Octree.h

@@ -5,9 +5,7 @@
 
 #include "../Common.h"
 #include "AABB.h"
-
-//Fwd declarations.
-class Ray;
+#include "Ray.h"
 
 namespace OctSpace
 {

include/Engine/Core/System.h

@@ -68,7 +68,7 @@ protected:
 
     const std::string m_ComponentType;
 
-    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt) = 0;
+    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cPlayer, double dt) = 0;
 };
 
 class ImpureSystem : public virtual System