Scarfski/recastnavigation
1
0
Fork 0
mirror of https://github.com/recastnavigation/recastnavigation.git synced 2026-08-13 08:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/memononen/recastnavigation

Browse Source
This commit is contained in:
axelrodR
2014-02-16 16:43:37 +02:00
parent 0494d61ddb 19e2d8dbe6
commit dcbfd7c116
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Detour/Source/DetourNavMeshQuery.cpp
View File

@@ -723,13 +723,13 @@ dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* exten
// Find nearest polygon amongst the nearby polygons.
dtPolyRef nearest = 0;
float nearestDistanceSqr = FLT_MAX;
bool nearestOverPoly = false;
for (int i = 0; i < polyCount; ++i)
{
dtPolyRef ref = polys[i];
float closestPtPoly[3];
float diff[3];
bool posOverPoly = false;
float d = 0;
closestPointOnPoly(ref, center, closestPtPoly, &posOverPoly);
// If a point is directly over a polygon and closer than
@@ -740,18 +740,19 @@ dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* exten
const dtMeshTile* tile = 0;
const dtPoly* poly = 0;
m_nav->getTileAndPolyByRefUnsafe(polys[i], &tile, &poly);
if (dtAbs(diff[1]) > tile->header->walkableClimb)
posOverPoly = false;
d = dtAbs(diff[1]) - tile->header->walkableClimb;
d = d > 0 ? d*d : 0;
}
else
{
d = dtVlenSqr(diff);
}
float d = dtVlenSqr(diff);
if (d < nearestDistanceSqr || (!nearestOverPoly && posOverPoly))
if (d < nearestDistanceSqr)
{
if (nearestPt)
dtVcopy(nearestPt, closestPtPoly);
nearestDistanceSqr = d;
nearestOverPoly = posOverPoly;
nearest = ref;
}
}