ADD: boost and cgal integrated

Author: 9and3

CMakeLists.txt

@@ -63,7 +63,7 @@ else()
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 endif()
 
-add_external_package(Open3D 0.18.0 REQUIRED)
+find_package(Open3D 0.18.0 REQUIRED)
 
 # print the version debug or release of the package
 message(STATUS "Open3D version: ${Open3D_VERSION}"
@@ -85,23 +85,23 @@ if(WIN32)
     endif()
 endif()
 
-# Boost (header-only) -----------------------------------------------------
-# download_submodule_project(boost)
-# add_subdirectory(deps/boost)
-# target_include_directories(${SHARED_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/boost/include)
+# Boost (from system) -----------------------------------------------------
+# download and install from https://sourceforge.net/projects/boost/files/boost-binaries/1.84.0/boost_1_84_0-msvc-14.3-64.exe/download
+find_package(Boost REQUIRED)
 
-# CGAL (header-only) ------------------------------------------------------
-# download_submodule_project(cgal)
-# add_subdirectory(deps/cgal)
-# target_include_directories(${SHARED_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/cgal/include)
+# print boost include dir
+message(STATUS "Boost include dir: ${Boost_INCLUDE_DIRS}")
+
+target_include_directories(${SHARED_LIB_NAME} PUBLIC ${Boost_INCLUDE_DIRS})
 
+# CGAL (header-only) ------------------------------------------------------
+target_include_directories(${SHARED_LIB_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/deps/cgal/include)
 
 #--------------------------------------------------------------------------
 # executable for prototyping
 #--------------------------------------------------------------------------
 set(APP_NAME_EXE diffCheckApp)
 
-
 add_executable(${APP_NAME_EXE} src/diffCheckApp.cc)
 
 set_target_properties(${APP_NAME_EXE} PROPERTIES

ScreenCamera_2024-03-28-11-19-34.json

@@ -44,17 +44,16 @@ if not exist "%targetDir%" (
 
 :: Download the file
 echo Downloading Open3D...
-curl -L -o "%targetDir%\open3d.zip" "%url%"
-
-:: wait for the file to be completely downloaded
-ping -n 5
-
-:: check if the file was downloaded
-if not exist "%targetDir%\open3d.zip" (
-    echo Failed to download Open3D.
-    exit /b 1
+curl -L -o "%filePath%" "%url%"
+
+:: check if the file was downloaded if not wait
+:wait
+if not exist "%filePath%" (
+    echo Waiting for download to complete...
+    timeout /t 5 /nobreak >nul
+    goto wait
 )
-
+echo File downloaded.
 
 :: Extract the file
 echo Extracting Open3D...

ScreenCamera_2024-03-28-11-53-35.json

@@ -1,8 +1,7 @@
 #pragma once
 
 
-// // include CGAL
-// #include <CGAL/IO/PLY/PLY_reader.h>
+// include CGAL 
 
 #include <open3d/Open3D.h>
 

ScreenCapture_2024-03-28-11-19-34.png

@@ -2,6 +2,13 @@
 
 #include <open3d/Open3D.h>
 
+#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Polyhedron_3.h>
+#include <CGAL/IO/PLY/PLY_reader.h>
+
+typedef CGAL::Simple_cartesian<double> Kernel;
+typedef CGAL::Polyhedron_3<Kernel> Polyhedron;
+
 
 namespace diffCheck::io
 {
@@ -15,29 +22,26 @@ namespace diffCheck::io
 
     std::shared_ptr<diffCheck::geometry::DFMesh> ReadPLYMeshFromFile(const std::string &filename)
     {
-        std::shared_ptr<open3d::geometry::TriangleMesh> open3dMesh = open3d::io::CreateMeshFromFile(filename);
         std::shared_ptr<diffCheck::geometry::DFMesh> mesh = std::make_shared<diffCheck::geometry::DFMesh>();
+        std::shared_ptr<open3d::geometry::TriangleMesh> open3dMesh = open3d::io::CreateMeshFromFile(filename);
         mesh->Cvt2DFMesh(open3dMesh);
-        return mesh;
-
-        // FIXME: test if the variable length in open3d is working
-        // // check if the ply is from Rhino by searching for the string "Rhinoceros"
+        
+        // bool isFromRhino = false;
         // std::ifstream file(filename);
         // std::string line;
-        // bool isRhino = false;
         // while (std::getline(file, line))
         // {
-        //     if (line.find("Rhinoceros") != std::string::npos)
+        //     if (line.find("Rhinoeros") != std::string::npos)
         //     {
-        //         isRhino = true;
+        //         isFromRhino = true;
         //         break;
         //     }
         // }
         // file.close();
-        // std::cout << "isRhino: " << isRhino << std::endl;
+        // std::cout << "isFromRhino: " << isFromRhino << std::endl;
+
 
-        // // detect if the ply is of fixed variable lengths or not
-        // bool isFixedLength = false;
+        // bool isFixedLength = false;  // aka Rhino quad/tri exported mesh
         // std::ifstream file2(filename);
         // std::string line2;
         // while (std::getline(file2, line2))
@@ -50,5 +54,7 @@ namespace diffCheck::io
         // }
         // file2.close();
         // std::cout << "isFixedLength: " << isFixedLength << std::endl;
+
+        return mesh;
     }
 } // namespace diffCheck::io

ScreenCapture_2024-03-28-11-53-35.png

@@ -16,6 +16,8 @@ int main()
 
   std::string pathCloud = R"(C:\Users\andre\Downloads\scan_data_normals.ply\scan_data_normals.ply)";
   std::string pathMesh = R"(F:\diffCheck\assets\dataset\mesh_fromRh_unfixedLength.ply)";
+  // std::string pathMesh = R"(F:\diffCheck\temp\03_mesh.ply)";
+
 
   dfMeshPtr->LoadFromPLY(pathMesh);
   // dfPointCloudPtr->LoadFromPLY(pathCloud);