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

ImportVertex removed (use ImportLocal), ImportFace cleaned up 

Bug in version of Append for selected faces removed
This commit is contained in:
ganovelli 2008-08-07 16:19:31 +00:00
parent 96e89673ec
commit 085e19d121
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vcg/complex/trimesh/append.h
View File

@ -78,23 +78,13 @@ public:
typedef typename MeshRight::FaceIterator FaceIteratorRight; typedef typename MeshRight::FaceIterator FaceIteratorRight;
typedef typename MeshRight::FacePointer FacePointerRight; typedef typename MeshRight::FacePointer FacePointerRight;
static void ImportVertex(VertexLeft &vl, VertexRight &vr)
{
vl.P().Import(vr.P());
if(vl.HasNormal() && vr.HasNormal()) vl.N()=vr.N();
if(vl.HasColor() && vr.HasColor()) vl.C()=vr.C();
if(vl.HasQuality() && vr.HasQuality()) vl.Q()=vr.Q();
if(vl.HasTexCoord() && vr.HasTexCoord()) vl.T()=vr.T();
}
static void ImportFace(MeshLeft &ml, MeshRight &mr, FaceLeft &fl, FaceRight &fr, std::vector<int> &remap) static void ImportFace(MeshLeft &ml, MeshRight &mr, FaceLeft &fl, FaceRight &fr, std::vector<int> &remap)
{ {
fl.ImportLocal(fr);
fl.V(0)=&ml.vert[remap[ Index(mr,fr.V(0))]]; fl.V(0)=&ml.vert[remap[ Index(mr,fr.V(0))]];
fl.V(1)=&ml.vert[remap[ Index(mr,fr.V(1))]]; fl.V(1)=&ml.vert[remap[ Index(mr,fr.V(1))]];
fl.V(2)=&ml.vert[remap[ Index(mr,fr.V(2))]]; fl.V(2)=&ml.vert[remap[ Index(mr,fr.V(2))]];
if(HasPerFaceNormal(mr) && HasPerFaceNormal(ml)) fl.N()=fr.N();
if(HasPerFaceColor(mr) && HasPerFaceColor(ml)) fl.C()=fr.C();
if(HasPerFaceQuality(mr) && HasPerFaceQuality(ml)) fl.Q()=fr.Q();
if(HasPerWedgeTexCoord(mr) && HasPerWedgeTexCoord(ml)) if(HasPerWedgeTexCoord(mr) && HasPerWedgeTexCoord(ml))
for(int i=0;i<3;++i){ for(int i=0;i<3;++i){
fl.WT(i).P()=fr.WT(i).P(); fl.WT(i).P()=fr.WT(i).P();
@ -121,7 +111,7 @@ static void Mesh(MeshLeft& ml, MeshRight& mr, const bool selected = false)
{ {
VertexIteratorLeft vp; VertexIteratorLeft vp;
vp=Allocator<MeshLeft>::AddVertices(ml,1); vp=Allocator<MeshLeft>::AddVertices(ml,1);
ImportVertex((*vp),*(*fi).V(i)); (*vp).ImportLocal(*(*fi).V(i));
remap[vind]=Index(ml,*vp); remap[vind]=Index(ml,*vp);
} }
} }
@ -176,7 +166,7 @@ static void Mesh(MeshLeft& ml, MeshRight& mr, const bool selected = false)
static void Selected(MeshLeft& ml, MeshRight& mr) static void Selected(MeshLeft& ml, MeshRight& mr)
{ {
Mesh(mr,mr,true); Mesh(ml,mr,true);
} }
}; // end of class Append }; // end of class Append