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

Merge pull request #27 from hgaiser/master

Browse Source 
Add partial path result status for dtCrowdAgent
This commit is contained in:
Mikko Mononen 2014-04-27 19:49:21 +03:00
commit 70ddbdd345
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DetourCrowd/Include/DetourCrowd.h
View File

@ -121,6 +121,9 @@ struct dtCrowdAgent
/// The type of mesh polygon the agent is traversing. (See: #CrowdAgentState) /// The type of mesh polygon the agent is traversing. (See: #CrowdAgentState)
unsigned char state; unsigned char state;
/// True if the agent has valid path (targetState == DT_CROWDAGENT_TARGET_VALID) and the path does not lead to the requested position, else false.
bool partial;
/// The path corridor the agent is using. /// The path corridor the agent is using.
dtPathCorridor corridor; dtPathCorridor corridor;

10
DetourCrowd/Source/DetourCrowd.cpp
View File

@ -538,6 +538,7 @@ int dtCrowd::addAgent(const float* pos, const dtCrowdAgentParams* params)
ag->corridor.reset(ref, nearest); ag->corridor.reset(ref, nearest);
ag->boundary.reset(); ag->boundary.reset();
ag->partial = false;
updateAgentParameters(idx, params); updateAgentParameters(idx, params);
@ -746,6 +747,7 @@ void dtCrowd::updateMoveRequest(const float /*dt*/)
ag->corridor.setCorridor(reqPos, reqPath, reqPathCount); ag->corridor.setCorridor(reqPos, reqPath, reqPathCount);
ag->boundary.reset(); ag->boundary.reset();
ag->partial = false;
if (reqPath[reqPathCount-1] == ag->targetRef) if (reqPath[reqPathCount-1] == ag->targetRef)
{ {
@ -820,6 +822,11 @@ void dtCrowd::updateMoveRequest(const float /*dt*/)
if (dtStatusFailed(status) || !nres) if (dtStatusFailed(status) || !nres)
valid = false; valid = false;
if (dtStatusDetail(status, DT_PARTIAL_RESULT))
ag->partial = true;
else
ag->partial = false;
// Merge result and existing path. // Merge result and existing path.
// The agent might have moved whilst the request is // The agent might have moved whilst the request is
// being processed, so the path may have changed. // being processed, so the path may have changed.
@ -964,6 +971,7 @@ void dtCrowd::checkPathValidity(dtCrowdAgent** agents, const int nagents, const
{ {
// Could not find location in navmesh, set state to invalid. // Could not find location in navmesh, set state to invalid.
ag->corridor.reset(0, agentPos); ag->corridor.reset(0, agentPos);
ag->partial = false;
ag->boundary.reset(); ag->boundary.reset();
ag->state = DT_CROWDAGENT_STATE_INVALID; ag->state = DT_CROWDAGENT_STATE_INVALID;
continue; continue;
@ -1000,6 +1008,7 @@ void dtCrowd::checkPathValidity(dtCrowdAgent** agents, const int nagents, const
{ {
// Failed to reposition target, fail moverequest. // Failed to reposition target, fail moverequest.
ag->corridor.reset(agentRef, agentPos); ag->corridor.reset(agentRef, agentPos);
ag->partial = false;
ag->targetState = DT_CROWDAGENT_TARGET_NONE; ag->targetState = DT_CROWDAGENT_TARGET_NONE;
} }
} }
@ -1392,6 +1401,7 @@ void dtCrowd::update(const float dt, dtCrowdAgentDebugInfo* debug)
if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY) if (ag->targetState == DT_CROWDAGENT_TARGET_NONE || ag->targetState == DT_CROWDAGENT_TARGET_VELOCITY)
{ {
ag->corridor.reset(ag->corridor.getFirstPoly(), ag->npos); ag->corridor.reset(ag->corridor.getFirstPoly(), ag->npos);
ag->partial = false;
} }
} }

3
DetourCrowd/Source/DetourPathQueue.cpp
View File

@ -185,6 +185,7 @@ dtStatus dtPathQueue::getPathResult(dtPathQueueRef ref, dtPolyRef* path, int* pa
if (m_queue[i].ref == ref) if (m_queue[i].ref == ref)
{ {
PathQuery& q = m_queue[i]; PathQuery& q = m_queue[i];
dtStatus details = q.status & DT_STATUS_DETAIL_MASK;
// Free request for reuse. // Free request for reuse.
q.ref = DT_PATHQ_INVALID; q.ref = DT_PATHQ_INVALID;
q.status = 0; q.status = 0;
@ -192,7 +193,7 @@ dtStatus dtPathQueue::getPathResult(dtPathQueueRef ref, dtPolyRef* path, int* pa
int n = dtMin(q.npath, maxPath); int n = dtMin(q.npath, maxPath);
memcpy(path, q.path, sizeof(dtPolyRef)*n); memcpy(path, q.path, sizeof(dtPolyRef)*n);
*pathSize = n; *pathSize = n;
return DT_SUCCESS; return details | DT_SUCCESS;
} }
} }
return DT_FAILURE; return DT_FAILURE;