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

Compile fixes for VC. Update VC project.

Browse Source
This commit is contained in:
Mikko Mononen 2009-12-03 16:28:27 +00:00
parent a47e3436c9
commit 6a00efb936
5 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Detour/Source/DetourNavMesh.cpp
View File

@ -567,7 +567,7 @@ bool dtNavMesh::closestPointOnPoly(dtPolyRef ref, const float* pos, float* close
{ {
unsigned int salt, it, ip; unsigned int salt, it, ip;
dtDecodePolyId(ref, salt, it, ip); dtDecodePolyId(ref, salt, it, ip);
if (it >= m_maxTiles) return false; if (it >= (unsigned int)m_maxTiles) return false;
if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false; if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false;
const dtMeshHeader* header = m_tiles[it].header; const dtMeshHeader* header = m_tiles[it].header;
@ -605,7 +605,7 @@ bool dtNavMesh::closestPointOnPolyBoundary(dtPolyRef ref, const float* pos, floa
{ {
unsigned int salt, it, ip; unsigned int salt, it, ip;
dtDecodePolyId(ref, salt, it, ip); dtDecodePolyId(ref, salt, it, ip);
if (it >= m_maxTiles) return false; if (it >= (unsigned int)m_maxTiles) return false;
if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false; if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false;
const dtMeshHeader* header = m_tiles[it].header; const dtMeshHeader* header = m_tiles[it].header;

2
Recast/Source/RecastDebugDraw.cpp
View File

@ -888,7 +888,7 @@ void rcDebugDrawPolyMeshDetail(rcDebugDraw* dd, const struct rcPolyMeshDetail& d
dd->end(); dd->end();
// External edges. // External edges.
dd->begin(RC_DRAW_LINES, 2.0f); dd->begin(RC_DRAW_LINES, nve, 2.0f);
const unsigned int cole = RGBA(0,0,0,64); const unsigned int cole = RGBA(0,0,0,64);
for (int i = 0; i < dmesh.nmeshes; ++i) for (int i = 0; i < dmesh.nmeshes; ++i)
{ {

2
Recast/Source/RecastRegion.cpp
View File

@ -1052,7 +1052,7 @@ bool rcBuildRegionsMonotone(rcCompactHeightfield& chf,
const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3); const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
if (srcReg[ai] && (srcReg[ai] & RC_BORDER_REG) == 0) if (srcReg[ai] && (srcReg[ai] & RC_BORDER_REG) == 0)
{ {
unsigned char nr = srcReg[ai]; unsigned short nr = srcReg[ai];
if (!sweeps[previd].nei || sweeps[previd].nei == nr) if (!sweeps[previd].nei || sweeps[previd].nei == nr)
{ {
sweeps[previd].nei = nr; sweeps[previd].nei = nr;

BIN
RecastDemo/Bin/Recast.exe
View File

Binary file not shown.

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

@ -259,6 +259,14 @@
RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h" RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h"
> >
</File> </File>
<File
RelativePath="..\..\..\Detour\Include\DetourNavMesh.h"
>
</File>
<File
RelativePath="..\..\..\Detour\Include\DetourNavMeshBuilder.h"
>
</File>
<File <File
RelativePath="..\..\..\Detour\Include\DetourNode.h" RelativePath="..\..\..\Detour\Include\DetourNode.h"
> >
@ -291,6 +299,14 @@
RelativePath="..\..\..\Detour\Source\DetourDebugDraw.cpp" RelativePath="..\..\..\Detour\Source\DetourDebugDraw.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\Detour\Source\DetourNavMesh.cpp"
>
</File>
<File
RelativePath="..\..\..\Detour\Source\DetourNavMeshBuilder.cpp"
>
</File>
<File <File
RelativePath="..\..\..\Detour\Source\DetourNode.cpp" RelativePath="..\..\..\Detour\Source\DetourNode.cpp"
> >
@ -340,15 +356,19 @@
> >
</File> </File>
<File <File
RelativePath="..\..\Include\Sample_StatMesh.h" RelativePath="..\..\Include\Sample_DynMesh.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Include\Sample_StatMeshSimple.h" RelativePath="..\..\Include\Sample_SoloMesh.h"
> >
</File> </File>
<File <File
RelativePath="..\..\Include\Sample_StatMeshTiled.h" RelativePath="..\..\Include\Sample_SoloMeshSimple.h"
>
</File>
<File
RelativePath="..\..\Include\Sample_SoloMeshTiled.h"
> >
</File> </File>
<File <File
@ -388,15 +408,19 @@
> >
</File> </File>
<File <File
RelativePath="..\..\Source\Sample_StatMesh.cpp" RelativePath="..\..\Source\Sample_DynMesh.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\Source\Sample_StatMeshSimple.cpp" RelativePath="..\..\Source\Sample_SoloMesh.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\Source\Sample_StatMeshTiled.cpp" RelativePath="..\..\Source\Sample_SoloMeshSimple.cpp"
>
</File>
<File
RelativePath="..\..\Source\Sample_SoloMeshTiled.cpp"
> >
</File> </File>
<File <File