From 2b3bb02be036992fa6850652d8f517ab9a6a2ada Mon Sep 17 00:00:00 2001 From: cignoni Date: Fri, 16 May 2014 08:43:00 +0000 Subject: [PATCH] harmless gcc warning --- vcg/complex/algorithms/bitquad_optimization.h | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/vcg/complex/algorithms/bitquad_optimization.h b/vcg/complex/algorithms/bitquad_optimization.h index 7ae503bb..ecce38a6 100644 --- a/vcg/complex/algorithms/bitquad_optimization.h +++ b/vcg/complex/algorithms/bitquad_optimization.h @@ -5,7 +5,7 @@ namespace vcg{namespace tri{ template class BitQuadOptimization{ - + typedef typename BQ::MeshType MeshType; typedef typename BQ::Pos Pos; @@ -23,11 +23,11 @@ public: // helper function: mark a quadface, setting Q at 0, and neight at .75, 0.5... static void MarkFace(FaceType* f, MeshType &m){ - + for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { - fi->Q() = 1; + fi->Q() = 1; } - + for (int i=0; i<3; i++) { for (int j=0; j<3; j++) f->FFp(i)->FFp(j)->Q() = 0.75; } @@ -35,42 +35,42 @@ static void MarkFace(FaceType* f, MeshType &m){ f->FFp(i)->Q() = 0.50; } f->Q() = 0; - + } // helper function: mark a quadface, setting Q at 0, and neight at .75, 0.5... static void MarkVertex(FaceType* f, int wedge, MeshType &m){ VertexType *v = f->V(wedge); - + for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { - if (fi->V0(0)==v || fi->V1(0)==v ||fi->V2(0)==v ) fi->Q() = 0; - // else fi->Q() = 1; + if (fi->V0(0)==v || fi->V1(0)==v ||fi->V2(0)==v ) fi->Q() = 0; + // else fi->Q() = 1; } - + } static bool MarkSmallestEdge(MeshType &m, bool perform) { ScalarType min = std::numeric_limits::max(); - + FaceType *fa=NULL; int w=0; for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) for (int k=0; k<3; k++) { FaceType *f=&*fi; - + if (f->IsF(k)) continue; if (f->FFp(k) == f ) continue; // skip borders - + ScalarType score; score = (f->P0(k) - f->P1(k)).Norm(); if (score::max(); - + FaceType *fa=NULL; int w=0; bool counterDiag = false; for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) for (int k=0; k<3; k++) { FaceType *f=&*fi; - + if (f->FFp(k) >= f ) continue; // skip borders (==), and do it one per edge - + ScalarType score; score = (f->P0(k) - f->P1(k)).Norm(); - + ScalarType imp = Importance( (f->P0(k) + f->P1(k))/2 ); - + score /= imp; - + if (!f->IsF(k)) score*=edgeMult; // edges are supposed to be smaller! - - - + + + if (scoreIsF(k)) { // for diag faces, test counterdiag too score = BQ::CounterDiag(f).Norm(); score /= imp; if (score::max(); - - FaceType *fa=NULL; + + FaceType *fa=NULL; for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { FaceType *f=&*fi; - + ScalarType score; score = BQ::Diag(f).Norm(); if (scoreQ()=0.0; @@ -190,30 +190,30 @@ static void MarkSmallestDiag(MeshType &m) static bool IdentifyAndCollapseSmallestDiag(MeshType &m){ ScalarType min = std::numeric_limits::max(); - + FaceType *fa=NULL; bool flip; for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { FaceType *f=&*fi; - + ScalarType score; - + score = BQ::Diag(f).Norm(); if (scoreIsD()) fi->Q()=1.0; for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { - + for (int k=0; k<3; k++) { if (fi->V(k)->IsV()) continue; if (BQ::TestVertexRotation(*fi,k)) { @@ -296,9 +296,9 @@ template static int MarkEdgeRotations(MeshType &m, Pos *p=NULL) { int count = 0; - + for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) fi->Q()=1; - + for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { //if (count>0) break; for (int k=0; k<3; k++) { @@ -387,9 +387,9 @@ static ScalarType MeasureQuality(MeshType &m) int div = 0; for (FaceIterator fi = m.face.begin(); fi!=m.face.end(); fi++) if (!fi->IsD()) { if (fi->IsAnyF()) { - + ScalarType q = BQ::quadQuality( &*fi, BQ::FauxIndex(&*fi) ); - + if (MeshType::HasPerFaceQuality()) fi->Q() = q; res += q; div++;