From 4337bba2652a88ba087d0dd79175fb3219624a62 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Wed, 27 Oct 2004 09:26:26 +0000 Subject: [PATCH] fftopology update branch commented (to finish) --- vcg/complex/trimesh/edge_collapse.h | 54 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/vcg/complex/trimesh/edge_collapse.h b/vcg/complex/trimesh/edge_collapse.h index 391bdf17..960063e0 100644 --- a/vcg/complex/trimesh/edge_collapse.h +++ b/vcg/complex/trimesh/edge_collapse.h @@ -210,36 +210,36 @@ class EdgeCollapse //set Face Face topology if (TriMeshType::HasFFTopology()) { - int e0=c.z; - int e1=c.f->FFi(c.z); //opposite edge + //int e0=c.z; + //int e1=c.f->FFi(c.z); //opposite edge - FaceType *f0=c.f; - FaceType *f1=f0->FFp(c.z); - - //take right indexes - FaceType *f00=f0->FFp((e0+1)%3); - FaceType *f01=f0->FFp((e0+2)%3); - int If00=f0->FFi((e0+1)%3); - int If01=f0->FFi((e0+2)%3); - - //then attach faces - f00->FFp(If00)=f01; - f00->FFi(If00)=If01; - f01->FFp(If01)=f00; - f01->FFi(If01)=If00; + //FaceType *f0=c.f; + //FaceType *f1=f0->FFp(c.z); + // + ////take right indexes + //FaceType *f00=f0->FFp((e0+1)%3); + //FaceType *f01=f0->FFp((e0+2)%3); + //int If00=f0->FFi((e0+1)%3); + //int If01=f0->FFi((e0+2)%3); + // + ////then attach faces + //f00->FFp(If00)=f01; + //f00->FFi(If00)=If01; + //f01->FFp(If01)=f00; + //f01->FFi(If01)=If00; - //and the ones of face f1 + ////and the ones of face f1 - f00=f1->FFp((e1+1)%3); - f01=f1->FFp((e1+2)%3); - If00=f1->FFi((e1+1)%3); - If01=f1->FFi((e1+2)%3); - - //and attach faces - f00->FFp(If00)=f01; - f00->FFi(If00)=If01; - f01->FFp(If01)=f00; - f01->FFi(If01)=If00; + //f00=f1->FFp((e1+1)%3); + //f01=f1->FFp((e1+2)%3); + //If00=f1->FFi((e1+1)%3); + //If01=f1->FFi((e1+2)%3); + // + ////and attach faces + //f00->FFp(If00)=f01; + //f00->FFi(If00)=If01; + //f01->FFp(If01)=f00; + //f01->FFi(If01)=If00; } for(i=AV01().begin();i!=AV01().end();++i)