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

corrected bug in closest iterator.. if doesn't find any alement at first cells examinated continue until find some element

This commit is contained in:
Nico Pietroni 2006-10-25 15:59:29 +00:00
parent fe32dbea36
commit a8b6014a73
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
vcg/space/index/space_iterators.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.20 2006/10/25 09:47:53 pietroni
added max dist control and constructor
Revision 1.19 2006/10/02 07:47:57 cignoni Revision 1.19 2006/10/02 07:47:57 cignoni
Reverted to version 1.14 to nullify dangerous marfr960's changes Reverted to version 1.14 to nullify dangerous marfr960's changes
@ -356,8 +359,6 @@ namespace vcg{
explored=to_explore; explored=to_explore;
_UpdateRadius(); _UpdateRadius();
Box3<ScalarType> b3d(p,radius); Box3<ScalarType> b3d(p,radius);
/*b3d.Intersect(Si.bbox);
Si.BoxToIBox(b3d,to_explore);*/
Si.BoxToIBox(b3d,to_explore); Si.BoxToIBox(b3d,to_explore);
Box3i ibox(Point3i(0,0,0),Si.siz-Point3i(1,1,1)); Box3i ibox(Point3i(0,0,0),Si.siz-Point3i(1,1,1));
to_explore.Intersect(ibox); to_explore.Intersect(ibox);
@ -404,20 +405,20 @@ namespace vcg{
///inflate the bbox until find a valid bbox ///inflate the bbox until find a valid bbox
while ((!_NextShell())&&(!End())); while ((!_NextShell())&&(!End()));
if (!_EndGrid()) while ((!End())&& Refresh()&&(!_EndGrid()))
Refresh();///load elements form currect cell _NextShell();
///until don't find an element /////until don't find an element
///that is inside the radius /////that is inside the radius
while ((!End())&&(Dist()>radius)) //while ((!End())&&(Dist()>radius))
{ //{
if ((_NextShell())&&(!_EndGrid())) // if ((_NextShell())&&(!_EndGrid()))
Refresh(); // Refresh();
} //}
//set to the last element ..the nearest ////set to the last element ..the nearest
CurrentElem=Elems.end(); //CurrentElem=Elems.end();
CurrentElem--; //CurrentElem--;
} }
@ -427,7 +428,8 @@ namespace vcg{
///refresh Object found also considering current shere radius, ///refresh Object found also considering current shere radius,
//and object comes from previos that are already in the stack //and object comes from previos that are already in the stack
void Refresh() //return false if no elements find
bool Refresh()
{ {
int ix,iy,iz; int ix,iy,iz;
for( iz = to_explore.min.Z();iz <= to_explore.max.Z(); ++iz) for( iz = to_explore.min.Z();iz <= to_explore.max.Z(); ++iz)
@ -460,24 +462,20 @@ namespace vcg{
} }
std::sort(Elems.begin(),Elems.end()); ////then control if there are more than 1 element
if (Elems.size()>1)
std::sort(Elems.begin(),Elems.end());
CurrentElem=Elems.end(); CurrentElem=Elems.end();
CurrentElem--; if (Elems.size() > 0) {
CurrentElem--;
}
return((Elems.size()==0)||(Dist()>radius));
} }
void operator ++() /*void operator ++()
{ {
/*if (Dist()<=radius)
{
CurrentElem--;
Elems.pop_back();
}
while ((!End())&&(Dist()>radius))
if (_NextShell()&&!_EndGrid())
Refresh();*/
if (Elems.size()>0) if (Elems.size()>0)
{ {
CurrentElem--; CurrentElem--;
@ -486,6 +484,18 @@ namespace vcg{
while ((!End())&&(Dist()>radius)) while ((!End())&&(Dist()>radius))
if (_NextShell()&&!_EndGrid()) if (_NextShell()&&!_EndGrid())
Refresh(); Refresh();
}*/
void operator ++()
{
if (Elems.size()>0)
{
CurrentElem--;
Elems.pop_back();
}
else
while ((!End())&& Refresh()&&(!_EndGrid()))
_NextShell();
} }
ObjType &operator *(){return *((*CurrentElem).elem);} ObjType &operator *(){return *((*CurrentElem).elem);}