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

missing gcc typenames

This commit is contained in:
Paolo Cignoni 2005-09-16 12:02:22 +00:00
parent dc56fe4537
commit edc816917a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vcg/space/index/aabb_binary_tree_search.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2005/09/16 10:04:15 m_di_benedetto
Modified interface, added GetKClosest().
Revision 1.2 2005/09/11 11:46:21 m_di_benedetto Revision 1.2 2005/09/11 11:46:21 m_di_benedetto
First Commit First Commit
@ -63,7 +66,7 @@ template <class OBJTYPE, class SCALARTYPE, class NODEUSERATATYPE>
class AABBBinaryTreeSearch { class AABBBinaryTreeSearch {
public: public:
struct NodeSearchDataType { struct NodeSearchDataType {
typename SCALARTYPE minDist; SCALARTYPE minDist;
}; };
struct NodeAuxDataType { struct NodeAuxDataType {
NodeSearchDataType searchData; NodeSearchDataType searchData;
@ -225,7 +228,7 @@ typename AABBBinaryTreeSearch<OBJTYPE, SCALARTYPE, NODEAUXDATATYPE>::ObjPtr AABB
for (NodePtrVector_ci ci=leaves.begin(); ci!=leaves.end(); ++ci) { for (NodePtrVector_ci ci=leaves.begin(); ci!=leaves.end(); ++ci) {
if ((*ci)->auxData.searchData.minDist < closestDistSq) { if ((*ci)->auxData.searchData.minDist < closestDistSq) {
for (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);
@ -256,7 +259,7 @@ void AABBBinaryTreeSearch<OBJTYPE, SCALARTYPE, NODEAUXDATATYPE>::DepthFirstColle
if (node->IsLeaf()) { if (node->IsLeaf()) {
bool someInserted = true; bool someInserted = true;
for (TreeType::ObjPtrVectorConstIterator si=node->oBegin; si!=node->oEnd; ++si) { for (typename TreeType::ObjPtrVectorConstIterator si=node->oBegin; si!=node->oEnd; ++si) {
ScalarType minDst = (pq.size() >= k) ? (pq.top().minDist) : (std::numeric_limits<ScalarType>::max()); ScalarType minDst = (pq.size() >= k) ? (pq.top().minDist) : (std::numeric_limits<ScalarType>::max());
ClosestObjType cobj; ClosestObjType cobj;
if (getPointDistance(*(*si), p, minDst, cobj.closestPt)) { if (getPointDistance(*(*si), p, minDst, cobj.closestPt)) {