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

corrected bug on closest Iterator

This commit is contained in:
Nico Pietroni 2005-10-05 17:04:45 +00:00
parent b61d0de3b6
commit f0724dd9e9
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,7 @@ namespace vcg{
///control the end of scanning ///control the end of scanning
bool _EndGrid() bool _EndGrid()
{ {
if ((explored.min<=vcg::Point3i(0,0,0))&&(explored.max>=Si.siz-vcg::Point3i(1,1,1))) if ((explored.min==vcg::Point3i(0,0,0))&&(explored.max==Si.siz-vcg::Point3i(1,1,1)))
end =true; end =true;
return end; return end;
} }
@ -303,6 +303,8 @@ 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);
@ -335,11 +337,14 @@ namespace vcg{
///initialize the Itarator ///initialize the Itarator
void Init(CoordType _p,const ScalarType &_max_dist) void Init(CoordType _p,const ScalarType &_max_dist)
{ {
explored.SetNull();
to_explore.SetNull();
p=_p; p=_p;
max_dist=_max_dist; max_dist=_max_dist;
Elems.clear(); Elems.clear();
end=false; end=false;
tm.UnMarkAll(); tm.UnMarkAll();
//step_size=Si.voxel.X();
step_size=Si.voxel.Norm(); step_size=Si.voxel.Norm();
radius=0; radius=0;
@ -373,12 +378,14 @@ namespace vcg{
{ {
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)
for(iy = to_explore.min.Y(); iy <=to_explore.max.Y(); ++iy) for(iy =to_explore.min.Y(); iy <=to_explore.max.Y(); ++iy)
for(ix = to_explore.min.X(); ix <= to_explore.max.X();++ix) for(ix =to_explore.min.X(); ix <= to_explore.max.X();++ix)
{ {
if(ix<explored.min[0] || ix>explored.max[0] || // this test is to avoid to re-process already analyzed cells. // this test is to avoid to re-process already analyzed cells.
if((explored.IsNull())||
(ix<explored.min[0] || ix>explored.max[0] ||
iy<explored.min[1] || iy>explored.max[1] || iy<explored.min[1] || iy>explored.max[1] ||
iz<explored.min[2] || iz>explored.max[2] ) iz<explored.min[2] || iz>explored.max[2] ))
{ {
Spatial_Idexing::CellIterator first,last,l; Spatial_Idexing::CellIterator first,last,l;
@ -408,17 +415,24 @@ namespace vcg{
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--;
Elems.pop_back(); Elems.pop_back();
} }
while ((!End())&&(Dist()>radius)) while ((!End())&&(Dist()>radius))
{
if (_NextShell()&&!_EndGrid()) if (_NextShell()&&!_EndGrid())
Refresh(); Refresh();
}
} }
ObjType &operator *(){return *((*CurrentElem).elem);} ObjType &operator *(){return *((*CurrentElem).elem);}