manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added define to compile without comiso and use only polyvector field

This commit is contained in:
nico 2019-04-24 11:51:08 +10:00
parent 42b17bf904
commit 02e04e901a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wrap/igl/smooth_field.h
View File

@ -34,10 +34,14 @@
#include <vcg/complex/algorithms/mesh_to_matrix.h> #include <vcg/complex/algorithms/mesh_to_matrix.h>
//igl related stuff //igl related stuff
#include <igl/n_polyvector.h> #include <igl/n_polyvector.h>
#include <igl/principal_curvature.h> #include <igl/principal_curvature.h>
#include <igl/igl_inline.h> #include <igl/igl_inline.h>
#ifdef COMISO_FIELD
#include <igl/copyleft/comiso/nrosy.h> #include <igl/copyleft/comiso/nrosy.h>
#endif
namespace vcg { namespace vcg {
namespace tri { namespace tri {
@ -228,7 +232,7 @@ class FieldSmoother
ScalarType alpha_soft, ScalarType alpha_soft,
int Ndir) int Ndir)
{ {
#ifdef COMISO_FIELD
assert((Ndir==2)||(Ndir==4)); assert((Ndir==2)||(Ndir==4));
Eigen::MatrixXi F; Eigen::MatrixXi F;
Eigen::MatrixXd V; Eigen::MatrixXd V;
@ -258,6 +262,9 @@ class FieldSmoother
mesh.face[i].PD1()=dir1*Norm1; mesh.face[i].PD1()=dir1*Norm1;
mesh.face[i].PD2()=dir2*Norm2; mesh.face[i].PD2()=dir2*Norm2;
} }
#else
assert(0);
#endif
} }
static void SmoothNPoly(MeshType &mesh, static void SmoothNPoly(MeshType &mesh,
@ -488,6 +495,7 @@ public:
// if ((SParam.alpha_curv>0)|| // if ((SParam.alpha_curv>0)||
// (SParam.sharp_thr>0)|| // (SParam.sharp_thr>0)||
// (SParam.curv_thr>0)) // (SParam.curv_thr>0))
InitByCurvature(mesh,SParam.curvRing); InitByCurvature(mesh,SParam.curvRing);
SelectConstraints(mesh,SParam); SelectConstraints(mesh,SParam);