manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

returned closest point was wrong.

This commit is contained in:
Federico Ponchio 2010-07-15 19:37:59 +00:00
parent ce779c0082
commit 1017656a61
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/space/index/aabb_binary_tree/closest.h
View File

@ -128,12 +128,15 @@ public:
ScalarType closestDist = math::Sqrt(minMaxDist) + std::numeric_limits<ScalarType>::epsilon(); ScalarType closestDist = math::Sqrt(minMaxDist) + std::numeric_limits<ScalarType>::epsilon();
ScalarType closestDistSq = closestDist * closestDist; ScalarType closestDistSq = closestDist * closestDist;
for (NodePtrVector_ci ci=leaves.begin(); ci!=leaves.end(); ++ci) { for (NodePtrVector_ci ci=leaves.begin(); ci!=leaves.end(); ++ci) {
if ((*ci)->ScalarValue() < closestDistSq) { if ((*ci)->ScalarValue() < closestDistSq) {
for (typename TreeType::ObjPtrVectorConstIterator si=(*ci)->oBegin; si!=(*ci)->oEnd; ++si) { for (typename TreeType::ObjPtrVectorConstIterator si=(*ci)->oBegin; si!=(*ci)->oEnd; ++si) {
if (getPointDistance(*(*si), p, closestDist, closestPoint)) { if (getPointDistance(*(*si), p, closestDist, closestPoint)) {
closestDistSq = closestDist * closestDist; closestDistSq = closestDist * closestDist;
closestObject = (*si); closestObject = (*si);
q = closestPoint;
minDist = closestDist;
} }
} }
} }
@ -141,9 +144,6 @@ public:
leaves.clear(); leaves.clear();
q = closestPoint;
minDist = closestDist;
return (closestObject); return (closestObject);
} }