Merge pull request #37 from teamfisk/OctTree

Oct tree
2016-01-21 09:57:46 +01:00
parent 60037c2849 d1b6fb1259
commit f1a54a89b3
15 changed files with 265 additions and 207 deletions
@@ -47,8 +47,8 @@ private:
    InputProxy* m_InputProxy;
 	GUI::Frame* m_FrameStack;
    World* m_World;
-    Octree* m_OctreeCollision;
-    Octree* m_OctreeFrustrumCulling;
+    Octree<AABB>* m_OctreeCollision;
+    Octree<AABB>* m_OctreeFrustrumCulling;
    SystemPipeline* m_SystemPipeline;
    RenderFrame* m_RenderFrame;
    // Network variables