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

Updated filter_voronoi to float/double independence

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2014-08-23 01:42:08 +00:00
parent 690b7e977b
commit 33f5b63039
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/meshlabplugins/filter_voronoi/filter_voronoi.cpp
View File

@ -24,10 +24,12 @@
#include "filter_voronoi.h"
#include<vcg/complex/algorithms/voronoi_processing.h>
#include<vcg/complex/algorithms/update/curvature.h>
#include<vcg/complex/algorithms/update/curvature_fitting.h>
#include<vcg/complex/algorithms/update/quality.h>
#include<vcg/complex/algorithms/smooth.h>
#include<vcg/complex/algorithms/voronoi_volume_sampling.h>
#include<vcg/complex/algorithms/polygon_support.h>
#include<vcg/complex/algorithms/smooth_field.h>
// Constructor usually performs only two simple tasks of filling the two lists
// - typeList: with all the possible id of the filtering actions
@ -57,7 +59,7 @@ bool FilterVoronoiPlugin::applyFilter( const QString& filterName,MeshDocument& m
if(filterName == "Cross Field Creation")
{
MeshModel &m=*md.mm();
m.updateDataMask(MeshModel::MM_VERTCURVDIR);
m.updateDataMask(MeshModel::MM_VERTCURVDIR + MeshModel::MM_FACECURVDIR + MeshModel::MM_FACEQUALITY + MeshModel::MM_FACECOLOR);
int crossType = env.evalEnum("crossType");
if(crossType == 0) // Linear Y
@ -77,7 +79,13 @@ bool FilterVoronoiPlugin::applyFilter( const QString& filterName,MeshDocument& m
if(crossType == 2) // Curvature
{
m.updateDataMask(MeshModel::MM_VERTFACETOPO);
m.updateDataMask(MeshModel::MM_FACEFACETOPO);
tri::FieldSmoother<CMeshO>::InitByCurvature(m.cm);
tri::FieldSmoother<CMeshO>::SmoothParam par;
tri::FieldSmoother<CMeshO>::SmoothDirections(m.cm,par);
}
return true;
}

7
src/meshlabplugins/filter_voronoi/filter_voronoi.xml
View File

@ -152,10 +152,13 @@
<ENUM_GUI guiLabel="crossType"/>
</PARAM>
</FILTER>
<FILTER filterFunction="crossFieldColoring" filterName="Cross Field Coloring" filterPre="MM_VERTCURVDIR" filterRasterArity="SingleRaster" filterClass="Generic" filterPost="MM_VERTCOLOR" filterArity="SingleMesh" filterIsInterruptible="false">
<FILTER filterFunction="crossFieldSmoothing" filterName="Cross Field Smoothing" filterPre="MM_VERTCURVDIR" filterRasterArity="SingleRaster" filterClass="Generic" filterPost="MM_VERTCOLOR" filterArity="SingleMesh" filterIsInterruptible="false">
<FILTER_HELP><![CDATA[]]></FILTER_HELP>
<FILTER_JSCODE><![CDATA[]]></FILTER_JSCODE>
<PARAM parName="preprocessFlag" parIsImportant="false" parType="Boolean" parDefault="true">
<PARAM_HELP><![CDATA[]]></PARAM_HELP>
<CHECKBOX_GUI guiLabel="Preprocessing"/>
</PARAM>
</FILTER>
</PLUGIN>
</MESHLAB_FILTER_INTERFACE>