Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree

src/Tests/CollisionTest.cpp

@@ -3,7 +3,7 @@
 #include <boost/test/execution_monitor.hpp>
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
-#include "Engine\Core\Collision.h"
+#include "Engine/Collision/Collision.h"
 #include "Engine/Core/AABB.h"
 #include "Engine/Core/Ray.h"
 #include <stdlib.h>//srand

src/Tests/OctTreeTestGameClass.cpp

@@ -15,7 +15,7 @@ Game::Game(int argc, char* argv[]) : someOctTree(AABB(-0.5f*worldSize, 0.5f*worl
     m_RenderQueueFactory = new RenderQueueFactory();
 
     // Create the renderer
-    m_Renderer = new Renderer();
+    m_Renderer = new Renderer(m_EventBroker);
     m_Renderer->SetFullscreen(m_Config->Get<bool>("Video.Fullscreen", false));
     m_Renderer->SetVSYNC(m_Config->Get<bool>("Video.VSYNC", false));
     m_Renderer->SetResolution(Rectangle(

src/Tests/OctTreeTestGameClass.h

@@ -11,7 +11,7 @@
 #include "Rendering/RenderQueueFactory.h"
 
 #include "OctTreeTestHardCodedTestWorld.h"
-#include "Core\Collision.h"
+#include "Collision/Collision.h"
 
 
 class Game

src/Tests/OctTreeTestGameMain.cpp

@@ -3,7 +3,7 @@
 #include <boost/test/execution_monitor.hpp>
 using boost::unit_test_framework::test_suite;
 using boost::unit_test_framework::test_case;
-#include <Engine\Core\Collision.h>
+#include "Engine/Collision/Collision.h"
 #include "Engine/Core/AABB.h"
 #include "Engine/Core/Ray.h"
 #include <stdlib.h>//srand

src/Tests/OldOctTree.cpp

@@ -3,7 +3,7 @@
 #include <bitset>
 
 #include "OldOctTree.h"
-#include "Core/Collision.h"
+#include "Collision/Collision.h"
 #include "Core/World.h"
 #include "Rendering/Camera.h"