lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-18 10:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected stupid bug (prenormalization of face normals) that stopped the working of curvature optimization.

Browse Source 
Improved help wording and a deg/rad mismatch too...
This commit is contained in:
Paolo Cignoni cignoni 2009-04-02 01:07:39 +00:00
parent 3d003d034a
commit 348b2d92fb
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fgt/filter_trioptimize/curvedgeflip.h
View File

@ -200,9 +200,11 @@ public:
virtual bool IsFeasible()
{
// First the flip must be topologically correct.
if(!vcg::face::CheckFlipEdge(*this->_pos.F(), this->_pos.E()))
return false;
// then the angle between the involved normals must be greater???
if (math::ToDeg(Angle(this->_pos.FFlip()->cN(), this->_pos.F()->cN()) ) <= this->CoplanarAngleThresholdDeg() )
return false;
@ -294,7 +296,13 @@ public:
_cv3 = curveval(cd3);
float cafter = _cv0 + _cv1 + _cv2 + _cv3;
// The priority of an edge flip is **how much we lower the overall curvature**.
// If after the flip the sum of the curvature is decreased it is a good move;
// good flips have: cafter < cbefore
// Since the local optimization is designed to make the miniumum cost move we put inside
// negative values (the more negative the better).
this->_priority = (cafter - cbefore);
//qDebug("computed curvature change, %f->%f (priority = %f)", cbefore,cafter,this->_priority);
return this->_priority;
}
@ -304,8 +312,8 @@ public:
CURVEVAL curveval;
heap.clear();
// comuputing edge flip priority require non normalized vertex normals
vcg::tri::UpdateNormals<TRIMESH_TYPE>::PerVertex(m);
// comuputing edge flip priority require non normalized vertex normals AND non normalized face normals.
vcg::tri::UpdateNormals<TRIMESH_TYPE>::PerVertexPerFace(m);
VertexIterator vi;
for (vi = m.vert.begin(); vi != m.vert.end(); ++vi)

32
src/fgt/filter_trioptimize/filter_trioptimize.cpp
View File

@ -195,9 +195,9 @@ void TriOptimizePlugin::initParameterSet(QAction *action, MeshModel &m,
{
if (ID(action) == FP_CURVATURE_EDGE_FLIP) {
parlst.addBool("selection", m.cm.sfn > 0, tr("Update selection"), tr("Apply edge flip optimization on selected faces only"));
parlst.addAbsPerc("pthreshold", 1.0f, 0.1f, 90.0f,
tr("Planar threshold"),
tr("angle threshold for planar faces (degrees)"));
parlst.addFloat("pthreshold", 1.0f,
tr("Angle Thr (deg)"),
tr("To avoid excessive flipping/swapping we consider only couple of faces with a significant diedral angle (e.g. greater than the indicated threshold). "));
QStringList cmetrics;
cmetrics.push_back("mean");
@ -218,9 +218,9 @@ void TriOptimizePlugin::initParameterSet(QAction *action, MeshModel &m,
if (ID(action) == FP_PLANAR_EDGE_FLIP) {
parlst.addBool("selection", m.cm.sfn > 0, tr("Update selection"), tr("Apply edge flip optimization on selected faces only"));
parlst.addAbsPerc("pthreshold", 1.0f, 0.1f, 90.0f,
tr("Planar threshold"),
tr("angle threshold for planar faces (degrees)"));
parlst.addFloat("pthreshold", 1.0f,
tr("Planar threshold (deg)"),
tr("angle threshold for planar faces (degrees)"));
QStringList pmetrics;
pmetrics.push_back("area/max side");
@ -245,7 +245,7 @@ void TriOptimizePlugin::initParameterSet(QAction *action, MeshModel &m,
if (ID(action) == FP_NEAR_LAPLACIAN_SMOOTH) {
parlst.addBool("selection", false, tr("Update selection"), tr("Apply laplacian smooth on selected faces only"));
parlst.addFloat("AngleDeg", 0.0001f, tr("Max Normal Dev (deg)"), tr("maximum mean normal angle displacement (degrees) from old to new faces"));
parlst.addFloat("AngleDeg", 0.5f, tr("Max Normal Dev (deg)"), tr("maximum mean normal angle displacement (degrees) from old to new faces"));
parlst.addInt("iterations", 1, "Iterations", tr("number of laplacian smooth iterations in every run"));
}
}
@ -258,12 +258,7 @@ bool TriOptimizePlugin::applyFilter(QAction *filter, MeshModel &m,
{
float limit = -std::numeric_limits<float>::epsilon();
if (ID(filter) == FP_CURVATURE_EDGE_FLIP) {
if ( !tri::Clean<CMeshO>::IsTwoManifoldFace(m.cm) ) {
errorMessage = "Mesh has some not 2-manifold faces, edge flips requires manifoldness";
return false; // can't continue, mesh can't be processed
}
if (ID(filter) == FP_CURVATURE_EDGE_FLIP) {
int delvert = tri::Clean<CMeshO>::RemoveUnreferencedVertex(m.cm);
if (delvert)
Log(GLLogStream::FILTER,
@ -275,8 +270,12 @@ bool TriOptimizePlugin::applyFilter(QAction *filter, MeshModel &m,
vcg::tri::UpdateTopology<CMeshO>::FaceFace(m.cm);
vcg::tri::UpdateFlags<CMeshO>::FaceBorderFromFF(m.cm);
if ( !tri::Clean<CMeshO>::IsTwoManifoldFace(m.cm) ) {
errorMessage = "Mesh has some not 2-manifold faces, edge flips requires manifoldness";
return false; // can't continue, mesh can't be processed
}
vcg::LocalOptimization<CMeshO> optimiz(m.cm);
float pthr = par.getAbsPerc("pthreshold");
float pthr = par.getFloat("pthreshold");
time_t start = clock();
if (par.getBool("selection")) {
@ -309,6 +308,7 @@ bool TriOptimizePlugin::applyFilter(QAction *filter, MeshModel &m,
// stop when flips become harmful
optimiz.SetTargetMetric(limit);
//optimiz.SetTargetOperations(10);
optimiz.DoOptimization();
optimiz.h.clear();
@ -328,7 +328,7 @@ bool TriOptimizePlugin::applyFilter(QAction *filter, MeshModel &m,
vcg::tri::UpdateFlags<CMeshO>::FaceBorderFromFF(m.cm);
vcg::LocalOptimization<CMeshO> optimiz(m.cm);
float pthr = par.getAbsPerc("pthreshold");
float pthr = par.getFloat("pthreshold");
time_t start = clock();
@ -378,7 +378,7 @@ bool TriOptimizePlugin::applyFilter(QAction *filter, MeshModel &m,
int iternum = par.getInt("iterations");
float dthreshold = par.getFloat("AngleDeg");
tri::Smooth<CMeshO>::VertexCoordPlanarLaplacian(m.cm, iternum, dthreshold, selection,cb);
tri::Smooth<CMeshO>::VertexCoordPlanarLaplacian(m.cm, iternum, math::ToRad(dthreshold), selection,cb);
tri::UpdateNormals<CMeshO>::PerVertexNormalizedPerFace(m.cm);
}