diff --git a/src/meshlabplugins/filter_func/filter_func.cpp b/src/meshlabplugins/filter_func/filter_func.cpp index ae4d96eab..2b044bb2a 100644 --- a/src/meshlabplugins/filter_func/filter_func.cpp +++ b/src/meshlabplugins/filter_func/filter_func.cpp @@ -209,7 +209,7 @@ const QString PerFaceAttributeString("It's possibile to use per-face variables l case FF_FACE_QUALITY : return MeshModel::MM_FACECOLOR + MeshModel::MM_FACEQUALITY; case FF_FACE_COLOR : return MeshModel::MM_FACECOLOR; case FF_REFINE : - return MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER | MeshModel::MM_VERTMARK; + return MeshModel::MM_FACEFACETOPO | MeshModel::MM_VERTMARK; default: assert(0); } return 0; @@ -874,7 +874,7 @@ bool FilterFunctionPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPa RefineE, CustomEdge > (m.cm, mid, edge, false, cb); - m.clearDataMask(MeshModel::MM_FACEFLAGBORDER | MeshModel::MM_VERTMARK); + m.clearDataMask( MeshModel::MM_VERTMARK); vcg::tri::UpdateNormals::PerVertexNormalizedPerFace(m.cm); return true; diff --git a/src/meshlabplugins/filter_mls/mlsplugin.cpp b/src/meshlabplugins/filter_mls/mlsplugin.cpp index ee7080b42..59d80856c 100644 --- a/src/meshlabplugins/filter_mls/mlsplugin.cpp +++ b/src/meshlabplugins/filter_mls/mlsplugin.cpp @@ -368,7 +368,7 @@ bool MlsPlugin::applyFilter(QAction* filter, MeshDocument& md, RichParameterSet& if (id == FP_SELECT_SMALL_COMPONENTS) { MeshModel* mesh = md.mm(); - mesh->updateDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER); + mesh->updateDataMask(MeshModel::MM_FACEFACETOPO); bool nonClosedOnly = par.getBool("NonClosedOnly"); float ratio = par.getFloat("NbFaceRatio"); vcg::tri::SmallComponent::Select(mesh->cm, ratio, nonClosedOnly); @@ -465,7 +465,7 @@ bool MlsPlugin::applyFilter(QAction* filter, MeshDocument& md, RichParameterSet& //UpdateFaceNormalFromVertex(m.cm); if (k!=0) { - mesh->updateDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER); + mesh->updateDataMask(MeshModel::MM_FACEFACETOPO); vcg::tri::UpdateNormals::PerFace(mesh->cm); vcg::tri::UpdateNormals::NormalizeFace(mesh->cm); @@ -589,12 +589,12 @@ bool MlsPlugin::applyFilter(QAction* filter, MeshDocument& md, RichParameterSet& // extra zero detection and removal { - mesh->updateDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER); + mesh->updateDataMask(MeshModel::MM_FACEFACETOPO ); // selection... vcg::tri::SmallComponent::Select(mesh->cm, 0.1f); // deletion... vcg::tri::SmallComponent::DeleteFaceVert(mesh->cm); - mesh->clearDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER); + mesh->clearDataMask(MeshModel::MM_FACEFACETOPO); } Log( "Marching cubes MLS meshing done."); diff --git a/src/meshlabplugins/filter_mls/smallcomponentselection.h b/src/meshlabplugins/filter_mls/smallcomponentselection.h index b8491d16a..7fbf3e676 100644 --- a/src/meshlabplugins/filter_mls/smallcomponentselection.h +++ b/src/meshlabplugins/filter_mls/smallcomponentselection.h @@ -59,7 +59,7 @@ public: if (nonClosedOnly) { for (int k=0; k<3; ++k) - if (f.IsB(k)) + if (face::IsBorder(f,k)) { foundSeed = true; break; @@ -90,7 +90,7 @@ public: components.back().push_back(f); for (int k=0; k<3; ++k) { - if (f->IsB(k)) + if (face::IsBorder(*f,k)) continue; FacePointer of = f->FFp(k); if (!of->IsS()) diff --git a/src/meshlabplugins/filter_slice/filter_slice.h b/src/meshlabplugins/filter_slice/filter_slice.h index 6c6f3fa9f..ccb95707e 100644 --- a/src/meshlabplugins/filter_slice/filter_slice.h +++ b/src/meshlabplugins/filter_slice/filter_slice.h @@ -44,14 +44,14 @@ public: enum { FP_SINGLE_PLANE, FP_PLANE_CUT}; enum RefPlane { REF_CENTER,REF_MIN,REF_ORIG}; ExtraFilter_SlicePlugin(); - ~ExtraFilter_SlicePlugin(){}; + ~ExtraFilter_SlicePlugin(){} virtual QString filterName(FilterIDType filter) const; virtual QString filterInfo(FilterIDType filter) const; virtual FilterClass getClass(QAction *); virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/); virtual bool applyFilter(QAction *filter, MeshDocument &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ; - virtual int getRequirements(QAction *){return MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER | MeshModel::MM_VERTFLAG | MeshModel::MM_VERTMARK | MeshModel::MM_VERTCOORD;} + virtual int getRequirements(QAction *){return MeshModel::MM_FACEFACETOPO | MeshModel::MM_VERTFLAG | MeshModel::MM_VERTMARK | MeshModel::MM_VERTCOORD;} private: SVGProperties pr; }; diff --git a/src/meshlabplugins/filter_trioptimize/filter_trioptimize.cpp b/src/meshlabplugins/filter_trioptimize/filter_trioptimize.cpp index cd2962b08..8fabeca6a 100644 --- a/src/meshlabplugins/filter_trioptimize/filter_trioptimize.cpp +++ b/src/meshlabplugins/filter_trioptimize/filter_trioptimize.cpp @@ -141,10 +141,7 @@ TriOptimizePlugin::TriOptimizePlugin() case FP_CURVATURE_EDGE_FLIP: return MeshModel::MM_FACEFACETOPO | MeshModel::MM_VERTFACETOPO | - MeshModel::MM_VERTMARK | - MeshModel::MM_FACEFLAGBORDER; - case FP_NEAR_LAPLACIAN_SMOOTH: - return MeshModel::MM_FACEFLAGBORDER; + MeshModel::MM_VERTMARK; } return 0;