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

bug fix: finalizeSlicedFindPathPartial() did not handle the case of DT_NODE_PARENT_DETACHED at all.

Browse Source
This commit is contained in:
axelrodR 2014-02-27 09:27:32 +02:00
parent c2b2b03b8f
commit 4b43c33ae1
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Detour/Source/DetourNavMeshQuery.cpp
View File

@ -1544,11 +1544,15 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing
} }
// Reverse the path. // Reverse the path.
int prevRay = 0;
do do
{ {
dtNode* next = m_nodePool->getNodeAtIdx(node->pidx); dtNode* next = m_nodePool->getNodeAtIdx(node->pidx);
node->pidx = m_nodePool->getNodeIdx(prev); node->pidx = m_nodePool->getNodeIdx(prev);
prev = node; prev = node;
int nextRay = node->flags & DT_NODE_PARENT_DETACHED; // keep track of whether parent is not adjacent (i.e. due to raycast shortcut)
node->flags = (node->flags & ~DT_NODE_PARENT_DETACHED) | prevRay; // and store it in the reversed path's node
prevRay = nextRay;
node = next; node = next;
} }
while (node); while (node);
@ -1556,14 +1560,32 @@ dtStatus dtNavMeshQuery::finalizeSlicedFindPathPartial(const dtPolyRef* existing
// Store path // Store path
node = prev; node = prev;
do do
{
dtNode* next = m_nodePool->getNodeAtIdx(node->pidx);
dtStatus status = 0;
if (node->flags & DT_NODE_PARENT_DETACHED)
{
float t, normal[3];
int m;
status = raycast(node->id, node->pos, next->pos, m_query.filter, &t, normal, path+n, &m, maxPath-n);
n += m;
// raycast ends on poly boundary and the path might include the next poly boundary.
if (path[n-1] == next->id)
n--; // remove to avoid duplicates
}
else
{ {
path[n++] = node->id; path[n++] = node->id;
if (n >= maxPath) if (n >= maxPath)
status = DT_BUFFER_TOO_SMALL;
}
if (status & DT_STATUS_DETAIL_MASK)
{ {
m_query.status |= DT_BUFFER_TOO_SMALL; m_query.status |= status & DT_STATUS_DETAIL_MASK;
break; break;
} }
node = m_nodePool->getNodeAtIdx(node->pidx); node = next;
} }
while (node); while (node);
} }