Browse Source

small fixes to slim

Francis Williams 6 years ago
parent
commit
81c74cf300
3 changed files with 11 additions and 10 deletions
  1. 7 6
      include/igl/MappingEnergyType.h
  2. 2 2
      include/igl/slim.cpp
  3. 2 2
      include/igl/slim.h

+ 7 - 6
include/igl/MappingEnergyType.h

@@ -15,12 +15,13 @@ namespace igl
   
   enum MappingEnergyType
   {
-    ARAP,
-    LOG_ARAP,
-    SYMMETRIC_DIRICHLET,
-    CONFORMAL,
-    EXP_CONFORMAL,
-    EXP_SYMMETRIC_DIRICHLET
+    ARAP = 0,
+    LOG_ARAP = 1,
+    SYMMETRIC_DIRICHLET = 2,
+    CONFORMAL = 3,
+    EXP_CONFORMAL = 4,
+    EXP_SYMMETRIC_DIRICHLET = 5,
+    NUM_SLIM_ENERGY_TYPES = 6
   };
 }
 #endif

+ 2 - 2
include/igl/slim.cpp

@@ -747,8 +747,8 @@ IGL_INLINE void igl::slim_precompute(
   const Eigen::MatrixXd &V_init, 
   igl::SLIMData &data,
   igl::MappingEnergyType slim_energy, 
-  Eigen::VectorXi &b, 
-  Eigen::MatrixXd &bc,
+  const Eigen::VectorXi &b,
+  const Eigen::MatrixXd &bc,
   double soft_p)
 {
 

+ 2 - 2
include/igl/slim.h

@@ -85,8 +85,8 @@ IGL_INLINE void slim_precompute(
   const Eigen::MatrixXd& V_init,
   SLIMData& data,
   MappingEnergyType slim_energy,
-  Eigen::VectorXi& b,
-  Eigen::MatrixXd& bc,
+  const Eigen::VectorXi& b,
+  const Eigen::MatrixXd& bc,
   double soft_p);
 
 // Run iter_num iterations of SLIM