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

Added a missing update of adjacency fields in edges for the add edges

This commit is contained in:
Paolo Cignoni 2017-09-04 14:54:13 +02:00
parent 7d1431f314
commit d1a63e73be
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/complex/allocate.h
View File

@ -287,7 +287,6 @@ public:
*/ */
static EdgeIterator AddEdges(MeshType &m, size_t n, PointerUpdater<EdgePointer> &pu) static EdgeIterator AddEdges(MeshType &m, size_t n, PointerUpdater<EdgePointer> &pu)
{ {
EdgeIterator last;
if(n == 0) return m.edge.end(); if(n == 0) return m.edge.end();
pu.Clear(); pu.Clear();
if(m.edge.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element if(m.edge.empty()) pu.oldBase=0; // if the vector is empty we cannot find the last valid element
@ -298,6 +297,9 @@ public:
m.edge.resize(m.edge.size()+n); m.edge.resize(m.edge.size()+n);
m.en+=int(n); m.en+=int(n);
size_t siz=(size_t)(m.edge.size()-n);
EdgeIterator firstNewEdge = m.edge.begin();
advance(firstNewEdge,siz);
typename std::set<typename MeshType::PointerToAttribute>::iterator ai; typename std::set<typename MeshType::PointerToAttribute>::iterator ai;
for(ai = m.edge_attr.begin(); ai != m.edge_attr.end(); ++ai) for(ai = m.edge_attr.begin(); ai != m.edge_attr.end(); ++ai)
@ -314,22 +316,25 @@ public:
if ((*fi).cFEp(i)!=0) pu.Update((*fi).FEp(i)); if ((*fi).cFEp(i)!=0) pu.Update((*fi).FEp(i));
} }
if(HasVEAdjacency(m)) if(HasVEAdjacency(m)){
for (VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi) for (VertexIterator vi=m.vert.begin(); vi!=m.vert.end(); ++vi)
if(!(*vi).IsD()) if(!(*vi).IsD())
if ((*vi).cVEp()!=0) pu.Update((*vi).VEp()); if ((*vi).cVEp()!=0) pu.Update((*vi).VEp());
for(EdgeIterator ei=m.edge.begin();ei!=firstNewEdge;++ei)
if(!(*ei).IsD())
{
if ((*ei).cVEp(0)!=0) pu.Update((*ei).VEp(0));
if ((*ei).cVEp(1)!=0) pu.Update((*ei).VEp(1));
}
}
if(HasHEAdjacency(m)) if(HasHEAdjacency(m))
for (HEdgeIterator hi=m.hedge.begin(); hi!=m.hedge.end(); ++hi) for (HEdgeIterator hi=m.hedge.begin(); hi!=m.hedge.end(); ++hi)
if(!(*hi).IsD()) if(!(*hi).IsD())
if ((*hi).cHEp()!=0) pu.Update((*hi).HEp()); if ((*hi).cHEp()!=0) pu.Update((*hi).HEp());
} }
size_t siz=(size_t)(m.edge.size()-n);
last = m.edge.begin(); return firstNewEdge;// deve restituire l'iteratore alla prima faccia aggiunta;
advance(last,siz);
return last;// deve restituire l'iteratore alla prima faccia aggiunta;
} }
/** Function to add a single edge to the mesh. and initializing it with two VertexPointer /** Function to add a single edge to the mesh. and initializing it with two VertexPointer