Przeglądaj źródła

missing includes, use new decimate api

Former-commit-id: d213c7e535ac62a1d3a1e3df0fdbd13c509523e2
Alec Jacobson 8 lat temu
rodzic
commit
4af428011a

+ 2 - 0
include/igl/copyleft/progressive_hulls.cpp

@@ -24,6 +24,8 @@ IGL_INLINE bool igl::copyleft::progressive_hulls(
     F,
     F,
     progressive_hulls_cost_and_placement,
     progressive_hulls_cost_and_placement,
     max_faces_stopping_condition(m,(const int)m,max_m),
     max_faces_stopping_condition(m,(const int)m,max_m),
+    [](const int){return true;},
+    [](const int,const bool){},
     U,
     U,
     G,
     G,
     J,
     J,

+ 1 - 0
include/igl/per_vertex_point_to_plane_quadrics.cpp

@@ -1,4 +1,5 @@
 #include "per_vertex_point_to_plane_quadrics.h"
 #include "per_vertex_point_to_plane_quadrics.h"
+#include "quadric_binary_plus_operator.h"
 #include <Eigen/QR>
 #include <Eigen/QR>
 #include <cassert>
 #include <cassert>
 
 

+ 2 - 2
include/igl/per_vertex_point_to_plane_quadrics.h

@@ -39,8 +39,8 @@ namespace igl
     const Eigen::MatrixXi & EI,
     const Eigen::MatrixXi & EI,
     std::vector<
     std::vector<
       std::tuple<Eigen::MatrixXd,Eigen::RowVectorXd,double> > & quadrics);
       std::tuple<Eigen::MatrixXd,Eigen::RowVectorXd,double> > & quadrics);
-};
-#ifndef IGL_STATIC_LIBRAY
+}
+#ifndef IGL_STATIC_LIBRARY
 #  include "per_vertex_point_to_plane_quadrics.cpp"
 #  include "per_vertex_point_to_plane_quadrics.cpp"
 #endif
 #endif
 #endif
 #endif

+ 2 - 0
include/igl/qslim_optimal_collapse_edge_callbacks.cpp

@@ -1,4 +1,6 @@
 #include "qslim_optimal_collapse_edge_callbacks.h"
 #include "qslim_optimal_collapse_edge_callbacks.h"
+#include "quadric_binary_plus_operator.h"
+#include <Eigen/LU>
 
 
 IGL_INLINE void igl::qslim_optimal_collapse_edge_callbacks(
 IGL_INLINE void igl::qslim_optimal_collapse_edge_callbacks(
   Eigen::MatrixXi & E,
   Eigen::MatrixXi & E,

+ 6 - 1
include/igl/simplify_polyhedron.cpp

@@ -99,6 +99,11 @@ IGL_INLINE void igl::simplify_polyhedron(
   igl::per_face_normals(OV,OF,N);
   igl::per_face_normals(OV,OF,N);
   Eigen::VectorXi I;
   Eigen::VectorXi I;
   igl::decimate(
   igl::decimate(
-    OV,OF,perfect,igl::infinite_cost_stopping_condition(perfect),V,F,J,I);
+    OV,OF,
+    perfect,
+    igl::infinite_cost_stopping_condition(perfect),
+    [](const int){return true;},
+    [](const int,const bool){},
+    V,F,J,I);
 }
 }