diff options
| author | Brian <runningnak3d@gmail.com> | 2010-06-07 18:32:20 -0600 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-06-07 18:32:20 -0600 |
| commit | 1fd70827128177aba3ac1334135fc12422819db0 (patch) | |
| tree | 83355f4e124ef9d8e5ad47f9f904bfb001dcd3f9 /src | |
| parent | 726a76e93aa3f20f4e642a01027f977f368a979e (diff) | |
* Reverted to the old G3D library, however collision still will not compile
* and is therefore commented out.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/collision/BoundingIntervalHierarchy.h | 8 | ||||
| -rw-r--r-- | src/server/collision/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/server/collision/Management/VMapManager2.h | 4 | ||||
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index 2ee4e207c19..d4d41a66d30 100644 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/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> diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt index a67cd8d660a..913ec7ecd01 100644 --- a/src/server/collision/CMakeLists.txt +++ b/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}) diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index 5f03b87b07f..953a8f11fa7 100644 --- a/src/server/collision/Management/VMapManager2.h +++ b/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> //=========================================================== diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index d01b54a7564..0b9780130ed 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/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> |