Browse Source

Merge branch 'vskhitkov-principal_curvature_fix' into dev

Former-commit-id: b9567ca191c8752339ea935a51edc8bc6dd0cec2
hanxiao 6 years ago
parent
commit
9e10c1b534
2 changed files with 7 additions and 8 deletions
  1. 1 2
      tutorial/203_CurvatureDirections/main.cpp
  2. 6 6
      tutorial/CMakeLists.txt

+ 1 - 2
tutorial/203_CurvatureDirections/main.cpp

@@ -39,8 +39,7 @@ int main(int argc, char *argv[])
   // Compute curvature directions via quadric fitting
   // Compute curvature directions via quadric fitting
   MatrixXd PD1,PD2;
   MatrixXd PD1,PD2;
   VectorXd PV1,PV2;
   VectorXd PV1,PV2;
-  std::vector<int> Z;
-  igl::principal_curvature(V,F,PD1,PD2,PV1,PV2,Z);
+  igl::principal_curvature(V,F,PD1,PD2,PV1,PV2);
   // mean curvature
   // mean curvature
   H = 0.5*(PV1+PV2);
   H = 0.5*(PV1+PV2);
 
 

+ 6 - 6
tutorial/CMakeLists.txt

@@ -32,13 +32,13 @@ else()
 endif()
 endif()
 
 
 ### Choose which chapters to compile
 ### Choose which chapters to compile
-option(TUTORIALS_CHAPTER1 "Compile chapter 1" OFF)
+option(TUTORIALS_CHAPTER1 "Compile chapter 1" ON)
 option(TUTORIALS_CHAPTER2 "Compile chapter 2" ON)
 option(TUTORIALS_CHAPTER2 "Compile chapter 2" ON)
-option(TUTORIALS_CHAPTER3 "Compile chapter 3" OFF)
-option(TUTORIALS_CHAPTER4 "Compile chapter 4" OFF)
-option(TUTORIALS_CHAPTER5 "Compile chapter 5" OFF)
-option(TUTORIALS_CHAPTER6 "Compile chapter 6" OFF)
-option(TUTORIALS_CHAPTER7 "Compile chapter 7" OFF)
+option(TUTORIALS_CHAPTER3 "Compile chapter 3" ON)
+option(TUTORIALS_CHAPTER4 "Compile chapter 4" ON)
+option(TUTORIALS_CHAPTER5 "Compile chapter 5" ON)
+option(TUTORIALS_CHAPTER6 "Compile chapter 6" ON)
+option(TUTORIALS_CHAPTER7 "Compile chapter 7" ON)
 
 
 # Store location of tutorial/shared directory
 # Store location of tutorial/shared directory
 set(TUTORIAL_SHARED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/shared CACHE PATH "location of shared tutorial resources")
 set(TUTORIAL_SHARED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/shared CACHE PATH "location of shared tutorial resources")