diff --git a/.gitattributes b/.gitattributes index efc32858f4f..2c2a98d1027 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3802,20 +3802,17 @@ Surface_mesher/examples/Surface_mesher/skip_vcproj_auto_generation -text Surface_mesher/find_debug_macros -text Surface_mesher/find_non_debug_macros -text Surface_mesher/test/Surface_mesher/combined_spheres.cin -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.ui -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.cpp -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.ui -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_local_spacing_plugin.cpp -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.cpp -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.ui -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.ui -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.ui -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_smoothing_plugin.cpp -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.qrc -text -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake eol=lf -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake.bat eol=crlf +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.ui -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.ui -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.ui -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.ui -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.ui -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp -text +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.qrc -text Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/data/ChineseDragon-points.off -text svneol=unset#application/octet-stream -Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/marching_cubes.h -text Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/resources/about.html svneol=native#text/html Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/resources/check-off.png -text svneol=unset#image/png Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/resources/check-off.svg -text @@ -3825,6 +3822,9 @@ Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_d Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/resources/minus.png -text svneol=unset#image/png Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/resources/plus.png -text svneol=unset#image/png Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/resources/simplification.png -text svneol=unset#image/png +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake eol=lf +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake.bat eol=crlf +Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/marching_cubes.h -text Surface_reconstruction_points_3/doc/reconstruction.pdf -text svneol=unset#application/pdf Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex -text Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/fig/surface_reconstruction_points.jpg -text svneol=unset#image/jpeg diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt index 8f3f8f432e4..f53e830d94c 100644 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt +++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt @@ -1,22 +1,306 @@ -project(Surface_reconstruction_points_3) +# This is the CMake script for compiling the CGAL Point Set demo. + +project( Point_set_demo ) cmake_minimum_required(VERSION 2.4.5) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) -file( GLOB list "*" ) +#option(POINT_SET_DEMO_ENABLE_FORWARD_DECL "In the Point Set demo, enable " OFF) +#mark_as_advanced(POINT_SET_DEMO_ENABLE_FORWARD_DECL) -list( SORT list ) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) -foreach( entry ${list} ) - - if ( IS_DIRECTORY ${entry} ) - - if ( EXISTS ${entry}/CMakeLists.txt ) - message( STATUS "Configuring ${entry} demo" ) - add_subdirectory( ${entry} ) +# Use packages improved since CGAL 3.4, if checked out +foreach(DEP_PKG STL_Extension GraphicsView Filtered_kernel Profiling_tools Mesh_3) + foreach(CGAL_SVN_TRUNK ../../../ ../../trunk ..) + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${CGAL_SVN_TRUNK}/${DEP_PKG}/include") + include_directories (BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/${CGAL_SVN_TRUNK}/${DEP_PKG}/include") + break() endif() - - endif() - + endforeach() endforeach() + +# Require packages new or improved since CGAL 3.4 +include_directories (BEFORE ../../../../AABB_tree/include) +include_directories (BEFORE ../../../../Surface_mesher/include) +include_directories (BEFORE ../../../../Polyhedron/include/) +include_directories (BEFORE ../../../../HalfedgeDS/include/) +include_directories (BEFORE ../../../../Point_set_processing_3/include) + +# Include this package's headers first +include_directories( BEFORE ./ ./include ../../../include ) + +# Find CGAL and CGAL Qt4 +find_package(CGAL COMPONENTS Qt4) +include( ${CGAL_USE_FILE} ) + +# Find Qt4 itself +set( QT_USE_QTXML TRUE ) +set( QT_USE_QTMAIN TRUE ) +set( QT_USE_QTSCRIPT TRUE ) +set( QT_USE_QTOPENGL TRUE ) +find_package(Qt4) + +# Find OpenGL +find_package(OpenGL) + +# Find QGLViewer +if(QT4_FOUND) + include(${QT_USE_FILE}) + find_package(QGLViewer ) +endif(QT4_FOUND) + +# Find BLAS, LAPACK and TAUCS (optional), for Poisson +find_package(TAUCS) + +# Find BLAS and LAPACK only (optional), for Jet Fitting +find_package(LAPACK) + +# Find Glew (optional), for splatting +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/GlSplat/cmake) +find_package(GLEW) + +if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) + + include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) + + # Link with BLAS, LAPACK and TAUCS (optional), for Poisson + if(TAUCS_FOUND) + include( ${TAUCS_USE_FILE} ) + add_definitions(-DCGAL_TAUCS_ENABLED) + else(TAUCS_FOUND) + message(STATUS "NOTICE: TAUCS library is not found. Poisson reconstruction will not be available.") + endif(TAUCS_FOUND) + + # Link with BLAS and LAPACK only (optional), for Jet Fitting + if(LAPACK_FOUND) + include( ${LAPACK_USE_FILE} ) + add_definitions(-DCGAL_LAPACK_ENABLED) + else(LAPACK_FOUND) + message(STATUS "NOTICE: LAPACK library is not found. Normal estimation and smoothing will not be available.") + endif(LAPACK_FOUND) + + if(GLEW_FOUND) + include_directories ( ${GLEW_INCLUDE_DIR} ) + add_definitions(-DCGAL_GLEW_ENABLED) + else(GLEW_FOUND) + message(STATUS "NOTICE: GLEW library is not found. Splat rendering will not be available.") + endif(GLEW_FOUND) + + # VisualC++ optimization for applications dealing with large data + if (MSVC) + # Use /EHa option to catch stack overflows. + # Note: TAUCS needs a stack >= 2MB. CGAL default is 10MB. + string(REGEX REPLACE "/EH[asc]*" "/EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + + # Use /FR to turn on IntelliSense + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FR") + + # Allow Windows applications to use up to 3GB of RAM + SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") + + # Turn off stupid VC++ warnings + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4311 /wd4800 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") + + # Prints new compilation options + message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" ) + message( STATUS "USING DEBUG EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_DEBUG}'" ) + message( STATUS "USING RELEASE CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}'" ) + message( STATUS "USING RELEASE EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'" ) + endif() + + # Temporary debugging stuff + ADD_DEFINITIONS( "-DDEBUG_TRACE" ) + #ADD_DEFINITIONS( "-DCGAL_PROFILE" ) + + qt4_wrap_ui( UI_FILES MainWindow.ui) + + include(AddFileDependencies) + + qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.h" MainWindow_moc.cpp ) + add_file_dependencies( MainWindow_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.h" ) + + qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.h" Viewer_moc.cpp ) + add_file_dependencies( Viewer_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.h" ) + + qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/Scene.h" Scene_moc.cpp ) + add_file_dependencies( Scene_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/Scene.h" ) + + qt4_add_resources ( RESOURCE_FILES Point_set_demo.qrc ) + + qt4_automoc(Scene_item.cpp + Scene_plane_item.cpp + Point_set_scene_item.cpp + Scene_polyhedron_item.cpp) + + # AUXILIARY LIBRARIES + add_library(scene_item SHARED + Scene_item.cpp Scene_item.moc + Scene_item_with_display_list.cpp + Polyhedron_demo_plugin_helper.cpp) + target_link_libraries(scene_item ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${GLEW_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + + add_library(scene_basic_objects SHARED + Scene_plane_item.cpp Scene_plane_item.moc) + target_link_libraries(scene_basic_objects scene_item ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + + add_library(scene_polyhedron_item SHARED + Scene_polyhedron_item.cpp Scene_polyhedron_item.moc) + target_link_libraries(scene_polyhedron_item scene_item) + + if(GLEW_FOUND) + qt4_add_resources(gl_splat_rc GlSplat/glsplat.qrc) + add_library(gl_splat SHARED + GlSplat/GlSplat.cpp GlSplat/Shader.cpp ${gl_splat_rc}) + target_link_libraries(gl_splat ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${GLEW_LIBRARIES}) + endif(GLEW_FOUND) + + add_library(point_set SHARED + Point_set_scene_item.cpp Point_set_scene_item.moc) + target_link_libraries(point_set scene_item) + + if(GLEW_FOUND) + target_link_libraries( point_set gl_splat ${GLEW_LIBRARIES} ) + endif(GLEW_FOUND) + + add_definitions(-DQT_STATICPLUGIN) + +# if(POINT_SET_DEMO_ENABLE_FORWARD_DECL) + add_definitions(-DUSE_FORWARD_DECL) + add_executable ( Point_set_demo + ${UI_FILES} + MainWindow.cpp + Point_set_demo.cpp + Viewer.cpp + Scene.cpp + MainWindow_moc.cpp + Scene_moc.cpp + Viewer_moc.cpp + ${RESOURCE_FILES} ) +# else(POINT_SET_DEMO_ENABLE_FORWARD_DECL) +# add_file_dependencies( Point_set_demo.cpp "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp" +# "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp" +# "${CMAKE_CURRENT_BINARY_DIR}/Viewer_moc.cpp" ) +# add_executable ( Point_set_demo Point_set_demo.cpp ${UI_FILES} ${RESOURCE_FILES} ) +# endif(POINT_SET_DEMO_ENABLE_FORWARD_DECL) + + + # Link with Qt libraries + target_link_libraries( Point_set_demo ${QT_LIBRARIES} ) + + # Link with CGAL + target_link_libraries( Point_set_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) + + # Link with libQGLViewer, OpenGL + target_link_libraries( Point_set_demo ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) + + # Link with the scene_item libraries + target_link_libraries( Point_set_demo scene_item scene_polyhedron_item point_set ) + + if(GLEW_FOUND) + target_link_libraries( Point_set_demo gl_splat ${GLEW_LIBRARIES} ) + endif(GLEW_FOUND) + + add_to_cached_list( CGAL_EXECUTABLE_TARGETS Point_set_demo ) + + + ########### + # PLUGINS # + ########### + remove_definitions(-DQT_STATICPLUGIN) + + macro(polyhedron_demo_plugin plugin_name plugin_implementation_base_name) + list_split(option ARGN_TAIL ${ARGN} ) + if(NOT ${option} STREQUAL "EXCLUDE_FROM_ALL") + set(other_sources ${ARGN}) + set(option "") + else() + set(other_sources ${ARGN_TAIL}) + endif() + qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc ) + add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ) + + add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources}) + # Link with Qt + target_link_libraries( ${plugin_name} ${QT_LIBRARIES} ) + # Link with scene_item + target_link_libraries( ${plugin_name} scene_item) + # Link with CGAL + target_link_libraries( ${plugin_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) + endmacro(polyhedron_demo_plugin) + + if(TAUCS_FOUND) + qt4_wrap_ui( POISSON_UI_FILES PS_demo_poisson_plugin.ui) + polyhedron_demo_plugin(PS_demo_poisson_plugin + PS_demo_poisson_plugin + PS_demo_poisson_plugin_cgal_code.cpp + ${POISSON_UI_FILES}) + target_link_libraries(PS_demo_poisson_plugin scene_polyhedron_item point_set) + endif() + + polyhedron_demo_plugin(Polyhedron_demo_inside_out_plugin Polyhedron_demo_inside_out_plugin) + target_link_libraries(Polyhedron_demo_inside_out_plugin scene_polyhedron_item point_set) + + polyhedron_demo_plugin(PS_demo_off_plugin PS_demo_off_plugin) + target_link_libraries(PS_demo_off_plugin scene_polyhedron_item point_set) + + polyhedron_demo_plugin(PS_demo_xyz_plugin PS_demo_xyz_plugin) + target_link_libraries(PS_demo_xyz_plugin scene_polyhedron_item point_set) + + qt4_wrap_ui(SIMPLIFICATION_UI_FILES PS_demo_simplification_plugin.ui) + polyhedron_demo_plugin(PS_demo_simplification_plugin + PS_demo_simplification_plugin + ${SIMPLIFICATION_UI_FILES}) + target_link_libraries(PS_demo_simplification_plugin point_set) + + polyhedron_demo_plugin(PS_demo_local_spacing_plugin PS_demo_local_spacing_plugin) + target_link_libraries(PS_demo_local_spacing_plugin point_set) + + polyhedron_demo_plugin(PS_demo_average_spacing_plugin PS_demo_average_spacing_plugin) + target_link_libraries(PS_demo_average_spacing_plugin point_set) + + if(LAPACK_FOUND) + polyhedron_demo_plugin(PS_demo_smoothing_plugin PS_demo_smoothing_plugin) + target_link_libraries(PS_demo_smoothing_plugin point_set) + endif() + + if(LAPACK_FOUND) + qt4_wrap_ui( NORMAL_UI_FILES PS_demo_normal_estimation_plugin.ui) + polyhedron_demo_plugin(PS_demo_normal_estimation_plugin + PS_demo_normal_estimation_plugin + ${NORMAL_UI_FILES}) + target_link_libraries(PS_demo_normal_estimation_plugin point_set) + endif() + + qt4_wrap_ui( CLEANING_UI_FILES PS_demo_cleaning_plugin.ui) + polyhedron_demo_plugin(PS_demo_cleaning_plugin + PS_demo_cleaning_plugin + ${CLEANING_UI_FILES}) + target_link_libraries(PS_demo_cleaning_plugin point_set) + +else (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) + + set(POINT_SET_DEMO_MISSING_DEPS "") + + if(NOT CGAL_Qt4_FOUND) + set(POINT_SET_DEMO_MISSING_DEPS "the CGAL Qt4 library, ${POINT_SET_DEMO_MISSING_DEPS}") + endif() + + if(NOT QT4_FOUND) + set(POINT_SET_DEMO_MISSING_DEPS "Qt4, ${POINT_SET_DEMO_MISSING_DEPS}") + endif() + + if(NOT OPENGL_FOUND) + set(POINT_SET_DEMO_MISSING_DEPS "OpenGL, ${POINT_SET_DEMO_MISSING_DEPS}") + endif() + + if(NOT QGLVIEWER_FOUND) + set(POINT_SET_DEMO_MISSING_DEPS "QGLViewer, ${POINT_SET_DEMO_MISSING_DEPS}") + endif() + + message(STATUS "NOTICE: This demo requires ${POINT_SET_DEMO_MISSING_DEPS}and will not be compiled.") + +endif (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Kernel_type.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Kernel_type.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Kernel_type.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Kernel_type.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.ui similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/MainWindow.ui rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.ui diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Messages_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Messages_interface.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Messages_interface.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Messages_interface.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_average_spacing_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_average_spacing_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.ui similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_cleaning_plugin.ui rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.ui diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_local_spacing_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_local_spacing_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.ui similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_normal_estimation_plugin.ui rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.ui diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_off_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_off_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.ui similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin.ui rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.ui diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin_cgal_code.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_poisson_plugin_cgal_code.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.ui b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.ui similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_simplification_plugin.ui rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.ui diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_smoothing_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_smoothing_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_xyz_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/PS_demo_xyz_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.qrc b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.qrc similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_demo.qrc rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.qrc diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt deleted file mode 100644 index f53e830d94c..00000000000 --- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/CMakeLists.txt +++ /dev/null @@ -1,306 +0,0 @@ -# This is the CMake script for compiling the CGAL Point Set demo. - -project( Point_set_demo ) - -cmake_minimum_required(VERSION 2.4.5) - -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -#option(POINT_SET_DEMO_ENABLE_FORWARD_DECL "In the Point Set demo, enable " OFF) -#mark_as_advanced(POINT_SET_DEMO_ENABLE_FORWARD_DECL) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -# Use packages improved since CGAL 3.4, if checked out -foreach(DEP_PKG STL_Extension GraphicsView Filtered_kernel Profiling_tools Mesh_3) - foreach(CGAL_SVN_TRUNK ../../../ ../../trunk ..) - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${CGAL_SVN_TRUNK}/${DEP_PKG}/include") - include_directories (BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/${CGAL_SVN_TRUNK}/${DEP_PKG}/include") - break() - endif() - endforeach() -endforeach() - -# Require packages new or improved since CGAL 3.4 -include_directories (BEFORE ../../../../AABB_tree/include) -include_directories (BEFORE ../../../../Surface_mesher/include) -include_directories (BEFORE ../../../../Polyhedron/include/) -include_directories (BEFORE ../../../../HalfedgeDS/include/) -include_directories (BEFORE ../../../../Point_set_processing_3/include) - -# Include this package's headers first -include_directories( BEFORE ./ ./include ../../../include ) - -# Find CGAL and CGAL Qt4 -find_package(CGAL COMPONENTS Qt4) -include( ${CGAL_USE_FILE} ) - -# Find Qt4 itself -set( QT_USE_QTXML TRUE ) -set( QT_USE_QTMAIN TRUE ) -set( QT_USE_QTSCRIPT TRUE ) -set( QT_USE_QTOPENGL TRUE ) -find_package(Qt4) - -# Find OpenGL -find_package(OpenGL) - -# Find QGLViewer -if(QT4_FOUND) - include(${QT_USE_FILE}) - find_package(QGLViewer ) -endif(QT4_FOUND) - -# Find BLAS, LAPACK and TAUCS (optional), for Poisson -find_package(TAUCS) - -# Find BLAS and LAPACK only (optional), for Jet Fitting -find_package(LAPACK) - -# Find Glew (optional), for splatting -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/GlSplat/cmake) -find_package(GLEW) - -if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) - - include_directories ( ${QGLVIEWER_INCLUDE_DIR} ) - - # Link with BLAS, LAPACK and TAUCS (optional), for Poisson - if(TAUCS_FOUND) - include( ${TAUCS_USE_FILE} ) - add_definitions(-DCGAL_TAUCS_ENABLED) - else(TAUCS_FOUND) - message(STATUS "NOTICE: TAUCS library is not found. Poisson reconstruction will not be available.") - endif(TAUCS_FOUND) - - # Link with BLAS and LAPACK only (optional), for Jet Fitting - if(LAPACK_FOUND) - include( ${LAPACK_USE_FILE} ) - add_definitions(-DCGAL_LAPACK_ENABLED) - else(LAPACK_FOUND) - message(STATUS "NOTICE: LAPACK library is not found. Normal estimation and smoothing will not be available.") - endif(LAPACK_FOUND) - - if(GLEW_FOUND) - include_directories ( ${GLEW_INCLUDE_DIR} ) - add_definitions(-DCGAL_GLEW_ENABLED) - else(GLEW_FOUND) - message(STATUS "NOTICE: GLEW library is not found. Splat rendering will not be available.") - endif(GLEW_FOUND) - - # VisualC++ optimization for applications dealing with large data - if (MSVC) - # Use /EHa option to catch stack overflows. - # Note: TAUCS needs a stack >= 2MB. CGAL default is 10MB. - string(REGEX REPLACE "/EH[asc]*" "/EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - - # Use /FR to turn on IntelliSense - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FR") - - # Allow Windows applications to use up to 3GB of RAM - SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE") - - # Turn off stupid VC++ warnings - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4311 /wd4800 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") - - # Prints new compilation options - message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" ) - message( STATUS "USING DEBUG EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_DEBUG}'" ) - message( STATUS "USING RELEASE CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}'" ) - message( STATUS "USING RELEASE EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'" ) - endif() - - # Temporary debugging stuff - ADD_DEFINITIONS( "-DDEBUG_TRACE" ) - #ADD_DEFINITIONS( "-DCGAL_PROFILE" ) - - qt4_wrap_ui( UI_FILES MainWindow.ui) - - include(AddFileDependencies) - - qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.h" MainWindow_moc.cpp ) - add_file_dependencies( MainWindow_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.h" ) - - qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.h" Viewer_moc.cpp ) - add_file_dependencies( Viewer_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.h" ) - - qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/Scene.h" Scene_moc.cpp ) - add_file_dependencies( Scene_moc.cpp "${CMAKE_CURRENT_SOURCE_DIR}/Scene.h" ) - - qt4_add_resources ( RESOURCE_FILES Point_set_demo.qrc ) - - qt4_automoc(Scene_item.cpp - Scene_plane_item.cpp - Point_set_scene_item.cpp - Scene_polyhedron_item.cpp) - - # AUXILIARY LIBRARIES - add_library(scene_item SHARED - Scene_item.cpp Scene_item.moc - Scene_item_with_display_list.cpp - Polyhedron_demo_plugin_helper.cpp) - target_link_libraries(scene_item ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${GLEW_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) - - add_library(scene_basic_objects SHARED - Scene_plane_item.cpp Scene_plane_item.moc) - target_link_libraries(scene_basic_objects scene_item ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) - - add_library(scene_polyhedron_item SHARED - Scene_polyhedron_item.cpp Scene_polyhedron_item.moc) - target_link_libraries(scene_polyhedron_item scene_item) - - if(GLEW_FOUND) - qt4_add_resources(gl_splat_rc GlSplat/glsplat.qrc) - add_library(gl_splat SHARED - GlSplat/GlSplat.cpp GlSplat/Shader.cpp ${gl_splat_rc}) - target_link_libraries(gl_splat ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${GLEW_LIBRARIES}) - endif(GLEW_FOUND) - - add_library(point_set SHARED - Point_set_scene_item.cpp Point_set_scene_item.moc) - target_link_libraries(point_set scene_item) - - if(GLEW_FOUND) - target_link_libraries( point_set gl_splat ${GLEW_LIBRARIES} ) - endif(GLEW_FOUND) - - add_definitions(-DQT_STATICPLUGIN) - -# if(POINT_SET_DEMO_ENABLE_FORWARD_DECL) - add_definitions(-DUSE_FORWARD_DECL) - add_executable ( Point_set_demo - ${UI_FILES} - MainWindow.cpp - Point_set_demo.cpp - Viewer.cpp - Scene.cpp - MainWindow_moc.cpp - Scene_moc.cpp - Viewer_moc.cpp - ${RESOURCE_FILES} ) -# else(POINT_SET_DEMO_ENABLE_FORWARD_DECL) -# add_file_dependencies( Point_set_demo.cpp "${CMAKE_CURRENT_BINARY_DIR}/MainWindow_moc.cpp" -# "${CMAKE_CURRENT_BINARY_DIR}/Scene_moc.cpp" -# "${CMAKE_CURRENT_BINARY_DIR}/Viewer_moc.cpp" ) -# add_executable ( Point_set_demo Point_set_demo.cpp ${UI_FILES} ${RESOURCE_FILES} ) -# endif(POINT_SET_DEMO_ENABLE_FORWARD_DECL) - - - # Link with Qt libraries - target_link_libraries( Point_set_demo ${QT_LIBRARIES} ) - - # Link with CGAL - target_link_libraries( Point_set_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) - - # Link with libQGLViewer, OpenGL - target_link_libraries( Point_set_demo ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) - - # Link with the scene_item libraries - target_link_libraries( Point_set_demo scene_item scene_polyhedron_item point_set ) - - if(GLEW_FOUND) - target_link_libraries( Point_set_demo gl_splat ${GLEW_LIBRARIES} ) - endif(GLEW_FOUND) - - add_to_cached_list( CGAL_EXECUTABLE_TARGETS Point_set_demo ) - - - ########### - # PLUGINS # - ########### - remove_definitions(-DQT_STATICPLUGIN) - - macro(polyhedron_demo_plugin plugin_name plugin_implementation_base_name) - list_split(option ARGN_TAIL ${ARGN} ) - if(NOT ${option} STREQUAL "EXCLUDE_FROM_ALL") - set(other_sources ${ARGN}) - set(option "") - else() - set(other_sources ${ARGN_TAIL}) - endif() - qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc ) - add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ) - - add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources}) - # Link with Qt - target_link_libraries( ${plugin_name} ${QT_LIBRARIES} ) - # Link with scene_item - target_link_libraries( ${plugin_name} scene_item) - # Link with CGAL - target_link_libraries( ${plugin_name} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ) - endmacro(polyhedron_demo_plugin) - - if(TAUCS_FOUND) - qt4_wrap_ui( POISSON_UI_FILES PS_demo_poisson_plugin.ui) - polyhedron_demo_plugin(PS_demo_poisson_plugin - PS_demo_poisson_plugin - PS_demo_poisson_plugin_cgal_code.cpp - ${POISSON_UI_FILES}) - target_link_libraries(PS_demo_poisson_plugin scene_polyhedron_item point_set) - endif() - - polyhedron_demo_plugin(Polyhedron_demo_inside_out_plugin Polyhedron_demo_inside_out_plugin) - target_link_libraries(Polyhedron_demo_inside_out_plugin scene_polyhedron_item point_set) - - polyhedron_demo_plugin(PS_demo_off_plugin PS_demo_off_plugin) - target_link_libraries(PS_demo_off_plugin scene_polyhedron_item point_set) - - polyhedron_demo_plugin(PS_demo_xyz_plugin PS_demo_xyz_plugin) - target_link_libraries(PS_demo_xyz_plugin scene_polyhedron_item point_set) - - qt4_wrap_ui(SIMPLIFICATION_UI_FILES PS_demo_simplification_plugin.ui) - polyhedron_demo_plugin(PS_demo_simplification_plugin - PS_demo_simplification_plugin - ${SIMPLIFICATION_UI_FILES}) - target_link_libraries(PS_demo_simplification_plugin point_set) - - polyhedron_demo_plugin(PS_demo_local_spacing_plugin PS_demo_local_spacing_plugin) - target_link_libraries(PS_demo_local_spacing_plugin point_set) - - polyhedron_demo_plugin(PS_demo_average_spacing_plugin PS_demo_average_spacing_plugin) - target_link_libraries(PS_demo_average_spacing_plugin point_set) - - if(LAPACK_FOUND) - polyhedron_demo_plugin(PS_demo_smoothing_plugin PS_demo_smoothing_plugin) - target_link_libraries(PS_demo_smoothing_plugin point_set) - endif() - - if(LAPACK_FOUND) - qt4_wrap_ui( NORMAL_UI_FILES PS_demo_normal_estimation_plugin.ui) - polyhedron_demo_plugin(PS_demo_normal_estimation_plugin - PS_demo_normal_estimation_plugin - ${NORMAL_UI_FILES}) - target_link_libraries(PS_demo_normal_estimation_plugin point_set) - endif() - - qt4_wrap_ui( CLEANING_UI_FILES PS_demo_cleaning_plugin.ui) - polyhedron_demo_plugin(PS_demo_cleaning_plugin - PS_demo_cleaning_plugin - ${CLEANING_UI_FILES}) - target_link_libraries(PS_demo_cleaning_plugin point_set) - -else (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) - - set(POINT_SET_DEMO_MISSING_DEPS "") - - if(NOT CGAL_Qt4_FOUND) - set(POINT_SET_DEMO_MISSING_DEPS "the CGAL Qt4 library, ${POINT_SET_DEMO_MISSING_DEPS}") - endif() - - if(NOT QT4_FOUND) - set(POINT_SET_DEMO_MISSING_DEPS "Qt4, ${POINT_SET_DEMO_MISSING_DEPS}") - endif() - - if(NOT OPENGL_FOUND) - set(POINT_SET_DEMO_MISSING_DEPS "OpenGL, ${POINT_SET_DEMO_MISSING_DEPS}") - endif() - - if(NOT QGLVIEWER_FOUND) - set(POINT_SET_DEMO_MISSING_DEPS "QGLViewer, ${POINT_SET_DEMO_MISSING_DEPS}") - endif() - - message(STATUS "NOTICE: This demo requires ${POINT_SET_DEMO_MISSING_DEPS}and will not be compiled.") - -endif (CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_scene_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_scene_item.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_scene_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_scene_item.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_scene_item_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item_config.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Point_set_scene_item_config.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_scene_item_config.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_inside_out_plugin.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_inside_out_plugin.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_inside_out_plugin.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_inside_out_plugin.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_io_plugin_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_io_plugin_interface.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_io_plugin_interface.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_io_plugin_interface.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_plugin_helper.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_plugin_helper.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_plugin_helper.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_plugin_helper.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_plugin_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_interface.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_demo_plugin_interface.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_interface.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_type.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_type.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_type_fwd.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type_fwd.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Polyhedron_type_fwd.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_type_fwd.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_basic_objects_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_basic_objects_config.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_basic_objects_config.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_basic_objects_config.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_draw_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_draw_interface.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_draw_interface.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_draw_interface.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_interface.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_interface.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_interface.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_interface.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_config.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item_config.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_config.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item_with_display_list.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item_with_display_list.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item_with_display_list.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_item_with_display_list.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_item_with_display_list.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_plane_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_plane_item.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_plane_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_plane_item.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_plane_item.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_polyhedron_item.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_polyhedron_item.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_polyhedron_item.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_polyhedron_item.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_polyhedron_item_config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item_config.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Scene_polyhedron_item_config.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene_polyhedron_item_config.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Viewer.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.cpp similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Viewer.cpp rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.cpp diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Viewer.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/Viewer.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Viewer.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake.bat b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake.bat similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake.bat rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/cgal_test_with_cmake.bat diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/config.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/config.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/config.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/config.h diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/marching_cubes.h b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/marching_cubes.h similarity index 100% rename from Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/marching_cubes.h rename to Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/marching_cubes.h