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

getNeibours() was accessing wrong agent list.

Browse Source
This commit is contained in:
Mikko Mononen 2011-03-11 17:28:39 +00:00
parent b6a93f063a
commit e238288549
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DetourCrowd/Include/DetourCrowd.h
View File

@ -165,7 +165,8 @@ class dtCrowd
dtNavMeshQuery* m_navquery; dtNavMeshQuery* m_navquery;
int getNeighbours(const float* pos, const float height, const float range, int getNeighbours(const float* pos, const float height, const float range,
const dtCrowdAgent* skip, dtCrowdNeighbour* result, const int maxResult); const dtCrowdAgent* skip, dtCrowdNeighbour* result, const int maxResult,
dtCrowdAgent** agents, const int nagents);
void updateTopologyOptimization(dtCrowdAgent** agents, const int nagents, const float dt); void updateTopologyOptimization(dtCrowdAgent** agents, const int nagents, const float dt);
void updateMoveRequest(const float dt); void updateMoveRequest(const float dt);

7
DetourCrowd/Source/DetourCrowd.cpp
View File

@ -489,7 +489,8 @@ int dtCrowd::getActiveAgents(dtCrowdAgent** agents, const int maxAgents)
int dtCrowd::getNeighbours(const float* pos, const float height, const float range, int dtCrowd::getNeighbours(const float* pos, const float height, const float range,
const dtCrowdAgent* skip, dtCrowdNeighbour* result, const int maxResult) const dtCrowdAgent* skip, dtCrowdNeighbour* result, const int maxResult,
dtCrowdAgent** agents, const int nagents)
{ {
int n = 0; int n = 0;
@ -501,7 +502,7 @@ int dtCrowd::getNeighbours(const float* pos, const float height, const float ran
for (int i = 0; i < nids; ++i) for (int i = 0; i < nids; ++i)
{ {
dtCrowdAgent* ag = &m_agents[ids[i]]; const dtCrowdAgent* ag = agents[ids[i]];
if (ag == skip) continue; if (ag == skip) continue;
@ -800,7 +801,7 @@ void dtCrowd::update(const float dt, dtCrowdAgentDebugInfo* debug)
} }
// Query neighbour agents // Query neighbour agents
ag->nneis = getNeighbours(ag->npos, ag->params.height, ag->params.collisionQueryRange, ag->nneis = getNeighbours(ag->npos, ag->params.height, ag->params.collisionQueryRange,
ag, ag->neis, DT_CROWDAGENT_MAX_NEIGHBOURS); ag, ag->neis, DT_CROWDAGENT_MAX_NEIGHBOURS, agents, nagents);
} }
// Find next corner to steer to. // Find next corner to steer to.