diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-10 18:12:15 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-10 18:12:15 +0400 |
| commit | bdd4aa27b0747bf7bc4af7e23a79b3fbdd3ee5b0 (patch) | |
| tree | 36c6245a6c41ab8201e34056a282fb71b7f9f100 /extern | |
| parent | 322dbc9a0fa7d0e1c82fa2968728cbfc5c536445 (diff) | |
Another set of fixes for recats: osx uses different order of arguments for sort_r
and it's callback.
Also do not use char constants like 'NAVM' which is casting to int.
And added defautl section to switch in KX_NavMeshObject::DrawNavMesh.
Diffstat (limited to 'extern')
3 files changed, 6 insertions, 2 deletions
diff --git a/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h b/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h index 71ee4cb0b51..5a3e04a2074 100644 --- a/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h +++ b/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h @@ -42,7 +42,7 @@ struct dtStatPolyDetail unsigned short ntris; // Number of triangles. }; -const int DT_STAT_NAVMESH_MAGIC = 'NAVM'; +const int DT_STAT_NAVMESH_MAGIC = (('N'<<24) | ('A'<<16) | ('V'<<8) | 'M'); const int DT_STAT_NAVMESH_VERSION = 3; struct dtStatBVNode diff --git a/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h b/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h index d615b1748f0..305c61e5eb5 100644 --- a/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h +++ b/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h @@ -36,7 +36,7 @@ static const int DT_TILE_VERTS_PER_POLYGON = 6; static const int DT_MAX_TILES = 1 << DT_TILE_REF_TILE_BITS; static const int DT_MAX_POLYGONS = 1 << DT_TILE_REF_POLY_BITS; -static const int DT_TILE_NAVMESH_MAGIC = 'NAVT'; +static const int DT_TILE_NAVMESH_MAGIC = (('N'<<24) | ('A'<<16) | ('V'<<8) | 'M'); static const int DT_TILE_NAVMESH_VERSION = 2; // Structure holding the navigation polygon data. diff --git a/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp b/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp index b43346c53e2..8fc3fa833f9 100644 --- a/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp +++ b/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp @@ -97,6 +97,8 @@ static int circumCircle(const float xp, const float yp, #if defined(_MSC_VER) static int ptcmp(void* up, const void *v1, const void *v2) +#elif defined(__APPLE__) +static int ptcmp(void* up, const void *v1, const void *v2) #else static int ptcmp(const void *v1, const void *v2, void* up) #endif @@ -122,6 +124,8 @@ static void delaunay(const int nv, float *verts, rcIntArray& idx, rcIntArray& tr idx[i] = i; #if defined(_MSC_VER) qsort_s(&idx[0], idx.size(), sizeof(int), ptcmp, verts); +#elif defined(__APPLE__) + qsort_r(&idx[0], idx.size(), sizeof(int), verts, ptcmp); #else qsort_r(&idx[0], idx.size(), sizeof(int), ptcmp, verts); #endif |