merge master

.gitmodules

@@ -8,7 +8,7 @@
 [submodule "external/vcglib"]
 	path = external/vcglib
 	url = https://github.com/cnr-isti-vclab/vcglib
-	branch = master
+	branch = devel
 [submodule "external/tbb"]
 	path = external/tbb
 	url = https://github.com/wjakob/tbb

CMakeLists.txt

@@ -31,6 +31,11 @@ file(GLOB MAIN_SOURCES
 	"${PROJECT_SOURCE_DIR}/include/*/*.tpp"
 	"${PROJECT_SOURCE_DIR}/include/*/*.h"
 	"${PROJECT_SOURCE_DIR}/include/*/*.hpp"
+	"${PROJECT_SOURCE_DIR}/include/vcglib/*.h"
+	"${PROJECT_SOURCE_DIR}/include/vcglib/*/*.h"
+	"${PROJECT_SOURCE_DIR}/include/vcglib/*/*/*.h"
+	"${PROJECT_SOURCE_DIR}/include/vcglib/*/*/*/*.h"
+	"${VCG_INCLUDE_DIR}/wrap/ply/plylib.cpp"
 )
 include(update_deps_file)
 update_deps_file("main_sources" "${MAIN_SOURCES}")
@@ -42,13 +47,14 @@ if(MSVC)
 endif()
 
 add_definitions(-DDIP__IS_STATIC -DDIP__ENABLE_ASSERT -DDIP__HAS_JPEG -DDIP__EXCEPTIONS_RECORD_STACK_TRACE)
-add_executable(${PROJECT_NAME} ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/Main.cpp ${VCG_INCLUDE_DIR}/wrap/ply/plylib.cpp)
-target_include_directories(${PROJECT_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/include" ${TBB_INCLUDE_DIR} ${VCG_INCLUDE_DIR} ${DIPlib_INCLUDE_DIR})
+add_executable(${PROJECT_NAME} ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/Main.cpp)
+target_include_directories(${PROJECT_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/include" ${TBB_INCLUDE_DIR} ${VCG_INCLUDE_DIR} ${DIPlib_INCLUDE_DIR} ${EIGEN_INCLUDE_DIR})
 target_link_libraries(${PROJECT_NAME} PRIVATE igl::core DIP tbb_static)
 
 add_executable(SliceTest ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/SliceTest.cpp)
-target_include_directories(SliceTest PRIVATE "${PROJECT_SOURCE_DIR}/include" ${TBB_INCLUDE_DIR} ${VCG_INCLUDE_DIR})
-target_link_libraries(SliceTest PRIVATE igl::core tbb_static)
+target_include_directories(SliceTest PRIVATE "${PROJECT_SOURCE_DIR}/include" ${TBB_INCLUDE_DIR} ${VCG_INCLUDE_DIR} ${EIGEN_INCLUDE_DIR})
+target_link_libraries(SliceTest PRIVATE tbb_static)
 
-add_executable(Fixer ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/FixSelfIntersect.cpp ${VCG_INCLUDE_DIR}/wrap/ply/plylib.cpp)
-target_include_directories(Fixer PRIVATE "${PROJECT_SOURCE_DIR}/include" ${VCG_INCLUDE_DIR})
+add_executable(Fixer ${MAIN_SOURCES} ${PROJECT_SOURCE_DIR}/src/FixSelfIntersect.cpp)
+target_include_directories(Fixer PRIVATE "${PROJECT_SOURCE_DIR}/include" ${TBB_INCLUDE_DIR} ${VCG_INCLUDE_DIR} ${EIGEN_INCLUDE_DIR})
+target_link_libraries(Fixer tbb_static)

README.md

@@ -1,6 +1,8 @@
 # Scaffolder 
-[![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=master)](https://travis-ci.org/nodtem66/Scaffolder) [![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=dev)](https://travis-ci.org/nodtem66/Scaffolder) 
+[![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=master)](https://travis-ci.org/nodtem66/Scaffolder) [![Build Status](https://travis-ci.org/nodtem66/Scaffolder.svg?branch=dev)](https://travis-ci.org/nodtem66/Scaffolder) [![Build Status](https://dev.azure.com/n66/Public%20CI/_apis/build/status/nodtem66.Scaffolder?branchName=master)](https://dev.azure.com/n66/Public%20CI/_build/latest?definitionId=1&branchName=master) [![Build Status](https://dev.azure.com/n66/Public%20CI/_apis/build/status/nodtem66.Scaffolder?branchName=dev)](https://dev.azure.com/n66/Public%20CI/_build/latest?definitionId=1&branchName=dev)
+
 Generate scaffold from STL file with implicit function (Schwarz P/ Gyroid).
+
 ```
 Scaffolder - generate 3D scaffold from STL file
 Usage:
@@ -35,27 +37,22 @@ Usage:
       --inverse                 Enable build inverse 3D scaffold (for pore
                                 connectivity analysis)
       --dirty                   Disable autoclean
+      --fix_self_intersect	    Enable experimental fixing for self-intersect problems (default: false)
+      --qsim DOUBLE (0-1)       % Quadric simplification for reducing the resolution of 3D mesh (default: false)
       --minimum_diameter DOUBLE
                                 used for removing small orphaned (between
                                 0-1) [default: 0.25]
 ```
 
 ## Screenshots
-**Cube and rectlinear with shell**
-
-![Cube with rectlinear and shell](https://github.com/nodtem66/Scaffolder/raw/master/images/cube-rectlinear-shell.png)
-
-**Cube and rectlinear without shell**
 
-![Cube with rectlinear and shell](https://github.com/nodtem66/Scaffolder/raw/master/images/cube-rectlinear.png)
+** The figure of patterns implemented in this program
 
-**Cube and Schwarz P without shell**
+![TPMS Patterns](https://github.com/nodtem66/Scaffolder/raw/master/images/patterns.jpg)
 
-![Cube and Schwarz P without shell](https://github.com/nodtem66/Scaffolder/raw/master/images/cube-schwarzp.png)
+** The examples of generated porous scaffold
 
-**Maxilla bone and Gyroid without shell**
-
-![Maxilla bone and Gyroid without shell](https://github.com/nodtem66/Scaffolder/raw/master/images/maxilla-gyroid.png)
+![Examples porous scaffold](https://github.com/nodtem66/Scaffolder/raw/master/images/examples.jpg)
 
 ## Dependencies
 - [libigl](https://libigl.github.io/)
@@ -76,3 +73,6 @@ Usage:
 - [cxxopts](https://github.com/jarro2783/cxxopts)
 - [ProgressBar](https://github.com/prakhar1989/progress-cpp)
 - [Minimal surface Blog](https://minimalsurfaces.blog/)
+
+## Citation
+

cmake/FindDIPlib.cmake

@@ -39,4 +39,4 @@ set(DIP_ENABLE_STACK_TRACE OFF CACHE INTERNAL "")
 
 list(APPEND CMAKE_MODULE_PATH "${DIPlib_ROOT_DIR}")
 message(STATUS "USE DIR: ${DIPlib_ROOT_DIR}")
-add_subdirectory(${DIPlib_ROOT_DIR})
+add_subdirectory(${DIPlib_ROOT_DIR})

cmake/FindLIBIGL.cmake

@@ -29,4 +29,6 @@ set(LIBIGL_WITH_OPENGL_GLFW OFF CACHE INTERNAL "turn off OPENGL GLFW in LIBIGL")
 set(LIBIGL_USE_STATIC_LIBRARY OFF CACHE INTERNAL "prefer STATIC build")
 
 list(APPEND CMAKE_MODULE_PATH "${LIBIGL_INCLUDE_DIR}/../cmake")
+message(STATUS "USE DIR: ${LIBIGL_INCLUDE_DIR}")
+set(EIGEN_INCLUDE_DIR "${LIBIGL_INCLUDE_DIR}/../external/eigen")
 include(libigl)