Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Samarin <nicks1987@bigmir.net>2010-05-19 05:42:17 +0400
committerNick Samarin <nicks1987@bigmir.net>2010-05-19 05:42:17 +0400
commit56784fcde9e4a4ff1553bf555e66b59208c90b3c (patch)
treecbfe67fb5ee642fd6c9f5656806a63e4bbd70cc0 /extern/recastnavigation
parent34058faa0ef08f85c89f920298d54849a55b6052 (diff)
added converting mesh of game object to Detour StatNavMesh (game object is defined by property "navmesh")
Diffstat (limited to 'extern/recastnavigation')
-rw-r--r--extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h4
-rw-r--r--extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp2
-rw-r--r--extern/recastnavigation/Recast/Include/Recast.h1
-rw-r--r--extern/recastnavigation/Recast/Source/RecastMesh.cpp2
4 files changed, 7 insertions, 2 deletions
diff --git a/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h b/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
index 3b8f7519b2f..03c79c429e7 100644
--- a/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
+++ b/extern/recastnavigation/Detour/Include/DetourStatNavMeshBuilder.h
@@ -26,4 +26,8 @@ bool dtCreateNavMeshData(const unsigned short* verts, const int nverts,
const unsigned char* dtris, const int ndtris,
unsigned char** outData, int* outDataSize);
+int createBVTree(const unsigned short* verts, const int nverts,
+ const unsigned short* polys, const int npolys, const int nvp,
+ float cs, float ch, int nnodes, dtStatBVNode* nodes);
+
#endif // DETOURSTATNAVMESHBUILDER_H \ No newline at end of file
diff --git a/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp b/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
index a2bfb94edbc..2ca455fb53d 100644
--- a/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
+++ b/extern/recastnavigation/Detour/Source/DetourStatNavMeshBuilder.cpp
@@ -160,7 +160,7 @@ static void subdivide(BVItem* items, int nitems, int imin, int imax, int& curNod
}
}
-static int createBVTree(const unsigned short* verts, const int nverts,
+/*static*/ int createBVTree(const unsigned short* verts, const int nverts,
const unsigned short* polys, const int npolys, const int nvp,
float cs, float ch,
int nnodes, dtStatBVNode* nodes)
diff --git a/extern/recastnavigation/Recast/Include/Recast.h b/extern/recastnavigation/Recast/Include/Recast.h
index 5fe5447ab7c..f25ab47f8fa 100644
--- a/extern/recastnavigation/Recast/Include/Recast.h
+++ b/extern/recastnavigation/Recast/Include/Recast.h
@@ -496,5 +496,6 @@ bool rcBuildPolyMeshDetail(const rcPolyMesh& mesh, const rcCompactHeightfield& c
bool rcMergePolyMeshDetails(rcPolyMeshDetail** meshes, const int nmeshes, rcPolyMeshDetail& mesh);
+bool buildMeshAdjacency(unsigned short* polys, const int npolys, const int nverts, const int vertsPerPoly);
#endif // RECAST_H
diff --git a/extern/recastnavigation/Recast/Source/RecastMesh.cpp b/extern/recastnavigation/Recast/Source/RecastMesh.cpp
index 0bcca9314c6..45ed4a2fdc6 100644
--- a/extern/recastnavigation/Recast/Source/RecastMesh.cpp
+++ b/extern/recastnavigation/Recast/Source/RecastMesh.cpp
@@ -32,7 +32,7 @@ struct rcEdge
unsigned short poly[2];
};
-static bool buildMeshAdjacency(unsigned short* polys, const int npolys,
+/*static */bool buildMeshAdjacency(unsigned short* polys, const int npolys,
const int nverts, const int vertsPerPoly)
{
// Based on code by Eric Lengyel from: