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

restored changes for a corrected use of default copy constructor

This commit is contained in:
Nico Pietroni 2009-10-27 10:48:52 +00:00
parent 58f3af4c82
commit fe6d3ca34d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/complex/trimesh/bitquad_creation.h
View File

@ -290,16 +290,23 @@ static void MakePureByRefine(MeshType &m){
{ {
assert(nvi!=m.vert.end()); assert(nvi!=m.vert.end());
VertexType *nv = &*nvi; nvi++; VertexType *nv = &*nvi; nvi++;
*nv = *fi->V0( 0 ); // lazy: copy everything from the old vertex //*nv = *fi->V0( 0 ); // lazy: copy everything from the old vertex
nv->ImportLocal(*(fi->V0( 0 ))); // lazy: copy everything from the old vertex
nv->P() = ( fi->V(0)->P() + fi->V(1)->P() + fi->V(2)->P() ) /3.0; nv->P() = ( fi->V(0)->P() + fi->V(1)->P() + fi->V(2)->P() ) /3.0;
FaceType *fa = &*fi; FaceType *fa = &*fi;
FaceType *fb = &*nfi; nfi++; FaceType *fb = &*nfi; nfi++;
FaceType *fc = &*nfi; nfi++; FaceType *fc = &*nfi; nfi++;
*fb = *fc = *fa; // lazy: copy everything from the old faces
fb->ImportLocal(*fi);
fc->ImportLocal(*fi);
fb->V(1) = nv; fb->V(0)=fa->V(0); fb->V(2)=fa->V(2);
fc->V(2) = nv; fc->V(0)=fa->V(0); fc->V(1)=fa->V(1);
fa->V(0) = nv; fa->V(0) = nv;
fb->V(1) = nv; fb->FFp(2)=fa->FFp(2); fb->FFi(2)=fa->FFi(2);
fc->V(2) = nv; fc->FFp(0)=fa->FFp(0); fc->FFi(0)=fa->FFi(0);
assert( fa->FFp(1)->FFp(fa->FFi(1)) == fa ); assert( fa->FFp(1)->FFp(fa->FFi(1)) == fa );
/* */fb->FFp(2)->FFp(fb->FFi(2)) = fb; /* */fb->FFp(2)->FFp(fb->FFi(2)) = fb;
/* */fc->FFp(0)->FFp(fc->FFi(0)) = fc; /* */fc->FFp(0)->FFp(fc->FFi(0)) = fc;
@ -503,7 +510,7 @@ static void MakePureByRefine(MeshType &m){
static void MakePureByCatmullClark(MeshType &m){ static void MakePureByCatmullClark(MeshType &m){
MakePureByRefine(m); MakePureByRefine(m);
MakePureByRefine(m); MakePureByRefine(m);
// et-voilà!!! // done
} }
// Helper funcion: // Helper funcion: