Merge branch 'main' of https://github.com/dcoeurjo/CGDI-Practicals

CMakeLists.txt

@@ -1,9 +1,11 @@
 project(CGDI-c++)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.14)
 
-set(CMAKE_CXX_STANDARD 11)
+
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
@@ -22,11 +24,11 @@ add_subdirectory(image-processing/3-Rasterization/c++/)
 ############################################################
 #Geometry processing
 
-#include(geometry-central)
-#include(polyscope)
+include(geometry-central)
+include(polyscope)
 
-#add_subdirectory(geometry-processing/4-modeling/c++/)
-#add_subdirectory(geometry-processing/5-LaplacianSmoothing/c++/)
-#add_subdirectory(geometry-processing/6-GeomProcessing/c++)
-#add_subdirectory(geometry-processing/7-MonteCarloGeometryProcessing/c++)
+add_subdirectory(geometry-processing/4-modeling/c++/)
+add_subdirectory(geometry-processing/5-LaplacianSmoothing/c++/)
+add_subdirectory(geometry-processing/6-GeomProcessing/c++)
+add_subdirectory(geometry-processing/7-MonteCarloGeometryProcessing/c++)
 ############################################################

cmake/geometry-central.cmake

@@ -2,13 +2,10 @@ if (TARGET geometry-central)
   return()
 endif()
 
-include(FetchContent)
+include(CPM)
 
-message(STATUS "Fetching geometry-central")
-
-FetchContent_Declare(
-    geometry-central
-    GIT_REPOSITORY https://github.com/nmwsharp/geometry-central.git
-    GIT_SHALLOW    TRUE
-    )
-FetchContent_MakeAvailable(geometry-central)
+CPMAddPackage(
+  NAME geometry-central
+  GIT_TAG 70c859ec3b58fe597c0063673a74082654e9c5aa
+  GITHUB_REPOSITORY "nmwsharp/geometry-central"
+)

cmake/polyscope.cmake

@@ -2,14 +2,15 @@ if (TARGET polyscope)
   return()
 endif()
 
-include(FetchContent)
+include(CPM)
 
-message(STATUS "Fetching polyscope")
+set(CMAKE_CXX_FLAGS_DEBUG_OLD "${CMAKE_CXX_FLAGS_DEBUG}")
+set(CMAKE_CXX_FLAGS_DEBUG "-w")
 
-FetchContent_Declare(
-    polyscope
-    GIT_REPOSITORY https://github.com/nmwsharp/polyscope.git
-    GIT_TAG        v1.2.0
-    GIT_SHALLOW    TRUE
-    )
-FetchContent_MakeAvailable(polyscope)
+CPMAddPackage(
+  NAME polyscope
+  VERSION 2.3.0
+  GITHUB_REPOSITORY "nmwsharp/polyscope"
+)
+
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_OLD}")

geometry-processing/4-modeling/c++/simpleTest.cpp

@@ -12,10 +12,10 @@ int main(int argc, char **argv)
   //Some data
   std::vector<std::array<double, 3>> pts={{0,0,0}, {0,0,1}, {0,1,0}, {1,0,0}, {1,1,0},{0,1,1},{1,0,1},{1,1,1}};
   std::vector<double> values = {0.3, 3.4, 0.2, 0.4, 1.2, 4.0,3.6,5.0};
-  
+ 
   auto pcl = polyscope::registerPointCloud("My Points", pts);
   pcl->addScalarQuantity("Some values", values);
-  
+ 
   // Give control to the polyscope gui
   polyscope::show();