Commit 5ecc0ac1 authored by Jan Möbius's avatar Jan Möbius

Splitted OpenVolumemesh into separate type dir

parent a7673cf8
include(plugin)
SET( CURRENT_PLUGIN_DEPS "")
if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/PolyhedralMesh)
add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT)
add_definitions (-DENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT)
list( APPEND CURRENT_PLUGIN_DEPS OpenVolumeMesh )
endif()
if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/HexahedralMesh)
add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT)
add_definitions (-DENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT)
list( APPEND CURRENT_PLUGIN_DEPS OpenVolumeMesh )
endif()
if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/BSplineSurface)
add_definitions (-DENABLE_BSPLINESURFACE_SUPPORT)
endif()
list(REMOVE_DUPLICATES CURRENT_PLUGIN_DEPS )
# use Qwt6 for QT5
find_package(Qwt6)
if (QWT6_FOUND)
add_definitions(-DWITH_QWT)
openflipper_plugin( DEPS ${CURRENT_PLUGIN_DEPS} Qwt6
TYPES POLYMESH TRIANGLEMESH)
openflipper_plugin( DEPS Qwt6
OPTDEPS OpenVolumeMesh
TYPES POLYMESH TRIANGLEMESH
OPT_TYPES BSPLINESURFACE HEXAHEDRALMESH POLYHEDRALMESH
)
else()
openflipper_plugin( DEPS ${CURRENT_PLUGIN_DEPS}
TYPES POLYMESH TRIANGLEMESH)
openflipper_plugin( OPTDEPS OpenVolumeMesh
TYPES POLYMESH TRIANGLEMESH HEXAHEDRALMESH POLYHEDRALMESH)
endif()
This diff is collapsed.
......@@ -68,10 +68,10 @@
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
#include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
#endif
#ifdef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT
#ifdef ENABLE_HEXAHEDRALMESH_SUPPORT
#include <ObjectTypes/HexahedralMesh/HexahedralMesh.hh>
#endif
......@@ -200,7 +200,7 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex
template< typename MeshT >
void doUpdateTexture ( Texture& _texture , MeshT& _mesh);
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
/// Calls the correct \a copyTexture() function to copy the texture property into the displayed OVM property
template< typename VolumeMeshT, typename VolumeMeshObjectT >
void doUpdateTextureOVM ( Texture& _texture , VolumeMeshT& _mesh, VolumeMeshObjectT& meshObj);
......@@ -215,7 +215,7 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex
template< typename MeshT >
void handleFileOpenTextures( MeshT*& _mesh , int _objectId );
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
/// Handles data stored in new opened files ( e.g. Texture Information )
template< typename VolumeMeshObjectT >
void handleFileOpenTexturesOVM( VolumeMeshObjectT* _obj, int _id );
......@@ -240,7 +240,7 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex
template< typename MeshT >
void copyTexture(Texture& _texture , MeshT& _mesh, OpenMesh::HPropHandleT< double > _texProp );
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
/// Copy the supplied 1D vertex property to both coordinates of the 2D vertex OVM texture property
template< typename VolumeMeshT, typename VolumeMeshObjectT >
void copyTexture(Texture& _texture , VolumeMeshT& _mesh, VolumeMeshObjectT& _obj, OpenVolumeMesh::VertexPropertyT< double > _texProp );
......@@ -261,7 +261,7 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex
template< typename MeshT >
void copyTexture(Texture& _texture, MeshT& _mesh, OpenMesh::HPropHandleT< ACG::Vec2d > _texProp );
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
/// Copy the supplied 2D vertex property to the 2D vertex OVM property
template< typename VolumeMeshT, typename VolumeMeshObjectT >
void copyTexture(Texture& _texture, VolumeMeshT& _mesh, VolumeMeshObjectT& _obj, OpenVolumeMesh::VertexPropertyT< ACG::Vec2d > _texProp );
......@@ -329,7 +329,7 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex
#include "TextureControl2DTextureHandlingT.cc"
#endif
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
#if defined(INCLUDE_TEMPLATES) && !defined(TEXTURECONTROL_1D_TEXTURE_HANDLING_OVM_C)
#define TEXTURECONTROL_1D_TEXTURE_HANDLING_OVM_TEMPLATES
#include "TextureControl1DTextureHandlingOVMT.cc"
......
......@@ -47,7 +47,7 @@
* *
\*===========================================================================*/
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
#define TEXTURECONTROL_1D_TEXTURE_HANDLING_OVM_C
......
......@@ -47,7 +47,7 @@
* *
\*===========================================================================*/
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
#define TEXTURECONTROL_2D_TEXTURE_HANDLING_OVM_C
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment