Commit f619bfe2 authored by Jan Möbius's avatar Jan Möbius

Splitted OpenVolumemesh into separate type dir

parent 5f18c902
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()
list(REMOVE_DUPLICATES CURRENT_PLUGIN_DEPS )
openflipper_plugin ( DEPS ${CURRENT_PLUGIN_DEPS}
INSTALLDATA Icons
openflipper_plugin ( INSTALLDATA Icons
OPTDEPS OpenVolumeMesh
TYPES POLYMESH TRIANGLEMESH
OPT_TYPES BSPLINESURFACE BSPLINECURVE)
OPT_TYPES BSPLINESURFACE BSPLINECURVE HEXAHEDRALMESH POLYHEDRALMESH)
......@@ -51,7 +51,7 @@
#include "PrimitivesGenerator.hh"
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
#include "TetrahedralCuboidGenerator.hh"
#endif
......@@ -143,7 +143,7 @@ void PrimitivesGeneratorPlugin::initializePlugin()
QString("Center position,Number of control points").split(","));
#endif
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
emit setSlotDescription("addTetrahedralCube(Vector,double)",
tr("Generates a tetrahedral mesh of a cube (ObjectId is returned)"),
QString("Position,Length").split(","),
......@@ -214,7 +214,7 @@ void PrimitivesGeneratorPlugin::pluginsInitialized() {
whatsThisGen.setWhatsThis(action,tr("Create a random B-spline surface."),"B-spline surface");
#endif
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
action = primitivesMenu_->addAction("Cube (Tetrahedral Mesh)" ,this,SLOT(addTetrahedralCube()));
action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_cube.png"));
whatsThisGen.setWhatsThis(action,tr("Create a Tetrahedral Cube."), "Cube");
......@@ -256,7 +256,7 @@ int PrimitivesGeneratorPlugin::addPolyMesh() {
}
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
int PrimitivesGeneratorPlugin::addPolyhedralMesh() {
int objectId = -1;
......@@ -382,7 +382,7 @@ int PrimitivesGeneratorPlugin::addTriangulatedCube(const Vector& _position,const
// Tetrahedral cube
//========================================================================
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
int PrimitivesGeneratorPlugin::addTetrahedralCube(const Vector& _position, const double _length)
{
......@@ -395,7 +395,7 @@ int PrimitivesGeneratorPlugin::addTetrahedralCube(const Vector& _position, const
// Tetrahedral Cuboid
//========================================================================
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
int PrimitivesGeneratorPlugin::addTetrahedralCuboid(const Vector& _position,
const Vector& _length, const unsigned int n_x, const unsigned int n_y, const unsigned int n_z)
......
......@@ -61,7 +61,7 @@
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
#include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
#endif
......@@ -160,7 +160,7 @@ public slots:
int addRandomBSplineSurface(const Vector& _position = Vector(0, 0, 0), int nDiv = 5);
#endif
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
int addTetrahedralCube(const Vector& _position = Vector(0.0,0.0,0.0),
const double _length = 2.0);
......@@ -177,7 +177,7 @@ private:
// construct Octahedron in triMesh_
void constructOctahedron(const Vector& _position, const double _length);
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
int addPolyhedralMesh();
#endif
......
......@@ -47,7 +47,7 @@
* *
\*===========================================================================*/
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#ifdef ENABLE_POLYHEDRALMESH_SUPPORT
#include "TetrahedralCuboidGenerator.hh"
......
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