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

This commit is contained in:
mtarini 2009-09-07 16:44:01 +00:00
parent 15f6f89d06
commit 7e3ad9eced
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vcg/complex/trimesh/bitquad_support.h
View File

@ -200,9 +200,9 @@ static void FlipDiag(FaceType &f){
// given a vertex (i.e. a face and a wedge), // given a vertex (i.e. a face and a wedge),
// this function tells us how the average edge lenght around a vertex would change // this function tells us how the totale edge lenght around a vertex would change
// if that vertex is rotated // if that vertex is rotated
static ScalarType AvgEdgeLenghtVariationIfVertexRotated(const FaceType &f, int w0) static ScalarType EdgeLenghtVariationIfVertexRotated(const FaceType &f, int w0)
{ {
assert(!f.IsD()); assert(!f.IsD());
@ -231,7 +231,7 @@ static ScalarType AvgEdgeLenghtVariationIfVertexRotated(const FaceType &f, int w
assert(guard++<100); assert(guard++<100);
} while (pf != &f); } while (pf != &f);
assert (na == n); assert (na == n);
return (after-before)/n; return (after-before);
} }
/* /*
@ -258,7 +258,7 @@ static bool TestVertexRotation(const FaceType &f, int w0)
{ {
assert(!f.IsD()); assert(!f.IsD());
// rotate quad IFF this way edges become shorter: // rotate quad IFF this way edges become shorter:
return AvgEdgeLenghtVariationIfVertexRotated(f,w0)<0; return EdgeLenghtVariationIfVertexRotated(f,w0)<0;
} }
@ -626,9 +626,9 @@ static bool CollapseEdge(FaceType &f, int w0, MeshType& m, Pos *affected=NULL){
// choose: rotate around V0 or around V1? // choose: rotate around V0 or around V1?
if ( if (
AvgEdgeLenghtVariationIfVertexRotated(*f0,w0) EdgeLenghtVariationIfVertexRotated(*f0,w0)
< <
AvgEdgeLenghtVariationIfVertexRotated(*f1,w1) EdgeLenghtVariationIfVertexRotated(*f1,w1)
) return CollapseEdgeDirect(*f0,w0,m); ) return CollapseEdgeDirect(*f0,w0,m);
else return CollapseEdgeDirect(*f1,w1,m); else return CollapseEdgeDirect(*f1,w1,m);
} }
@ -922,7 +922,7 @@ given a quad edge, retruns:
Currently an edge is rotated iff it is shortened by that rotations Currently an edge is rotated iff it is shortened by that rotations
(shortcut criterion) (shortcut criterion)
*/ */
static int TestEdgeRotation(const FaceType &f, int w0) static int TestEdgeRotation(const FaceType &f, int w0, ScalarType *gain=NULL)
{ {
const FaceType *fa = &f; const FaceType *fa = &f;
assert(! fa->IsF(w0) ); assert(! fa->IsF(w0) );
@ -968,9 +968,16 @@ static int TestEdgeRotation(const FaceType &f, int w0)
q0 = (v0 - v3).SquaredNorm(); q0 = (v0 - v3).SquaredNorm();
q1 = (v1 - v4).SquaredNorm(); q1 = (v1 - v4).SquaredNorm();
q2 = (v5 - v2).SquaredNorm(); q2 = (v5 - v2).SquaredNorm();
if (q0<=q1 && q0<=q2) return 0; if (q0<=q1 && q0<=q2)
if (q1<=q2) return 1; return 0;
return -1;
if (q1<=q2) {
if (gain) *gain = q0-q1;
return 1;
} else {
if (gain) *gain = q0-q2;
return -1;
}
} }
private: private: