* Reverted to the old G3D library, however collision still will not compile

* and is therefore commented out.

--HG--
branch : trunk

src/server/collision/BoundingIntervalHierarchy.h

@@ -19,11 +19,11 @@
 #ifndef _BIH_H
 #define _BIH_H
 
-#include "Vector3.h"
-#include "Ray.h"
-#include "AABox.h"
+#include "G3D/Vector3.h"
+#include "G3D/Ray.h"
+#include "G3D/AABox.h"
 
-#include <Define.h>
+#include "Define.h"
 
 #include <stdexcept>
 #include <vector>

src/server/collision/CMakeLists.txt

@@ -24,13 +24,12 @@ SET(collision_STAT_SRCS
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/externals/g3dlite
-  ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib
-  ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include
-  ${CMAKE_SOURCE_DIR}/externals/g3dlite/G3D.lib/include/G3D
   ${CMAKE_SOURCE_DIR}/src/server/shared
   ${CMAKE_SOURCE_DIR}/src/server/shared/Dynamic
   ${CMAKE_SOURCE_DIR}/src/server/collision
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/collision/Maps
+  ${CMAKE_SOURCE_DIR}/src/server/collision/Models
 )
 
 add_library(collision STATIC ${collision_STAT_SRCS})

src/server/collision/Management/VMapManager2.h

@@ -20,8 +20,8 @@
 #define _VMAPMANAGER2_H
 
 #include "IVMapManager.h"
-#include "Utilities/UnorderedMap.h"
-#include "Platform/Define.h"
+#include "Dynamic/UnorderedMap.h"
+#include "Define.h"
 #include <G3D/Vector3.h>
 
 //===========================================================

src/server/collision/Maps/TileAssembler.cpp

@@ -19,7 +19,7 @@
 #include "WorldModel.h"
 #include "TileAssembler.h"
 #include "MapTree.h"
-#include "BIH.h"
+#include "BoundingIntervalHierarchy.h"
 #include "VMapDefinitions.h"
 
 #include <set>