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

updated to reflect the UpdateSelection name changes.

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2011-12-13 22:54:12 +00:00
parent 78b8d392f4
commit 6fcd3ca7ac
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/meshlabplugins/filter_layer/filter_layer.cpp
View File

@ -134,19 +134,19 @@ bool FilterLayerPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParam
MeshModel *destMesh= md.addNewMesh("","SelectedSubset"); // After Adding a mesh to a MeshDocument the new mesh is the current one
// select all points involved
tri::UpdateSelection<CMeshO>::ClearVertex(currentMesh->cm);
tri::UpdateSelection<CMeshO>::VertexClear(currentMesh->cm);
tri::UpdateSelection<CMeshO>::VertexFromFaceLoose(currentMesh->cm);
tri::Append<CMeshO,CMeshO>::Mesh(destMesh->cm, currentMesh->cm, true);
numFacesSel = tri::UpdateSelection<CMeshO>::CountFace(currentMesh->cm);
numVertSel = tri::UpdateSelection<CMeshO>::CountVertex(currentMesh->cm);
numFacesSel = tri::UpdateSelection<CMeshO>::FaceCount(currentMesh->cm);
numVertSel = tri::UpdateSelection<CMeshO>::VertexCount(currentMesh->cm);
if(par.getBool("DeleteOriginal")) // delete original faces
{
CMeshO::VertexIterator vi;
CMeshO::FaceIterator fi;
tri::UpdateSelection<CMeshO>::ClearVertex(currentMesh->cm);
tri::UpdateSelection<CMeshO>::VertexClear(currentMesh->cm);
tri::UpdateSelection<CMeshO>::VertexFromFaceStrict(currentMesh->cm);
for(fi=currentMesh->cm.face.begin();fi!=currentMesh->cm.face.end();++fi)
if(!(*fi).IsD() && (*fi).IsS() )
@ -155,8 +155,8 @@ bool FilterLayerPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParam
if(!(*vi).IsD() && (*vi).IsS() )
tri::Allocator<CMeshO>::DeleteVertex(currentMesh->cm,*vi);
tri::UpdateSelection<CMeshO>::ClearVertex(currentMesh->cm);
tri::UpdateSelection<CMeshO>::ClearFace(currentMesh->cm);
tri::UpdateSelection<CMeshO>::VertexClear(currentMesh->cm);
tri::UpdateSelection<CMeshO>::FaceClear(currentMesh->cm);
currentMesh->clearDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER);

4
src/meshlabplugins/filter_mls/smallcomponentselection.h
View File

@ -99,7 +99,7 @@ public:
}
++faceSeed;
}
UpdateSelection<MeshType>::ClearFace(m);
UpdateSelection<MeshType>::FaceClear(m);
// now the segmentation is done, let's compute the absolute face count threshold
int total_selected = 0;
@ -130,7 +130,7 @@ public:
{
typename MeshType::FaceIterator fi;
typename MeshType::VertexIterator vi;
UpdateSelection<MeshType>::ClearVertex(m);
UpdateSelection<MeshType>::VertexClear(m);
UpdateSelection<MeshType>::VertexFromFaceStrict(m);
for(fi=m.face.begin();fi!=m.face.end();++fi)

8
src/meshlabplugins/filter_qhull/filter_qhull.cpp
View File

@ -261,7 +261,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe
vcg::tri::UpdateTopology<CMeshO>::FaceFace(pm.cm);
vcg::tri::UpdateTopology<CMeshO>::TestFaceFace(pm.cm);
pm.clearDataMask(MeshModel::MM_FACEFACETOPO);
tri::UpdateSelection<CMeshO>::ClearFace(pm.cm);
tri::UpdateSelection<CMeshO>::FaceClear(pm.cm);
}
vcg::tri::UpdateBounding<CMeshO>::Box(pm.cm);
@ -444,7 +444,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe
m.updateDataMask(MeshModel::MM_VERTFLAGSELECT);
//Clear old selection
tri::UpdateSelection<CMeshO>::ClearVertex(m.cm);
tri::UpdateSelection<CMeshO>::VertexClear(m.cm);
int dim= 3; /* dimension of points */
int numpoints= m.cm.vn; /* number of mesh vertices */
@ -493,7 +493,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe
vcg::tri::UpdateTopology<CMeshO>::TestFaceFace(pm.cm);
pm.clearDataMask(MeshModel::MM_FACEFACETOPO);
//Clear all face because,somewhere, they have been selected
tri::UpdateSelection<CMeshO>::ClearFace(pm.cm);
tri::UpdateSelection<CMeshO>::FaceClear(pm.cm);
}
vcg::tri::UpdateBounding<CMeshO>::Box(pm.cm);
vcg::tri::UpdateNormals<CMeshO>::PerVertexNormalizedPerFace(pm.cm);
@ -520,7 +520,7 @@ bool QhullPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe
vcg::tri::UpdateTopology<CMeshO>::TestFaceFace(pm2.cm);
pm2.clearDataMask(MeshModel::MM_FACEFACETOPO);
//Clear all face because,somewhere, they have been selected
tri::UpdateSelection<CMeshO>::ClearFace(pm2.cm);
tri::UpdateSelection<CMeshO>::FaceClear(pm2.cm);
}
vcg::tri::UpdateBounding<CMeshO>::Box(pm2.cm);

22
src/meshlabplugins/filter_select/meshselect.cpp
View File

@ -215,7 +215,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
switch(ID(action))
{
case FP_SELECT_DELETE_VERT :
tri::UpdateSelection<CMeshO>::ClearFace(m.cm);
tri::UpdateSelection<CMeshO>::FaceClear(m.cm);
tri::UpdateSelection<CMeshO>::FaceFromVertexLoose(m.cm);
for(fi=m.cm.face.begin();fi!=m.cm.face.end();++fi)
if(!(*fi).IsD() && (*fi).IsS() ) tri::Allocator<CMeshO>::DeleteFace(m.cm,*fi);
@ -230,7 +230,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
m.clearDataMask(MeshModel::MM_FACEFACETOPO | MeshModel::MM_FACEFLAGBORDER);
break;
case FP_SELECT_DELETE_FACEVERT :
tri::UpdateSelection<CMeshO>::ClearVertex(m.cm);
tri::UpdateSelection<CMeshO>::VertexClear(m.cm);
tri::UpdateSelection<CMeshO>::VertexFromFaceStrict(m.cm);
for(fi=m.cm.face.begin();fi!=m.cm.face.end();++fi)
if(!(*fi).IsD() && (*fi).IsS() )
@ -275,16 +275,16 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
}
break;
case FP_SELECT_ALL :
tri::UpdateSelection<CMeshO>::AllVertex(m.cm);
tri::UpdateSelection<CMeshO>::AllFace(m.cm); break;
tri::UpdateSelection<CMeshO>::VertexAll(m.cm);
tri::UpdateSelection<CMeshO>::FaceAll(m.cm); break;
case FP_SELECT_NONE :
tri::UpdateSelection<CMeshO>::ClearVertex(m.cm);
tri::UpdateSelection<CMeshO>::ClearFace(m.cm); break;
tri::UpdateSelection<CMeshO>::VertexClear(m.cm);
tri::UpdateSelection<CMeshO>::FaceClear(m.cm); break;
case FP_SELECT_INVERT :
if (par.getBool("InvVerts"))
tri::UpdateSelection<CMeshO>::InvertVertex(m.cm);
tri::UpdateSelection<CMeshO>::VertexInvert(m.cm);
if (par.getBool("InvFaces"))
tri::UpdateSelection<CMeshO>::InvertFace(m.cm); break;
tri::UpdateSelection<CMeshO>::FaceInvert(m.cm); break;
case FP_SELECT_VERT_FROM_FACE :
if(par.getBool("Inclusive"))
tri::UpdateSelection<CMeshO>::VertexFromFaceStrict(m.cm);
@ -339,8 +339,8 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
float valueGS = par.getDynamicFloat("PercentGS");
float valueBV = par.getDynamicFloat("PercentBV");
tri::UpdateSelection<CMeshO>::ClearFace(m.cm);
tri::UpdateSelection<CMeshO>::ClearVertex(m.cm);
tri::UpdateSelection<CMeshO>::FaceClear(m.cm);
tri::UpdateSelection<CMeshO>::VertexClear(m.cm);
//now loop through all the faces
for(vi = m.cm.vert.begin(); vi != m.cm.vert.end(); ++vi)
@ -389,7 +389,7 @@ bool SelectionFilterPlugin::applyFilter(QAction *action, MeshDocument &md, RichP
std::vector<CFaceO *> IntersFace;
std::vector<CFaceO *>::iterator fpi;
tri::Clean<CMeshO>::SelfIntersections(m.cm,IntersFace);
tri::UpdateSelection<CMeshO>::ClearFace(m.cm);
tri::UpdateSelection<CMeshO>::FaceClear(m.cm);
for(fpi=IntersFace.begin();fpi!=IntersFace.end();++fpi)
(*fpi)->SetS();
break;