Przeglądaj źródła

DELETEME: Local paths

Former-commit-id: 9b1cb6ba0e356363ac2a446a55fadb903eb1f90c
wkevin 10 lat temu
rodzic
commit
22e88cdcd8
3 zmienionych plików z 67 dodań i 63 usunięć
  1. 1 0
      CoMISo
  2. 63 63
      tutorial/CMakeLists.txt
  3. 3 0
      tutorial/cmake/FindGLFWH.cmake

+ 1 - 0
CoMISo

@@ -0,0 +1 @@
+../CoMISo/CoMISo/

+ 63 - 63
tutorial/CMakeLists.txt

@@ -58,67 +58,67 @@ endif(UNIX AND NOT APPLE)
 #message(FATAL_ERROR ${SHARED_LIBRARIES})
 
 # Chapter 1
-add_subdirectory("101_FileIO")
-add_subdirectory("102_DrawMesh")
-add_subdirectory("103_Events")
-add_subdirectory("104_Colors")
-add_subdirectory("105_Overlays")
-
-# Chapter 2
-add_subdirectory("201_Normals")
-add_subdirectory("202_GaussianCurvature")
-add_subdirectory("203_CurvatureDirections")
-add_subdirectory("204_Gradient")
-add_subdirectory("205_Laplacian")
-
-# Chapter 3
-add_subdirectory("301_Slice")
-add_subdirectory("302_Sort")
-add_subdirectory("303_LaplaceEquation")
-add_subdirectory("304_LinearEqualityConstraints")
-add_subdirectory("305_QuadraticProgramming")
-
-# Chapter 4
-add_subdirectory("401_BiharmonicDeformation")
-add_subdirectory("402_PolyharmonicDeformation")
-add_subdirectory("403_BoundedBiharmonicWeights")
-add_subdirectory("404_DualQuaternionSkinning")
-add_subdirectory("405_AsRigidAsPossible")
-add_subdirectory("406_FastAutomaticSkinningTransformations")
-
-# Chapter 5
-add_subdirectory("501_HarmonicParam")
-add_subdirectory("502_LSCMParam")
-add_subdirectory("503_ARAPParam")
-if(LIBCOMISO_FOUND)
-  add_subdirectory("504_NRosyDesign")
+#add_subdirectory("101_FileIO")
+#add_subdirectory("102_DrawMesh")
+#add_subdirectory("103_Events")
+#add_subdirectory("104_Colors")
+#add_subdirectory("105_Overlays")
+#
+## Chapter 2
+#add_subdirectory("201_Normals")
+#add_subdirectory("202_GaussianCurvature")
+#add_subdirectory("203_CurvatureDirections")
+#add_subdirectory("204_Gradient")
+#add_subdirectory("205_Laplacian")
+#
+## Chapter 3
+#add_subdirectory("301_Slice")
+#add_subdirectory("302_Sort")
+#add_subdirectory("303_LaplaceEquation")
+#add_subdirectory("304_LinearEqualityConstraints")
+#add_subdirectory("305_QuadraticProgramming")
+#
+## Chapter 4
+#add_subdirectory("401_BiharmonicDeformation")
+#add_subdirectory("402_PolyharmonicDeformation")
+#add_subdirectory("403_BoundedBiharmonicWeights")
+#add_subdirectory("404_DualQuaternionSkinning")
+#add_subdirectory("405_AsRigidAsPossible")
+#add_subdirectory("406_FastAutomaticSkinningTransformations")
+#
+## Chapter 5
+#add_subdirectory("501_HarmonicParam")
+#add_subdirectory("502_LSCMParam")
+#add_subdirectory("503_ARAPParam")
+#if(LIBCOMISO_FOUND)
+#  add_subdirectory("504_NRosyDesign")
   add_subdirectory("505_MIQ")
-  add_subdirectory("506_FrameField")
-endif(LIBCOMISO_FOUND)
-add_subdirectory("507_PolyVectorField")
-add_subdirectory("508_ConjugateField")
-add_subdirectory("509_Planarization")
-
-# Chapter 6
-if(TINYXML2_FOUND)
-  add_subdirectory("601_Serialization")
-endif(TINYXML2_FOUND)
-if(MATLAB_FOUND)
-  add_subdirectory("602_Matlab")
-endif(MATLAB_FOUND)
-add_subdirectory("604_Triangle")
-add_subdirectory("605_Tetgen")
-if(EMBREE_FOUND)
-  add_subdirectory("606_AmbientOcclusion")
-  add_subdirectory("607_Picking")
-endif(EMBREE_FOUND)
-if(LIM_FOUND)
-  add_subdirectory("608_LIM")
-endif(LIM_FOUND)
-if(CGAL_FOUND)
-  add_subdirectory("609_Boolean")
-endif()
-add_subdirectory("701_Statistics")
-add_subdirectory("702_WindingNumber")
-add_subdirectory("703_Decimation")
-add_subdirectory("704_SignedDistance")
+#  add_subdirectory("506_FrameField")
+#endif(LIBCOMISO_FOUND)
+#add_subdirectory("507_PolyVectorField")
+#add_subdirectory("508_ConjugateField")
+#add_subdirectory("509_Planarization")
+#
+## Chapter 6
+#if(TINYXML2_FOUND)
+#  add_subdirectory("601_Serialization")
+#endif(TINYXML2_FOUND)
+#if(MATLAB_FOUND)
+#  add_subdirectory("602_Matlab")
+#endif(MATLAB_FOUND)
+#add_subdirectory("604_Triangle")
+#add_subdirectory("605_Tetgen")
+#if(EMBREE_FOUND)
+#  add_subdirectory("606_AmbientOcclusion")
+#  add_subdirectory("607_Picking")
+#endif(EMBREE_FOUND)
+#if(LIM_FOUND)
+#  add_subdirectory("608_LIM")
+#endif(LIM_FOUND)
+#if(CGAL_FOUND)
+#  add_subdirectory("609_Boolean")
+#endif()
+#add_subdirectory("701_Statistics")
+#add_subdirectory("702_WindingNumber")
+#add_subdirectory("703_Decimation")
+#add_subdirectory("704_SignedDistance")

+ 3 - 0
tutorial/cmake/FindGLFWH.cmake

@@ -14,6 +14,9 @@ FIND_PATH(GLFW_INCLUDE_DIR GLFW/glfw3.h
     ${PROJECT_SOURCE_DIR}/../../external/glfw/include
     ${PROJECT_SOURCE_DIR}/../external/glfw/include
     ${PROJECT_SOURCE_DIR}/external/glfw/include
+    ${PROJECT_SOURCE_DIR}/../../external/nanogui/ext/glfw/include
+    ${PROJECT_SOURCE_DIR}/../external/nanogui/ext/glfw/include
+    ${PROJECT_SOURCE_DIR}/external/nanogui/ext/glfw/include
     ${PROJECT_SOURCE_DIR}/../../libigl/external/glfw/include
     ${PROJECT_SOURCE_DIR}/../libigl/external/glfw/include
     ${PROJECT_SOURCE_DIR}/libigl/external/glfw/include