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

added importance weighting.

This commit is contained in:
mtarini 2009-10-14 14:32:55 +00:00
parent 1664791bf3
commit 7c78d81cdc
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vcg/complex/trimesh/bitquad_optimization.h
View File

@ -84,6 +84,10 @@ static bool MarkSmallestEdge(MeshType &m, bool perform)
return false; return false;
} }
static ScalarType Importance(const CoordType &p){
return ::proceduralImportance(p);
}
// returns: 0 if fail. 1 if edge. 2 if diag. // returns: 0 if fail. 1 if edge. 2 if diag.
static int MarkSmallestEdgeOrDiag(MeshType &m, ScalarType edgeMult, bool perform, Pos* affected=NULL) static int MarkSmallestEdgeOrDiag(MeshType &m, ScalarType edgeMult, bool perform, Pos* affected=NULL)
{ {
@ -100,8 +104,14 @@ static int MarkSmallestEdgeOrDiag(MeshType &m, ScalarType edgeMult, bool perform
score = (f->P0(k) - f->P1(k)).Norm(); 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 (!f->IsF(k)) score*=edgeMult; // edges are supposed to be smaller!
if (score<min) { if (score<min) {
min=score; min=score;
fa = f; fa = f;
@ -111,6 +121,8 @@ static int MarkSmallestEdgeOrDiag(MeshType &m, ScalarType edgeMult, bool perform
if (f->IsF(k)) { // for diag faces, test counterdiag too if (f->IsF(k)) { // for diag faces, test counterdiag too
score = BQ::CounterDiag(f).Norm(); score = BQ::CounterDiag(f).Norm();
score /= imp;
if (score<min) { if (score<min) {
min=score; min=score;
fa = f; fa = f;
@ -173,6 +185,8 @@ static void MarkSmallestDiag(MeshType &m)
} }
static bool IdentifyAndCollapseSmallestDiag(MeshType &m){ static bool IdentifyAndCollapseSmallestDiag(MeshType &m){
ScalarType min = std::numeric_limits<ScalarType>::max(); ScalarType min = std::numeric_limits<ScalarType>::max();