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

Merge pull request #139 from Janiels/fix-113

Browse Source 
Correctly remove off mesh links to other layers
This commit is contained in:
Ben Hymers 2015-12-30 12:05:59 +00:00
commit d6ab8fdf86
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Detour/Include/DetourNavMesh.h
View File

@ -620,7 +620,7 @@ private:
void connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int side); void connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int side);
/// Removes external links at specified side. /// Removes external links at specified side.
void unconnectExtLinks(dtMeshTile* tile, dtMeshTile* target); void unconnectLinks(dtMeshTile* tile, dtMeshTile* target);
// TODO: These methods are duplicates from dtNavMeshQuery, but are needed for off-mesh connection finding. // TODO: These methods are duplicates from dtNavMeshQuery, but are needed for off-mesh connection finding.

16
Detour/Source/DetourNavMesh.cpp
View File

@ -350,7 +350,7 @@ int dtNavMesh::findConnectingPolys(const float* va, const float* vb,
return n; return n;
} }
void dtNavMesh::unconnectExtLinks(dtMeshTile* tile, dtMeshTile* target) void dtNavMesh::unconnectLinks(dtMeshTile* tile, dtMeshTile* target)
{ {
if (!tile || !target) return; if (!tile || !target) return;
@ -363,10 +363,9 @@ void dtNavMesh::unconnectExtLinks(dtMeshTile* tile, dtMeshTile* target)
unsigned int pj = DT_NULL_LINK; unsigned int pj = DT_NULL_LINK;
while (j != DT_NULL_LINK) while (j != DT_NULL_LINK)
{ {
if (tile->links[j].side != 0xff && if (decodePolyIdTile(tile->links[j].ref) == targetNum)
decodePolyIdTile(tile->links[j].ref) == targetNum)
{ {
// Revove link. // Remove link.
unsigned int nj = tile->links[j].next; unsigned int nj = tile->links[j].next;
if (pj == DT_NULL_LINK) if (pj == DT_NULL_LINK)
poly->firstLink = nj; poly->firstLink = nj;
@ -1192,25 +1191,24 @@ dtStatus dtNavMesh::removeTile(dtTileRef ref, unsigned char** data, int* dataSiz
} }
// Remove connections to neighbour tiles. // Remove connections to neighbour tiles.
// Create connections with neighbour tiles.
static const int MAX_NEIS = 32; static const int MAX_NEIS = 32;
dtMeshTile* neis[MAX_NEIS]; dtMeshTile* neis[MAX_NEIS];
int nneis; int nneis;
// Connect with layers in current tile. // Disconnect from other layers in current tile.
nneis = getTilesAt(tile->header->x, tile->header->y, neis, MAX_NEIS); nneis = getTilesAt(tile->header->x, tile->header->y, neis, MAX_NEIS);
for (int j = 0; j < nneis; ++j) for (int j = 0; j < nneis; ++j)
{ {
if (neis[j] == tile) continue; if (neis[j] == tile) continue;
unconnectExtLinks(neis[j], tile); unconnectLinks(neis[j], tile);
} }
// Connect with neighbour tiles. // Disconnect from neighbour tiles.
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
{ {
nneis = getNeighbourTilesAt(tile->header->x, tile->header->y, i, neis, MAX_NEIS); nneis = getNeighbourTilesAt(tile->header->x, tile->header->y, i, neis, MAX_NEIS);
for (int j = 0; j < nneis; ++j) for (int j = 0; j < nneis; ++j)
unconnectExtLinks(neis[j], tile); unconnectLinks(neis[j], tile);
} }
// Reset tile. // Reset tile.