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

fix bug end iterator++

This commit is contained in:
Paolo Cignoni 2006-01-19 14:18:08 +00:00
parent 56dbb91da2
commit f8400e07c4
1 changed files with 156 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vcg/complex/edgemesh/allocate.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.6 2005/05/30 09:43:41 spinelli
vertexIterator sostituito con VertexIterator
Revision 1.5 2005/05/17 21:14:56 ganovelli Revision 1.5 2005/05/17 21:14:56 ganovelli
some typecast (crs4) some typecast (crs4)
@ -99,6 +102,7 @@ static VertexIterator AddVertices(MeshType &m,int n, PointerUpdater<VertexPointe
if(m.vert.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element if(m.vert.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element
else pu.oldBase=&*m.vert.begin(); else pu.oldBase=&*m.vert.begin();
for(int i=0; i<n; ++i) for(int i=0; i<n; ++i)
{ {
m.vert.push_back(MeshType::VertexType()); m.vert.push_back(MeshType::VertexType());
@ -117,16 +121,16 @@ static VertexIterator AddVertices(MeshType &m,int n, PointerUpdater<VertexPointe
pu.Update((*ei).V(0)); pu.Update((*ei).V(0));
pu.Update((*ei).V(1)); pu.Update((*ei).V(1));
} }
}
// e poiche' lo spazio e' cambiato si ricalcola anche last da zero // e poiche' lo spazio e' cambiato si ricalcola anche last da zero
unsigned int siz=m.vert.size()-n; unsigned int siz=(unsigned int)m.vert.size()-n;
if(last!=(VertexIterator)0) //if(last!=(VertexIterator)0)
{ //{
last = m.vert.begin(); last = m.vert.begin();
advance(last,siz); advance(last,siz);
} //}
else last=m.vert.begin(); //else last=m.vert.begin();
}
return last;// deve restituire l'iteratore alla prima faccia aggiunta; return last;// deve restituire l'iteratore alla prima faccia aggiunta;
} }
@ -150,20 +154,22 @@ static EdgeIterator AddEdges(MeshType &m, int n)
*/ */
static EdgeIterator AddEdges(MeshType &m, int n, PointerUpdater<EdgePointer> &pu) static EdgeIterator AddEdges(MeshType &m, int n, PointerUpdater<EdgePointer> &pu)
{ {
EdgeIterator last=(EdgeIterator)0; EdgeIterator last=m.edges.end();
pu.Clear(); pu.Clear();
if(m.edges.empty()) { if(m.edges.empty()) {
pu.oldBase=0; // if the vector is empty we cannot find the last valid element pu.oldBase=0; // if the vector is empty we cannot find the last valid element
last=0; //last=0;
} else { } else {
pu.oldBase=&*m.edges.begin(); pu.oldBase=&*m.edges.begin();
last=m.edges.end(); last=m.edges.end();
} }
for(int i=0; i<n; ++i)
m.edges.resize(m.edges.size()+n);
/*for(int i=0; i<n; ++i)
{ {
m.edges.push_back(MeshType::EdgeType()); m.edges.push_back(MeshType::EdgeType());
m.edges.back().ClearFlags(); m.edges.back().ClearFlags();
} }*/
m.en+=n; m.en+=n;
@ -188,15 +194,16 @@ static EdgeIterator AddEdges(MeshType &m, int n, PointerUpdater<EdgePointer> &pu
if(VertexType::HasVEAdjacency()) if(VertexType::HasVEAdjacency())
pu.Update((*vi).Ep()); pu.Update((*vi).Ep());
} }
}
// e poiche' lo spazio e' cambiato si ricalcola anche last da zero // e poiche' lo spazio e' cambiato si ricalcola anche last da zero
unsigned int siz=m.edges.size()-n; unsigned int siz=(unsigned int)m.edges.size()-(unsigned int)n;
if(last!=(EdgeIterator)0) //if(last!=(EdgeIterator)0)
{ // {
last = m.edges.begin(); last = m.edges.begin();
advance(last,siz); advance(last,siz);
} // }
else last=m.edges.begin(); //else last=m.edges.begin();
}
return last; return last;
} }