Made TriggerSystem make use of Octree

2016-01-27 13:35:16 +01:00
parent 8bed5194d8
commit 5fcd26cd3e
20 changed files with 145 additions and 130 deletions
@@ -9,11 +9,12 @@
 #include "../Core/EventBroker.h"
 #include "../Core/EKeyUp.h"
 #include "../Core/Octree.h"
+#include "EntityAABB.h"

 class CollisionSystem : public PureSystem
 {
 public:
-    CollisionSystem(World* world, EventBroker* eventBroker, Octree<AABB>* octree)
+    CollisionSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
        : System(world, eventBroker)
        , PureSystem("Collidable")
        , m_Octree(octree)
@@ -26,7 +27,7 @@ public:
    virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& component, double dt) override;

 private:
-    Octree<AABB>* m_Octree;
+    Octree<EntityAABB>* m_Octree;
    bool zPress;

    EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;