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

Converted the remap structure of the append class to keep indexes as size_t element instead of int

This commit is contained in:
Paolo Cignoni 2014-07-12 11:43:01 +00:00
parent 4cb1fbaaf8
commit d879f84302
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vcg/complex/append.h
View File

@ -67,7 +67,8 @@ public:
typedef typename ConstMeshRight::FacePointer FacePointerRight; typedef typename ConstMeshRight::FacePointer FacePointerRight;
struct Remap{ struct Remap{
std::vector<int> vert,face,edge, hedge; static size_t InvalidIndex() { return std::numeric_limits<size_t>::max(); }
std::vector<size_t> vert,face,edge, hedge;
}; };
static void ImportVertexAdj(MeshLeft &ml, ConstMeshRight &mr, VertexLeft &vl, VertexRight &vr, Remap &remap ){ static void ImportVertexAdj(MeshLeft &ml, ConstMeshRight &mr, VertexLeft &vl, VertexRight &vr, Remap &remap ){
@ -123,7 +124,7 @@ public:
assert(fl.VN() == fr.VN()); assert(fl.VN() == fr.VN());
for( int vi = 0; vi < fl.VN(); ++vi ){ for( int vi = 0; vi < fl.VN(); ++vi ){
int idx = remap.edge[Index(mr,fr.cFEp(vi))]; int idx = remap.edge[Index(mr,fr.cFEp(vi))];
if(idx>=0) if(idx!=Remap::InvalidIndex())
fl.FEp(vi) = &ml.edge[idx]; fl.FEp(vi) = &ml.edge[idx];
} }
} }
@ -133,7 +134,7 @@ public:
assert(fl.VN() == fr.VN()); assert(fl.VN() == fr.VN());
for( int vi = 0; vi < fl.VN(); ++vi ){ for( int vi = 0; vi < fl.VN(); ++vi ){
int idx = remap.face[Index(mr,fr.cFFp(vi))]; int idx = remap.face[Index(mr,fr.cFFp(vi))];
if(idx>=0){ if(idx!=Remap::InvalidIndex()){
fl.FFp(vi) = &ml.face[idx]; fl.FFp(vi) = &ml.face[idx];
fl.FFi(vi) = fr.cFFi(vi); fl.FFi(vi) = fr.cFFi(vi);
} }
@ -219,7 +220,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
Remap remap; Remap remap;
// vertex // vertex
remap.vert.resize(mr.vert.size(),-1); remap.vert.resize(mr.vert.size(), Remap::InvalidIndex());
VertexIteratorLeft vp; VertexIteratorLeft vp;
size_t svn = UpdateSelection<ConstMeshRight>::VertexCount(mr); size_t svn = UpdateSelection<ConstMeshRight>::VertexCount(mr);
if(selected) if(selected)
@ -237,7 +238,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
} }
} }
// edge // edge
remap.edge.resize(mr.edge.size(),-1); remap.edge.resize(mr.edge.size(), Remap::InvalidIndex());
EdgeIteratorLeft ep; EdgeIteratorLeft ep;
size_t sen = UpdateSelection<ConstMeshRight>::EdgeCount(mr); size_t sen = UpdateSelection<ConstMeshRight>::EdgeCount(mr);
if(selected) ep=Allocator<MeshLeft>::AddEdges(ml,sen); if(selected) ep=Allocator<MeshLeft>::AddEdges(ml,sen);
@ -251,7 +252,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
} }
// face // face
remap.face.resize(mr.face.size(),-1); remap.face.resize(mr.face.size(), Remap::InvalidIndex());
FaceIteratorLeft fp; FaceIteratorLeft fp;
size_t sfn = UpdateSelection<ConstMeshRight>::FaceCount(mr); size_t sfn = UpdateSelection<ConstMeshRight>::FaceCount(mr);
if(selected) fp=Allocator<MeshLeft>::AddFaces(ml,sfn); if(selected) fp=Allocator<MeshLeft>::AddFaces(ml,sfn);
@ -265,11 +266,11 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
} }
// hedge // hedge
remap.hedge.resize(mr.hedge.size(),-1); remap.hedge.resize(mr.hedge.size(),Remap::InvalidIndex());
for(HEdgeIteratorRight hi=mr.hedge.begin(); hi!=mr.hedge.end(); ++hi) for(HEdgeIteratorRight hi=mr.hedge.begin(); hi!=mr.hedge.end(); ++hi)
if(!(*hi).IsD() && (!selected || (*hi).IsS())){ if(!(*hi).IsD() && (!selected || (*hi).IsS())){
size_t ind=Index(mr,*hi); size_t ind=Index(mr,*hi);
assert(remap.hedge[ind]==-1); assert(remap.hedge[ind]==Remap::InvalidIndex());
HEdgeIteratorLeft hp = Allocator<MeshLeft>::AddHEdges(ml,1); HEdgeIteratorLeft hp = Allocator<MeshLeft>::AddHEdges(ml,1);
(*hp).ImportData(*(hi)); (*hp).ImportData(*(hi));
remap.hedge[ind]=Index(ml,*hp); remap.hedge[ind]=Index(ml,*hp);