[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40098] trunk/blender: Another set of fixes for recats: osx uses different order of arguments for sort_r

[Sergey Sharybin]

Revision: 40098
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40098
Author:   nazgul
Date:     2011-09-10 14:12:15 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
    trunk/blender/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
    trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    trunk/blender/source/blender/editors/util/navmesh_conversion.cpp
    trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp

Modified: trunk/blender/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h
===================================================================
--- trunk/blender/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h	2011-09-10 13:36:27 UTC (rev 40097)
+++ trunk/blender/extern/recastnavigation/Detour/Include/DetourStatNavMesh.h	2011-09-10 14:12:15 UTC (rev 40098)
@@ -42,7 +42,7 @@
 	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

Modified: trunk/blender/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
===================================================================
--- trunk/blender/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h	2011-09-10 13:36:27 UTC (rev 40097)
+++ trunk/blender/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h	2011-09-10 14:12:15 UTC (rev 40098)
@@ -36,7 +36,7 @@
 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.

Modified: trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp	2011-09-10 13:36:27 UTC (rev 40097)
+++ trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp	2011-09-10 14:12:15 UTC (rev 40098)
@@ -97,6 +97,8 @@
 
 #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 @@
 		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

Modified: trunk/blender/source/blender/editors/util/navmesh_conversion.cpp
===================================================================
--- trunk/blender/source/blender/editors/util/navmesh_conversion.cpp	2011-09-10 13:36:27 UTC (rev 40097)
+++ trunk/blender/source/blender/editors/util/navmesh_conversion.cpp	2011-09-10 14:12:15 UTC (rev 40098)
@@ -280,6 +280,8 @@
 };
 #if defined(_MSC_VER)
 static int compareByData(void* data, const void * a, const void * b)
+#elif defined(__APPLE__)
+static int compareByData(void* data, const void * a, const void * b)
 #else
 static int compareByData(const void * a, const void * b, void* data)
 #endif
@@ -312,6 +314,8 @@
 	context.trisToFacesMap = trisToFacesMap;
 #if defined(_MSC_VER)
 	qsort_s(trisMapping, ntris, sizeof(int), compareByData, &context);
+#elif defined(__APPLE__)
+	qsort_r(trisMapping, ntris, sizeof(int), &context, compareByData);
 #else
 	qsort_r(trisMapping, ntris, sizeof(int), compareByData, &context);
 #endif

Modified: trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp	2011-09-10 13:36:27 UTC (rev 40097)
+++ trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp	2011-09-10 14:12:15 UTC (rev 40098)
@@ -520,6 +520,9 @@
 			}
 		}
 		break;
+	default:
+		/* pass */
+		break;
 	}
 }