server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to win32 version.

Browse Source
This commit is contained in:
Mikko Mononen 2009-04-11 17:59:15 +00:00
parent a2a85ede2b
commit dac9bc0f64
4 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Detour/Source/DetourStatNavMesh.cpp
View File

@ -467,7 +467,7 @@ public:
inline void modify(dtNode* node) inline void modify(dtNode* node)
{ {
for (unsigned i = 0; i < m_size; ++i) for (int i = 0; i < m_size; ++i)
{ {
if (m_heap[i] == node) if (m_heap[i] == node)
{ {
@ -1101,7 +1101,7 @@ int dtStatNavMesh::findPolysAround(dtPolyRef centerRef, const float* centerPos,
startNode->flags = dtNode::OPEN; startNode->flags = dtNode::OPEN;
m_openList->push(startNode); m_openList->push(startNode);
unsigned n = 0; int n = 0;
if (n < maxResult) if (n < maxResult)
{ {
if (resultRef) if (resultRef)
@ -1224,7 +1224,7 @@ int dtStatNavMesh::queryPolygons(const float* center, const float* extents,
bmax[2] = (unsigned short)(ics * maxz + 1) | 1; bmax[2] = (unsigned short)(ics * maxz + 1) | 1;
// Traverse tree // Traverse tree
unsigned n = 0; int n = 0;
while (node < end) while (node < end)
{ {
bool overlap = checkOverlapBox(bmin, bmax, node->bmin, node->bmax); bool overlap = checkOverlapBox(bmin, bmax, node->bmin, node->bmax);

2
Detour/Source/DetourStatNavMeshBuilder.cpp
View File

@ -72,7 +72,7 @@ void calcExtends(BVItem* items, int nitems, int imin, int imax,
bmax[1] = items[imin].bmax[1]; bmax[1] = items[imin].bmax[1];
bmax[2] = items[imin].bmax[2]; bmax[2] = items[imin].bmax[2];
for (unsigned i = imin+1; i < imax; ++i) for (int i = imin+1; i < imax; ++i)
{ {
const BVItem& it = items[i]; const BVItem& it = items[i];
if (it.bmin[0] < bmin[0]) bmin[0] = it.bmin[0]; if (it.bmin[0] < bmin[0]) bmin[0] = it.bmin[0];

BIN
RecastDemo/Bin/Recast.exe
View File

Binary file not shown.

28
RecastDemo/Build/VC9/Recast.vcproj
View File

@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Recast\Include;$(NOINHERIT)" AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;$(NOINHERIT)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -117,7 +117,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Recast\Include;$(NOINHERIT)" AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;$(NOINHERIT)"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -180,6 +180,18 @@
RelativePath="..\..\Source\demo.cpp" RelativePath="..\..\Source\demo.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\Detour\Source\DetourDebugDraw.cpp"
>
</File>
<File
RelativePath="..\..\..\Detour\Source\DetourStatNavMesh.cpp"
>
</File>
<File
RelativePath="..\..\..\Detour\Source\DetourStatNavMeshBuilder.cpp"
>
</File>
<File <File
RelativePath="..\..\Source\glfont.cpp" RelativePath="..\..\Source\glfont.cpp"
> >
@ -234,6 +246,18 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h"
>
</File>
<File
RelativePath="..\..\..\Detour\Include\DetourStatNavMesh.h"
>
</File>
<File
RelativePath="..\..\..\Detour\Include\DetourStatNavMeshBuilder.h"
>
</File>
<File <File
RelativePath="..\..\Include\glfont.h" RelativePath="..\..\Include\glfont.h"
> >