Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'peristent_property_manager' into CustomProperties

Browse Source 
# Conflicts:
#	src/OpenMesh/Core/IO/writer/OMWriter.cc
#	src/Unittests/unittests_read_write_OM.cc
This commit is contained in:
Max Lyon
2021-01-19 15:53:29 +01:00
parent cb1365f199 2fba57e123
commit e61eb85fd2
39 changed files with 173 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
if ( NOT DEFINED BUILD_APPS )
set( BUILD_APPS true CACHE BOOL "Enable or disable building of apps" )
@@ -42,7 +42,14 @@ if ( BUILD_APPS )
# For the apps, we need qt and opengl to build them
if (NOT QT5_FOUND)
acg_qt5 ()
set(QT5_REQUIRED_PACKAGES
Qt5Core
Qt5Widgets
Qt5OpenGL
Qt5Gui
)
vci_qt5 ()
set(CMAKE_AUTOMOC ON)
endif()
if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")

6
src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
@@ -21,9 +21,9 @@ set (sources
)
if (WIN32)
acg_add_executable (DecimaterGui WIN32 ${sources} ${headers})
vci_add_executable (DecimaterGui WIN32 ${sources} ${headers})
else ()
acg_add_executable (DecimaterGui ${sources} ${headers} )
vci_add_executable (DecimaterGui ${sources} ${headers} )
endif ()
target_link_libraries (DecimaterGui

4
src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
acg_add_executable (commandlineDecimater ../decimater.cc)
vci_add_executable (commandlineDecimater ../decimater.cc)
target_link_libraries (commandlineDecimater
OpenMeshCore

4
src/OpenMesh/Apps/Dualizer/CMakeLists.txt
View File

@@ -1,10 +1,10 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../..
)
acg_add_executable (Dualizer dualizer.cc)
vci_add_executable (Dualizer dualizer.cc)
target_link_libraries (Dualizer
OpenMeshCore

6
src/OpenMesh/Apps/ProgViewer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../..
@@ -20,9 +20,9 @@ set( sources
)
if (WIN32)
acg_add_executable( ProgViewer WIN32 ${sources} ${headers})
vci_add_executable( ProgViewer WIN32 ${sources} ${headers})
else ()
acg_add_executable( ProgViewer ${sources} ${headers})
vci_add_executable( ProgViewer ${sources} ${headers})
endif ()
target_link_libraries ( ProgViewer

6
src/OpenMesh/Apps/QtViewer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../..
@@ -22,9 +22,9 @@ set (headers
)
if (WIN32)
acg_add_executable (QtViewer WIN32 ${sources} ${headers})
vci_add_executable (QtViewer WIN32 ${sources} ${headers})
else ()
acg_add_executable (QtViewer ${sources} ${headers})
vci_add_executable (QtViewer ${sources} ${headers})
endif ()
target_link_libraries (QtViewer

4
src/OpenMesh/Apps/Smoothing/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
acg_add_executable (Smoothing smooth.cc)
vci_add_executable (Smoothing smooth.cc)
target_link_libraries (Smoothing
OpenMeshCore

6
src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
@@ -20,9 +20,9 @@ set (sources
)
if (WIN32)
acg_add_executable (SubdividerGui WIN32 ${sources} ${headers})
vci_add_executable (SubdividerGui WIN32 ${sources} ${headers})
else ()
acg_add_executable (SubdividerGui ${sources} ${headers})
vci_add_executable (SubdividerGui ${sources} ${headers})
endif ()
target_link_libraries (SubdividerGui

4
src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
acg_add_executable (commandlineAdaptiveSubdivider ../adaptive_subdivider.cc)
vci_add_executable (commandlineAdaptiveSubdivider ../adaptive_subdivider.cc)
target_link_libraries (commandlineAdaptiveSubdivider
OpenMeshCore

4
src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
acg_add_executable (commandlineSubdivider ../subdivider.cc)
vci_add_executable (commandlineSubdivider ../subdivider.cc)
target_link_libraries (commandlineSubdivider
OpenMeshCore

4
src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
acg_add_executable (Analyzer vdpmanalyzer.cc)
vci_add_executable (Analyzer vdpmanalyzer.cc)
target_link_libraries (Analyzer
OpenMeshCore

6
src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
@@ -17,9 +17,9 @@ set (sources
if (WIN32)
acg_add_executable (Synthesizer WIN32 ${sources} ${headers})
vci_add_executable (Synthesizer WIN32 ${sources} ${headers})
else ()
acg_add_executable (Synthesizer ${sources} ${headers})
vci_add_executable (Synthesizer ${sources} ${headers})
endif ()
target_link_libraries (Synthesizer

4
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt
View File

@@ -1,11 +1,11 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
)
acg_add_executable (mkbalancedpm mkbalancedpm.cc)
vci_add_executable (mkbalancedpm mkbalancedpm.cc)
target_link_libraries (mkbalancedpm
OpenMeshCore

4
src/OpenMesh/Apps/mconvert/CMakeLists.txt
View File

@@ -1,10 +1,10 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../../..
)
acg_add_executable (mconvert mconvert.cc)
vci_add_executable (mconvert mconvert.cc)
target_link_libraries (mconvert
OpenMeshCore

22
src/OpenMesh/Core/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../..
@@ -21,12 +21,12 @@ set (directories
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
vci_append_files (headers "*.hh" ${directories})
vci_append_files (sources "*.cc" ${directories})
# Disable Library installation when not building OpenMesh on its own but as part of another project!
if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")
set(ACG_NO_LIBRARY_INSTALL true)
set(VCI_NO_LIBRARY_INSTALL true)
endif()
@@ -34,14 +34,14 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED )
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshCore SHARED ${sources} ${headers})
vci_add_library (OpenMeshCore SHARED ${sources} ${headers})
else()
# OpenMesh has no dll exports so we have to build a static library on windows
acg_add_library (OpenMeshCore STATIC ${sources} ${headers})
vci_add_library (OpenMeshCore STATIC ${sources} ${headers})
endif()
else ()
acg_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
vci_add_library (OpenMeshCore SHAREDANDSTATIC ${sources} ${headers})
set_target_properties (OpenMeshCore PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
@@ -76,7 +76,7 @@ endif()
# Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE )
if ( NOT VCI_PROJECT_MACOS_BUNDLE AND APPLE )
FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" )
FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" )
FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" )
@@ -137,7 +137,7 @@ target_include_directories(OpenMeshCore PUBLIC
$<INSTALL_INTERFACE:include>)
install(TARGETS OpenMeshCore EXPORT OpenMeshConfig
ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR}
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR})
ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}
RUNTIME DESTINATION ${VCI_PROJECT_BINDIR})

2
src/OpenMesh/Core/Geometry/NormalConeT.hh
View File

@@ -72,7 +72,7 @@ namespace OpenMesh {
//== CLASS DEFINITION =========================================================
/** /class NormalCone NormalCone.hh <ACG/Geometry/Types/NormalCone.hh>
/** /class NormalCone NormalCone.hh <OpenMesh/Core/Geometry/NormalConeT.hh>
NormalCone that can be merged with other normal cones. Provides
the center normal and the opening angle.

6
src/OpenMesh/Core/System/compiler.hh
View File

@@ -47,12 +47,6 @@
//=============================================================================
#if defined(ACGMAKE_STATIC_BUILD)
# define OM_STATIC_BUILD 1
#endif
//=============================================================================
#if defined(_DEBUG) || defined(DEBUG)
# define OM_DEBUG
#endif

11
src/OpenMesh/Core/Utils/PropertyManager.hh
View File

@@ -593,6 +593,17 @@ class PropertyManager {
src.copy_to(src_range, dst, dst_range);
}
/**
* Mark whether this property should be stored when mesh is written
* to a file
*
* @param _persistence Property will be stored iff _persistence is true
*/
void set_persistent(bool _persistence = true)
{
mesh().property(getRawProperty()).set_persistent(_persistence);
}
private:
void deleteProperty() {
if (!retain_ && prop_.is_valid())

24
src/OpenMesh/Tools/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
include (ACGCommon)
include (VCICommon)
include_directories (
../..
@@ -19,16 +19,16 @@ set (directories
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
vci_append_files (headers "*.hh" ${directories})
vci_append_files (sources "*.cc" ${directories})
IF(WIN32 AND NOT MINGW)
acg_append_files (sources "*.c" ${directories})
vci_append_files (sources "*.c" ${directories})
ENDIF(WIN32 AND NOT MINGW)
# Disable Library installation when not building OpenMesh on its own but as part of another project!
if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")
set(ACG_NO_LIBRARY_INSTALL true)
set(VCI_NO_LIBRARY_INSTALL true)
endif()
@@ -36,14 +36,14 @@ if (WIN32)
if ( OPENMESH_BUILD_SHARED )
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshTools SHARED ${sources} ${headers})
vci_add_library (OpenMeshTools SHARED ${sources} ${headers})
else()
# OpenMesh has no dll exports so we have to build a static library on windows
acg_add_library (OpenMeshTools STATIC ${sources} ${headers})
vci_add_library (OpenMeshTools STATIC ${sources} ${headers})
endif()
else ()
acg_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
vci_add_library (OpenMeshTools SHAREDANDSTATIC ${sources} ${headers})
set_target_properties (OpenMeshTools PROPERTIES VERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR}
SOVERSION ${OPENMESH_VERSION_MAJOR}.${OPENMESH_VERSION_MINOR} )
endif ()
@@ -74,7 +74,7 @@ endif()
# Install Header Files (Apple)
if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE )
if ( NOT VCI_PROJECT_MACOS_BUNDLE AND APPLE )
FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" )
FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" )
FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" )
@@ -120,7 +120,7 @@ target_include_directories(OpenMeshTools PUBLIC
$<INSTALL_INTERFACE:include>)
install(TARGETS OpenMeshTools EXPORT OpenMeshConfig
ARCHIVE DESTINATION ${ACG_PROJECT_LIBDIR}
LIBRARY DESTINATION ${ACG_PROJECT_LIBDIR}
RUNTIME DESTINATION ${ACG_PROJECT_BINDIR})
ARCHIVE DESTINATION ${VCI_PROJECT_LIBDIR}
LIBRARY DESTINATION ${VCI_PROJECT_LIBDIR}
RUNTIME DESTINATION ${VCI_PROJECT_BINDIR})

2
src/OpenMesh/Tools/Decimater/ModNormalFlippingT.hh
View File

@@ -197,6 +197,6 @@ private:
} // END_NS_DECIMATER
} // END_NS_OPENMESH
//=============================================================================
#endif // OPENACG_MODNORMALFLIPPING_HH defined
#endif // OPENMESH_DECIMATER_MODNORMALFLIPPING_HH defined
//=============================================================================