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

- a lot of int variables converted into size_t ones 

- vectors contained inside Remap class converted from std::vector<int> into std::vector<size_t>
This commit is contained in:
granzuglia 2014-07-07 07:09:07 +00:00
parent 991aa707d9
commit 30a9c6c2fb
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
vcg/complex/append.h
View File

@ -64,7 +64,7 @@ public:
typedef typename ConstMeshRight::FacePointer FacePointerRight; typedef typename ConstMeshRight::FacePointer FacePointerRight;
struct Remap{ struct Remap{
std::vector<int> vert,face,edge, hedge; 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 ){
@ -119,7 +119,7 @@ public:
if(HasFEAdjacency(ml) && HasFEAdjacency(mr)){ if(HasFEAdjacency(ml) && HasFEAdjacency(mr)){
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))]; size_t idx = remap.edge[Index(mr,fr.cFEp(vi))];
if(idx>=0) if(idx>=0)
fl.FEp(vi) = &ml.edge[idx]; fl.FEp(vi) = &ml.edge[idx];
} }
@ -129,7 +129,7 @@ public:
if(HasFFAdjacency(ml) && HasFFAdjacency(mr)){ if(HasFFAdjacency(ml) && HasFFAdjacency(mr)){
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))]; size_t idx = remap.face[Index(mr,fr.cFFp(vi))];
if(idx>=0){ if(idx>=0){
fl.FFp(vi) = &ml.face[idx]; fl.FFp(vi) = &ml.face[idx];
fl.FFi(vi) = fr.cFFi(vi); fl.FFi(vi) = fr.cFFi(vi);
@ -218,27 +218,31 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
// vertex // vertex
remap.vert.resize(mr.vert.size(),-1); remap.vert.resize(mr.vert.size(),-1);
VertexIteratorLeft vp; VertexIteratorLeft vp;
int svn = UpdateSelection<ConstMeshRight>::VertexCount(mr); size_t svn = UpdateSelection<ConstMeshRight>::VertexCount(mr);
if(selected) vp=Allocator<MeshLeft>::AddVertices(ml,svn); if(selected)
else vp=Allocator<MeshLeft>::AddVertices(ml,mr.vn); vp=Allocator<MeshLeft>::AddVertices(ml,int(svn));
else
vp=Allocator<MeshLeft>::AddVertices(ml,mr.vn);
for(VertexIteratorRight vi=mr.vert.begin(); vi!=mr.vert.end(); ++vi) for(VertexIteratorRight vi=mr.vert.begin(); vi!=mr.vert.end(); ++vi)
if(!(*vi).IsD() && (!selected || (*vi).IsS())){ {
int ind=Index(mr,*vi); if(!(*vi).IsD() && (!selected || (*vi).IsS()))
remap.vert[ind]=Index(ml,*vp); {
size_t ind=Index(mr,*vi);
remap.vert[ind]=int(Index(ml,*vp));
++vp; ++vp;
} }
}
// edge // edge
remap.edge.resize(mr.edge.size(),-1); remap.edge.resize(mr.edge.size(),-1);
EdgeIteratorLeft ep; EdgeIteratorLeft ep;
int 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);
else ep=Allocator<MeshLeft>::AddEdges(ml,mr.en); else ep=Allocator<MeshLeft>::AddEdges(ml,mr.en);
for(EdgeIteratorRight ei=mr.edge.begin(); ei!=mr.edge.end(); ++ei) for(EdgeIteratorRight ei=mr.edge.begin(); ei!=mr.edge.end(); ++ei)
if(!(*ei).IsD() && (!selected || (*ei).IsS())){ if(!(*ei).IsD() && (!selected || (*ei).IsS())){
int ind=Index(mr,*ei); size_t ind=Index(mr,*ei);
remap.edge[ind]=Index(ml,*ep); remap.edge[ind]=Index(ml,*ep);
++ep; ++ep;
} }
@ -246,13 +250,13 @@ 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(),-1);
FaceIteratorLeft fp; FaceIteratorLeft fp;
int 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);
else fp=Allocator<MeshLeft>::AddFaces(ml,mr.fn); else fp=Allocator<MeshLeft>::AddFaces(ml,mr.fn);
for(FaceIteratorRight fi=mr.face.begin(); fi!=mr.face.end(); ++fi) for(FaceIteratorRight fi=mr.face.begin(); fi!=mr.face.end(); ++fi)
if(!(*fi).IsD() && (!selected || (*fi).IsS())){ if(!(*fi).IsD() && (!selected || (*fi).IsS())){
int ind=Index(mr,*fi); size_t ind=Index(mr,*fi);
remap.face[ind]=Index(ml,*fp); remap.face[ind]=Index(ml,*fp);
++fp; ++fp;
} }
@ -261,7 +265,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
remap.hedge.resize(mr.hedge.size(),-1); remap.hedge.resize(mr.hedge.size(),-1);
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())){
int ind=Index(mr,*hi); size_t ind=Index(mr,*hi);
assert(remap.hedge[ind]==-1); assert(remap.hedge[ind]==-1);
HEdgeIteratorLeft hp = Allocator<MeshLeft>::AddHEdges(ml,1); HEdgeIteratorLeft hp = Allocator<MeshLeft>::AddHEdges(ml,1);
(*hp).ImportData(*(hi)); (*hp).ImportData(*(hi));
@ -292,7 +296,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
} }
// face // face
const int textureOffset = ml.textures.size(); const size_t textureOffset = ml.textures.size();
bool WTFlag = HasPerWedgeTexCoord(mr) && (textureOffset>0); bool WTFlag = HasPerWedgeTexCoord(mr) && (textureOffset>0);
for(FaceIteratorRight fi=mr.face.begin();fi!=mr.face.end();++fi) for(FaceIteratorRight fi=mr.face.begin();fi!=mr.face.end();++fi)
if(!(*fi).IsD() && (!selected || (*fi).IsS())) if(!(*fi).IsD() && (!selected || (*fi).IsS()))
@ -305,7 +309,7 @@ static void Mesh(MeshLeft& ml, ConstMeshRight& mr, const bool selected = false,
} }
if(WTFlag) if(WTFlag)
for(int i = 0; i < fl.VN(); ++i) for(int i = 0; i < fl.VN(); ++i)
fl.WT(i).n() +=textureOffset; fl.WT(i).n() += short(textureOffset);
fl.ImportData(*fi); fl.ImportData(*fi);
if(adjFlag) ImportFaceAdj(ml,mr,ml.face[remap.face[Index(mr,*fi)]],*fi,remap); if(adjFlag) ImportFaceAdj(ml,mr,ml.face[remap.face[Index(mr,*fi)]],*fi,remap);