registration development

.github/workflows/win-build.yml

@@ -20,8 +20,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: CMAKE Configure
-        run: >
-          cmake -B ${{github.workspace}}/build -S ${{github.workspace}} 
-          -D CMAKE_BUILD_TYPE=Release
+        run: ${{github.workspace}}/cmake/config.bat
       - name: CMake Build
-        run: cmake --build ${{github.workspace}}/build --config Release
+        run: ${{github.workspace}}/cmake/build.bat

.gitignore

@@ -68,4 +68,10 @@ _deps
 .history/
 
 # Built Visual Studio Code Extensions
-*.vsix
+*.vsix
+
+#######################################
+## General
+#######################################
+# temp folder
+temp/

.gitmodules

@@ -2,16 +2,6 @@
 	path = deps/googletest
 	url = https://github.com/google/googletest
 	branch = main
-[submodule "deps/open3d"]
-	path = deps/open3d
-	url = https://github.com/diffCheckOrg/submodule-open3d.git
-	branch = main
-[submodule "deps/eigen"]
-	path = deps/eigen
-	url = https://gitlab.com/libeigen/eigen.git
-[submodule "deps/fmt"]
-	path = deps/fmt
-	url = https://github.com/fmtlib/fmt.git
-[submodule "deps/libigl"]
-	path = deps/libigl
-	url = https://github.com/libigl/libigl.git
+[submodule "deps/boost"]
+	path = deps/boost
+	url = https://github.com/diffCheckOrg/submodule-boost.git

.vscode/settings.json

@@ -93,6 +93,9 @@
         "shared_mutex": "cpp",
         "source_location": "cpp",
         "stack": "cpp",
-        "valarray": "cpp"
+        "valarray": "cpp",
+        "*.inc": "cpp",
+        "coroutine": "cpp",
+        "resumable": "cpp"
     }
 }

CMakeLists.txt

@@ -16,14 +16,17 @@ if(NOT GIT_SUBMOD_RESULT EQUAL "0")
     message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
 endif()
 
+
+
 #--------------------------------------------------------------------------
 # diffCheck dynamic lib
 #--------------------------------------------------------------------------
 set(SHARED_LIB_NAME diffCheck)
 
 file(GLOB_RECURSE SOURCES_LIB 
     src/diffCheck.hh                         # diffCheck interface
-    src/diffCheck/*.cc src/diffCheck/*.hh    # diffCheck src
+    src/diffCheck/*.cc src/diffCheck/*.hh    # diffCheck src  
+    src/diffCheck/*.cc src/diffCheck/*.hh    # diffCheck src  
     )
 
 add_library(${SHARED_LIB_NAME} SHARED ${SOURCES_LIB})
@@ -35,69 +38,69 @@ if (WIN32)
 endif()
     set_target_properties(${SHARED_LIB_NAME} PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # for dll
-        # ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin  # for lib
+        ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib  # for lib
+        ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib  # for lib
         )
 target_include_directories(${SHARED_LIB_NAME}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
     )
 
+
+
 #--------------------------------------------------------------------------
 # 3rd party
 #--------------------------------------------------------------------------
-# fmt (header-only)--------------------------------------------------------
-download_submodule_project(fmt)
-add_subdirectory(deps/fmt)
-
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC fmt::fmt)
 
-# Eigen (header-only)------------------------------------------------------
+# Eigen -------------------------------------------------------------------
+# Eigen -------------------------------------------------------------------
 download_submodule_project(eigen)
 add_subdirectory(deps/eigen)
-
 target_link_libraries(${SHARED_LIB_NAME} PUBLIC Eigen3::Eigen)
 
-# OpenGL (from system) ----------------------------------------------------
-find_package(OpenGL REQUIRED)
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC OpenGL::GL)
-target_link_libraries(${SHARED_LIB_NAME} INTERFACE OpenGL::GL)
-
-# Libigl + glfw (header-only) ---------------------------------------------
-download_submodule_project(libigl)
-# all dependecies for libigl: https://libigl.github.io/third-party/
-# set compiling flags for libigl
-set(LIBIGL_USE_STATIC_LIBRARY OFF)
-set(LIBIGL_GLFW ON)
-add_subdirectory(deps/libigl)
-
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC igl::glfw)
-
-# Open3D (pre-build binaries /headless not visuals)------------------------
-download_submodule_project(open3d)
-set(O3D_VERSION 0_17)  # 0.17.0
-set(OPEN3D_SHAREDLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/bin)
-set(OPEN3D_LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/lib)
-set(OPEN3D_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/deps/open3d/win/${O3D_VERSION}/include)
-
-add_library(Open3D SHARED IMPORTED)
-set_target_properties(Open3D PROPERTIES
-    IMPORTED_LOCATION ${OPEN3D_SHAREDLIB_PATH}/Open3D.dll
-    IMPORTED_IMPLIB ${OPEN3D_LIB_PATH}/Open3D.lib
-    INTERFACE_INCLUDE_DIRECTORIES ${OPEN3D_INCLUDE_PATH}
-    )
+# Open3D (from system) -----------------------------------------------------    
+# The options need to be the same as Open3D's default
+# If Open3D is configured and built with custom options, you'll also need to
+# specify the same custom options.
+option(STATIC_WINDOWS_RUNTIME "Use static (MT/MTd) Windows runtime" ON)
+if(STATIC_WINDOWS_RUNTIME)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+else()
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+endif()
+
+find_package(Open3D 0.18.0 REQUIRED)
+
+# print the version debug or release of the package
+message(STATUS "Open3D version: ${Open3D_VERSION}"
+               "Open3D include dir: ${Open3D_INCLUDE_DIRS}"
+               "Open3D library dir: ${Open3D_LIBRARIES}")
+
+# link the release version of the open3d library
+target_link_libraries(${SHARED_LIB_NAME} PUBLIC Open3D::Open3D)
+
+# On Windows if BUILD_SHARED_LIBS is enabled, copy .dll files to the executable directory
+if(WIN32)
+    get_target_property(open3d_type Open3D::Open3D TYPE)
+    if(open3d_type STREQUAL "SHARED_LIBRARY")
+        message(STATUS "Copying Open3D.dll to ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+        add_custom_command(TARGET ${SHARED_LIB_NAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:Open3D::Open3D>
+            $<TARGET_FILE_DIR:${SHARED_LIB_NAME}>)
+    endif()
+endif()
 
-target_link_libraries(${SHARED_LIB_NAME} PUBLIC Open3D)
-target_include_directories(${SHARED_LIB_NAME} PUBLIC ${OPEN3D_INCLUDE_PATH})
+# 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)
 
-# copy the o3d dll to the binary dir to make it available for the app
-set(DEPENDENCIES Open3D)
+# print boost include dir
+message(STATUS "Boost include dir: ${Boost_INCLUDE_DIRS}")
 
-foreach(DEP_LIB ${DEPENDENCIES})
-    add_custom_command(TARGET ${SHARED_LIB_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        $<TARGET_FILE:${DEP_LIB}>
-        $<TARGET_FILE_DIR:${SHARED_LIB_NAME}>
-    )
-endforeach()
+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

README.md

@@ -37,8 +37,8 @@ gantt
     title       diffCheck - backend dev
     excludes    weekends
 
-    data i/o                                 :active, dataio, 2024-03-15, 1w
-    global registration                      :glbreg, after dataio, 2w
+    data i/o                                 :active, dataio, 2024-03-15, 3w
+    global registration                      :glbreg, 2024-03-29, 2w
     semantic seg. from 3D model              :semseg, after glbreg, 1w
     local registration                       :locreg, after semseg, 2w
     error computation + results              :errcomp, after locreg, 1w
@@ -47,18 +47,31 @@ gantt
 ## 3rd party libraries
 
 The project uses the following 3rd party libraries:
-- `Open3d` for 3D point cloud processing (as binary submodule for win64 that we store in [submodule-open3d](https://github.com/diffCheckOrg/submodule-open3d)). Note that we deactivate the visualization part of `Open3d` to avoid conflicts with our visualizator.
+- `Open3d 0.18.0` for 3D point cloud processing it needs to be installed from source [from here](https://github.com/isl-org/Open3D/releases/download/v0.18.0/open3d-devel-windows-amd64-0.18.0.zip), unzip the file and by following the instructions below:
+```terminal
+cd open3d
+mkdir build
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="C:\Program Files\Open3D" -S . -B build
+cmake --build build --config Release --target ALL_BUILD
+cmake --build build --config Release --target INSTALL
+```
 - `Eigen` for linear algebra (needed by `Open3d`)
-- `fmt` for string formatting (needed by `Open3d`)
-- `libigl` mainly for I/O and visualization
-- `glfw` for window and context creation (needed by `libigl`)
+- `CGAL` for general geometric processing and IO
+- `Boost` for general utilities, it needs to be installed from source [from the repo](https://github.com/boostorg/boost) as such:
+```terminal
+git clone --recursive https://github.com/boostorg/boost.git
+cd boost
+cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="C:\Program Files\Boost" -S . -B build
+cmake --build build --config Release --target ALL_BUILD
+cmake --build build --config Release --target INSTALL
+```
 
 ## How to build c++ project
 To build and test the project, follow the following steps:
 
 ```terminal
-cmake -S . -B build
-cmake --build build
+cmake/config.bat
+cmake/build.bat
 ./build/bin/diffCheckApp.exe <-- for prototyping
 ```
 

cmake/build.bat

@@ -0,0 +1 @@
+cmake --build build --config Release

cmake/clean_config.bat

@@ -0,0 +1,2 @@
+rmdir /s /q build
+cmake -S . -B build -G "Visual Studio 16 2019" -A x64

cmake/config.bat

@@ -0,0 +1 @@
+cmake -S . -B build -G "Visual Studio 16 2019" -A x64