Can add any objects that inherit from AABB into the Octree.

2016-01-19 14:50:46 +01:00
parent 621d935d7a
commit 713ebbe18c
8 changed files with 224 additions and 189 deletions
@@ -13,7 +13,7 @@
 class CollisionSystem : public PureSystem
 {
 public:
-    CollisionSystem(EventBroker* eventBroker, Octree* octree)
+    CollisionSystem(EventBroker* eventBroker, Octree<AABB>* octree)
        : System(eventBroker)
        , PureSystem("Collidable")
        , m_Octree(octree)
@@ -26,7 +26,7 @@ public:
    virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override;

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

    EventRelay<CollisionSystem, Events::KeyUp> m_EKeyUp;