diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 447d156ce..e0d900109 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -87,13 +87,25 @@ jobs: #################### Windows: - name: Windows ${{ fromJSON('["Header-Only", "Static"]')[matrix.build-params.static == 'ON'] }} ${{ matrix.build-params.tutorials == 'ON' && 'tutorial' || ''}} ${{ matrix.build-params.tests == 'ON' && 'tests' || ''}} ${{ matrix.config }} + name: Windows ${{ fromJSON('["Header-Only", "Static"]')[matrix.build-params.static == 'ON'] }} ${{ matrix.build-params.tutorials == 'ON' && 'tutorial' || ''}} ${{ matrix.build-params.selected_tutorial != 'NONE' && matrix.build-params.selected_tutorial || '' }} ${{ matrix.build-params.tests == 'ON' && 'tests' || ''}} ${{ matrix.config }} runs-on: windows-2022 strategy: fail-fast: false matrix: config: [Release] - build-params: [ {static: ON, tutorials: ON, tests: ON }, {static: OFF, tutorials: OFF, tests: ON }, {static: OFF, tutorials: ON, tests: OFF }] + build-params: [ + {static: ON, tutorials: ON, tests: ON, selected_tutorial: NONE}, + {static: OFF, tutorials: OFF, tests: ON, selected_tutorial: NONE}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 1}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 2}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 3}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 4}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 5}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 6}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 7}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 8}, + {static: OFF, tutorials: ON, tests: OFF, selected_tutorial: 9}, + ] steps: - name: Checkout repository uses: actions/checkout@v1 @@ -133,6 +145,15 @@ jobs: -DLIBIGL_COPYLEFT_CGAL=ON ^ -DLIBIGL_BUILD_TUTORIALS=${{ matrix.build-params.tutorials }} ^ -DLIBIGL_BUILD_TESTS=${{ matrix.build-params.tests }} ^ + -DLIBIGL_TUTORIALS_CHAPTER1=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '1') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER2=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '2') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER3=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '3') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER4=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '4') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER5=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '5') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER6=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '6') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER7=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '7') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER8=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '8') && 'ON' || 'OFF' }} ^ + -DLIBIGL_TUTORIALS_CHAPTER9=${{ (matrix.build-params.selected_tutorial == 'NONE' || matrix.build-params.selected_tutorial == '9') && 'ON' || 'OFF' }} ^ -B build ^ -S . cmake --build build -j2 diff --git a/tutorial/711_Subdivision/main.cpp b/tutorial/801_Subdivision/main.cpp similarity index 100% rename from tutorial/711_Subdivision/main.cpp rename to tutorial/801_Subdivision/main.cpp diff --git a/tutorial/712_DataSmoothing/main.cpp b/tutorial/802_DataSmoothing/main.cpp similarity index 100% rename from tutorial/712_DataSmoothing/main.cpp rename to tutorial/802_DataSmoothing/main.cpp diff --git a/tutorial/713_ShapeUp/main.cpp b/tutorial/803_ShapeUp/main.cpp similarity index 100% rename from tutorial/713_ShapeUp/main.cpp rename to tutorial/803_ShapeUp/main.cpp diff --git a/tutorial/714_MarchingTets/main.cpp b/tutorial/804_MarchingTets/main.cpp similarity index 100% rename from tutorial/714_MarchingTets/main.cpp rename to tutorial/804_MarchingTets/main.cpp diff --git a/tutorial/715_MeshImplicitFunction/main.cpp b/tutorial/805_MeshImplicitFunction/main.cpp similarity index 100% rename from tutorial/715_MeshImplicitFunction/main.cpp rename to tutorial/805_MeshImplicitFunction/main.cpp diff --git a/tutorial/716_HeatGeodesics/main.cpp b/tutorial/806_HeatGeodesics/main.cpp similarity index 100% rename from tutorial/716_HeatGeodesics/main.cpp rename to tutorial/806_HeatGeodesics/main.cpp diff --git a/tutorial/717_FastWindingNumber/main.cpp b/tutorial/807_FastWindingNumber/main.cpp similarity index 100% rename from tutorial/717_FastWindingNumber/main.cpp rename to tutorial/807_FastWindingNumber/main.cpp diff --git a/tutorial/718_IterativeClosestPoint/main.cpp b/tutorial/808_IterativeClosestPoint/main.cpp similarity index 100% rename from tutorial/718_IterativeClosestPoint/main.cpp rename to tutorial/808_IterativeClosestPoint/main.cpp diff --git a/tutorial/719_ExplodedView/main.cpp b/tutorial/809_ExplodedView/main.cpp similarity index 100% rename from tutorial/719_ExplodedView/main.cpp rename to tutorial/809_ExplodedView/main.cpp diff --git a/tutorial/720_BlueNoise/main.cpp b/tutorial/810_BlueNoise/main.cpp similarity index 100% rename from tutorial/720_BlueNoise/main.cpp rename to tutorial/810_BlueNoise/main.cpp diff --git a/tutorial/721_VectorFieldSmoothing/main.cpp b/tutorial/901_VectorFieldSmoothing/main.cpp similarity index 100% rename from tutorial/721_VectorFieldSmoothing/main.cpp rename to tutorial/901_VectorFieldSmoothing/main.cpp diff --git a/tutorial/722_VectorParallelTransport/main.cpp b/tutorial/902_VectorParallelTransport/main.cpp similarity index 100% rename from tutorial/722_VectorParallelTransport/main.cpp rename to tutorial/902_VectorParallelTransport/main.cpp diff --git a/tutorial/723_FastFindSelfIntersections/main.cpp b/tutorial/903_FastFindSelfIntersections/main.cpp similarity index 100% rename from tutorial/723_FastFindSelfIntersections/main.cpp rename to tutorial/903_FastFindSelfIntersections/main.cpp diff --git a/tutorial/724_FastFindIntersections/main.cpp b/tutorial/904_FastFindIntersections/main.cpp similarity index 100% rename from tutorial/724_FastFindIntersections/main.cpp rename to tutorial/904_FastFindIntersections/main.cpp diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index 032dc9e91..dcb763259 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -6,6 +6,8 @@ option(LIBIGL_TUTORIALS_CHAPTER4 "Compile libigl tutorials chapter 4" ON) option(LIBIGL_TUTORIALS_CHAPTER5 "Compile libigl tutorials chapter 5" ON) option(LIBIGL_TUTORIALS_CHAPTER6 "Compile libigl tutorials chapter 6" ON) option(LIBIGL_TUTORIALS_CHAPTER7 "Compile libigl tutorials chapter 7" ON) +option(LIBIGL_TUTORIALS_CHAPTER8 "Compile libigl tutorials chapter 8" ON) +option(LIBIGL_TUTORIALS_CHAPTER9 "Compile libigl tutorials chapter 9" ON) # Download tutorial data include(libigl_tutorial_data) @@ -103,19 +105,25 @@ if(LIBIGL_TUTORIALS_CHAPTER7) igl_add_tutorial(708_Picking igl::glfw) igl_add_tutorial(709_SLIM igl::glfw) igl_add_tutorial(710_SCAF igl::glfw igl_restricted::triangle) - igl_add_tutorial(711_Subdivision igl::glfw) - igl_add_tutorial(712_DataSmoothing igl::glfw) - igl_add_tutorial(713_ShapeUp igl::glfw) - igl_add_tutorial(714_MarchingTets igl::glfw igl_copyleft::tetgen) - igl_add_tutorial(715_MeshImplicitFunction igl::glfw igl_copyleft::core) - igl_add_tutorial(716_HeatGeodesics igl::glfw) - igl_add_tutorial(717_FastWindingNumber igl::glfw igl_copyleft::cgal) - igl_copy_dll(717_FastWindingNumber) - igl_add_tutorial(718_IterativeClosestPoint igl::glfw) - igl_add_tutorial(719_ExplodedView igl::glfw) - igl_add_tutorial(720_BlueNoise igl::glfw) - igl_add_tutorial(721_VectorFieldSmoothing igl::glfw) - igl_add_tutorial(722_VectorParallelTransport igl::glfw) - igl_add_tutorial(723_FastFindSelfIntersections igl::imgui igl::glfw) - igl_add_tutorial(724_FastFindIntersections igl::imgui igl::glfw) +endif() + +if(LIBIGL_TUTORIALS_CHAPTER8) + igl_add_tutorial(801_Subdivision igl::glfw) + igl_add_tutorial(802_DataSmoothing igl::glfw) + igl_add_tutorial(803_ShapeUp igl::glfw) + igl_add_tutorial(804_MarchingTets igl::glfw igl_copyleft::tetgen) + igl_add_tutorial(805_MeshImplicitFunction igl::glfw igl_copyleft::core) + igl_add_tutorial(806_HeatGeodesics igl::glfw) + igl_add_tutorial(807_FastWindingNumber igl::glfw igl_copyleft::cgal) + igl_copy_dll( 807_FastWindingNumber) + igl_add_tutorial(808_IterativeClosestPoint igl::glfw) + igl_add_tutorial(809_ExplodedView igl::glfw) + igl_add_tutorial(810_BlueNoise igl::glfw) +endif() + +if(LIBIGL_TUTORIALS_CHAPTER9) + igl_add_tutorial(901_VectorFieldSmoothing igl::glfw) + igl_add_tutorial(902_VectorParallelTransport igl::glfw) + igl_add_tutorial(903_FastFindSelfIntersections igl::imgui igl::glfw) + igl_add_tutorial(904_FastFindIntersections igl::imgui igl::glfw) endif()