lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 11:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a first version of the depth smoothing

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2009-03-20 00:27:35 +00:00
parent dffd5e04c6
commit aa8797f345
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/meshlabplugins/filter_unsharp/filter_unsharp.cpp
View File

@ -44,6 +44,7 @@ FilterUnsharp::FilterUnsharp()
FP_SD_LAPLACIAN_SMOOTH<<
FP_TWO_STEP_SMOOTH<<
FP_TAUBIN_SMOOTH<<
FP_DEPTH_SMOOTH<<
FP_VERTEX_QUALITY_SMOOTHING<<
FP_FACE_NORMAL_SMOOTHING<<
FP_UNSHARP_NORMAL<<
@ -77,6 +78,7 @@ const QString FilterUnsharp::filterName(FilterIDType filter)
case FP_SD_LAPLACIAN_SMOOTH : return QString("ScaleDependent Laplacian Smooth");
case FP_TWO_STEP_SMOOTH : return QString("TwoStep Smooth");
case FP_TAUBIN_SMOOTH : return QString("Taubin Smooth");
case FP_DEPTH_SMOOTH : return QString("Depth Smooth");
case FP_CREASE_CUT : return QString("Cut mesh along crease edges");
case FP_FACE_NORMAL_NORMALIZE: return QString("Normalize Face Normals");
case FP_VERTEX_NORMAL_NORMALIZE: return QString("Normalize Vertex Normals");
@ -105,6 +107,7 @@ const QString FilterUnsharp::filterInfo(FilterIDType filterId)
case FP_SD_LAPLACIAN_SMOOTH : return tr("Scale Dependent Laplacian Smoothing, extended version of Laplacian Smoothing, based on the Fujiwara extended umbrella operator");
case FP_TWO_STEP_SMOOTH : return tr("Two Step Smoothing, a feature preserving/enhancing fairing filter. It is based on a Normal Smoothing step where similar normals are averaged toghether and a step where the vertexes are fitted on the new normals");
case FP_TAUBIN_SMOOTH : return tr("The $lambda-mu$ taubin smoothing, it make two steps of smoothing, forth and back, for each iteration");
case FP_DEPTH_SMOOTH : return tr("A laplacian smooth that is constrained to move vertices only along the view direction.");
case FP_CREASE_CUT: return tr("Cut the mesh along crease edges, duplicating the vertices as necessary. Crease edges are defined according to the variation of normal of the adjacent faces");
case FP_FACE_NORMAL_NORMALIZE: return tr("Normalize Face Normal Lenghts");
case FP_VERTEX_NORMAL_NORMALIZE: return tr("Normalize Vertex Normal Lenghts");
@ -134,6 +137,7 @@ const FilterUnsharp::FilterClass FilterUnsharp::getClass(QAction *a)
case FP_LAPLACIAN_SMOOTH:
case FP_TWO_STEP_SMOOTH:
case FP_TAUBIN_SMOOTH:
case FP_DEPTH_SMOOTH:
case FP_FACE_NORMAL_SMOOTHING:
case FP_VERTEX_QUALITY_SMOOTHING:
case FP_UNSHARP_NORMAL:
@ -162,6 +166,7 @@ const int FilterUnsharp::getRequirements(QAction *action)
case FP_HC_LAPLACIAN_SMOOTH:
case FP_SD_LAPLACIAN_SMOOTH:
case FP_TAUBIN_SMOOTH:
case FP_DEPTH_SMOOTH:
case FP_LAPLACIAN_SMOOTH: return MeshModel::MM_FACEFLAGBORDER;
case FP_TWO_STEP_SMOOTH: return MeshModel::MM_VERTFACETOPO;
case FP_UNSHARP_GEOMETRY:
@ -190,6 +195,7 @@ bool FilterUnsharp::autoDialog(QAction *action)
case FP_CREASE_CUT :
case FP_TWO_STEP_SMOOTH:
case FP_LAPLACIAN_SMOOTH:
case FP_DEPTH_SMOOTH:
case FP_TAUBIN_SMOOTH:
case FP_SD_LAPLACIAN_SMOOTH:
case FP_UNSHARP_GEOMETRY:
@ -239,6 +245,11 @@ void FilterUnsharp::initParameterSet(QAction *action, MeshModel &m, FilterParame
parlst.addInt ("stepSmoothNum", (int) 3,"Smoothing steps", "The number of times that the whole algorithm (normal smoothing + vertex fitting) is iterated.");
parlst.addBool ("Selected",m.cm.sfn>0,"Affect only selected faces");
break;
case FP_DEPTH_SMOOTH:
parlst.addInt ("stepSmoothNum", (int) 3,"Smoothing steps", "The number of times that the whole algorithm (normal smoothing + vertex fitting) is iterated.");
parlst.addPoint3f ("viewPoint", Point3f(0,0,0),"Smoothing steps", "The number of times that the whole algorithm (normal smoothing + vertex fitting) is iterated.");
parlst.addBool ("Selected",m.cm.sfn>0,"Affect only selected faces");
break;
case FP_TAUBIN_SMOOTH:
parlst.addFloat("lambda", (float) 0.5,"Lambda", "The lambda parameter of the Taubin Smoothing algorithm");
parlst.addFloat("mu", (float) -0.53,"mu", "The mu parameter of the Taubin Smoothing algorithm");
@ -295,6 +306,18 @@ bool FilterUnsharp::applyFilter(QAction *filter, MeshModel &m, FilterParameterSe
tri::UpdateNormals<CMeshO>::PerVertexNormalizedPerFace(m.cm);
}
break;
case FP_DEPTH_SMOOTH :
{
int stepSmoothNum = par.getInt("stepSmoothNum");
size_t cnt=tri::UpdateSelection<CMeshO>::VertexFromFaceStrict(m.cm);
//float delta = par.getAbsPerc("delta");
Point3f viewPoint(0,0,0);
float alpha = 1;
tri::Smooth<CMeshO>::VertexCoordViewDepth(m.cm,viewPoint,alpha,stepSmoothNum,true);
Log(GLLogStream::FILTER, "depth Smoothed %d vertices", cnt>0 ? cnt : m.cm.vn);
tri::UpdateNormals<CMeshO>::PerVertexNormalizedPerFace(m.cm);
}
break;
case FP_SD_LAPLACIAN_SMOOTH:
{
int stepSmoothNum = par.getInt("stepSmoothNum");

1
src/meshlabplugins/filter_unsharp/filter_unsharp.h
View File

@ -44,6 +44,7 @@ class FilterUnsharp : public QObject, public MeshFilterInterface
enum {
FP_CREASE_CUT,
FP_LAPLACIAN_SMOOTH,
FP_DEPTH_SMOOTH,
FP_HC_LAPLACIAN_SMOOTH,
FP_SD_LAPLACIAN_SMOOTH,
FP_TWO_STEP_SMOOTH,