- cleanup in the tutorial ordering

- started global cmakelist to compile all examples
- cleanup in the cmake building system for the tutorials


Former-commit-id: 364c8645e0f7b0fefaffc6cdadca4acec83d31b5

.gitignore

@@ -63,3 +63,4 @@ tutorial/*/build/*
 tutorial/*/Makefile
 external/glew/build
 *buildXcode*
+tutorial/build*

tutorial/101_FileIO/CMakeLists.txt

@@ -7,5 +7,5 @@ set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
-add_executable(101_FileIO ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(101_FileIO ${SHARED_LIBRARIES})
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})

tutorial/102_DrawMesh/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(102_DrawMesh)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})

tutorial/103_DrawMesh/CMakeLists.txt

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(103_DrawMesh)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(103_DrawMesh ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(103_DrawMesh ${SHARED_LIBRARIES})

tutorial/103_Events/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(103_Events)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})

tutorial/104_Colors/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(104_Colors)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})

tutorial/105_Colors/main.cpp → tutorial/104_Colors/main.cpp

@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
 
   // Plot the mesh
   igl::Viewer viewer;
-  viewer.draw_mesh(V, F);
+  viewer.set_mesh(V, F);
 
 
   // Normalize x coordinate between 0 and 1
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
   }
 
   // Add per-vertex colors
-  viewer.draw_colors(C);
+  viewer.set_colors(C);
 
   // Launch the viewer
   viewer.launch();

tutorial/104_Events/CMakeLists.txt

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(104_Events)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(104_Events ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(104_Events ${SHARED_LIBRARIES})

tutorial/105_Colors/CMakeLists.txt

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(105_Colors)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(105_Colors ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(105_Colors ${SHARED_LIBRARIES})

tutorial/105_Overlays/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+project(105_Overlays)
+
+include("../CMakeLists.shared")
+
+set(SOURCES
+${PROJECT_SOURCE_DIR}/main.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES})

tutorial/106_Overlays/CMakeLists.txt

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-project(106_Overlays)
-
-include("../CMakeLists.shared")
-
-set(SOURCES
-${PROJECT_SOURCE_DIR}/main.cpp
-)
-
-add_executable(106_Overlays ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(106_Overlays ${SHARED_LIBRARIES})

tutorial/107_Picking/CMakeLists.txt → tutorial/106_Picking/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
-project(107_Picking)
+project(106_Picking)
 
 include("../CMakeLists.shared")
 
@@ -11,5 +11,5 @@ set(SOURCES
 ${PROJECT_SOURCE_DIR}/main.cpp
 )
 
-add_executable(${CMAKE_PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${SHARED_LIBRARIES} ${EMBREE_LIBRARIES})
+add_executable(${PROJECT_NAME} ${SOURCES} ${SHARED_SOURCES})
+target_link_libraries(${PROJECT_NAME} ${SHARED_LIBRARIES} ${EMBREE_LIBRARIES})

tutorial/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.6)
+
+# Chapter 1
+add_subdirectory("101_FileIO")
+add_subdirectory("102_DrawMesh")
+add_subdirectory("103_Events")
+add_subdirectory("104_Colors")
+add_subdirectory("105_Overlays")
+add_subdirectory("106_Picking")