Commits (12)
/*! \page changelog Changelog /*! \page changelog Changelog
- <b>OpenFlipper 4.1 ( ?/?/? )</b> - <b>OpenFlipper 4.1 ( ?/?/? )</b>
- <b>ACG</b>
- GlutPrimitiveNode: Added cone support
- <b>Python Subsystem</b> - <b>Python Subsystem</b>
- Exit application on error in scripting with batch mode - Exit application on error in scripting with batch mode
- Correctly output logging information - Correctly output logging information
......
...@@ -464,6 +464,11 @@ CommandLineParseResult parseCommandLine(QCommandLineParser &parser, QString *err ...@@ -464,6 +464,11 @@ CommandLineParseResult parseCommandLine(QCommandLineParser &parser, QString *err
for(auto s : poptions) for(auto s : poptions)
{ {
auto kvp = s.split("="); auto kvp = s.split("=");
// Only consider terms of the kind "key=value"
if(kvp.size() != 2u)
continue;
auto key = kvp[0]; auto key = kvp[0];
auto value = kvp[1]; auto value = kvp[1];
pcloptions.push_back({key, value}); pcloptions.push_back({key, value});
......
...@@ -47,8 +47,7 @@ ...@@ -47,8 +47,7 @@
// //
//============================================================================= //=============================================================================
#ifndef MB_TRIANGLEBSP_HH #pragma once
#define MB_TRIANGLEBSP_HH
//== INCLUDES ================================================================= //== INCLUDES =================================================================
...@@ -222,7 +221,10 @@ public: ...@@ -222,7 +221,10 @@ public:
}; };
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT #if (defined ENABLE_POLYHEDRALMESH_SUPPORT) \
|| (defined ENABLE_HEXAHEDRALMESH_SUPPORT) \
|| (defined ENABLE_TETRAHEDRALMESH_SUPPORT)
#include <OpenVolumeMesh/Core/PropertyHandles.hh> #include <OpenVolumeMesh/Core/PropertyHandles.hh>
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
...@@ -268,9 +270,5 @@ public: ...@@ -268,9 +270,5 @@ public:
: Base(Traits(_mesh), _infinity) {} : Base(Traits(_mesh), _infinity) {}
}; };
#endif // ENABLE_OPENVOLUMEMESH #endif
//=============================================================================
#endif // MB_TRIANGLEBSP_HH defined
//=============================================================================
...@@ -75,6 +75,7 @@ GlutPrimitiveNode::GlutPrimitiveNode( BaseNode* _parent, ...@@ -75,6 +75,7 @@ GlutPrimitiveNode::GlutPrimitiveNode( BaseNode* _parent,
const int stacks = 20; const int stacks = 20;
sphere_ = new ACG::GLSphere(slices,stacks); sphere_ = new ACG::GLSphere(slices,stacks);
cone_ = new ACG::GLCone(slices, stacks, 1.0, 0, true, false);
}; };
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
...@@ -93,6 +94,7 @@ GlutPrimitiveNode::GlutPrimitiveNode(GlutPrimitiveType _type, ...@@ -93,6 +94,7 @@ GlutPrimitiveNode::GlutPrimitiveNode(GlutPrimitiveType _type,
primitives_.push_back(p); primitives_.push_back(p);
sphere_ = new ACG::GLSphere(slices, stacks); sphere_ = new ACG::GLSphere(slices, stacks);
cone_ = new ACG::GLCone(slices, stacks, 1.0, 0, true, false);
} }
void void
...@@ -451,7 +453,12 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM ...@@ -451,7 +453,12 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM
ro.debugName = std::string("glutprimitive.sphere no ") + std::to_string(i) + ": " + name(); ro.debugName = std::string("glutprimitive.sphere no ") + std::to_string(i) + ": " + name();
sphere_->addToRenderer(_renderer, &ro, primitives_[i].size); sphere_->addToRenderer(_renderer, &ro, primitives_[i].size);
break;
case CONE:
//Cone
ro.debugName = std::string("glutprimitive.cone no ") + std::to_string(i) + ": " + name();
cone_->addToRenderer(_renderer, &ro, primitives_[i].innersize);
break; break;
default: default:
......
...@@ -178,7 +178,12 @@ public: ...@@ -178,7 +178,12 @@ public:
/// destructor /// destructor
virtual ~GlutPrimitiveNode() {} virtual ~GlutPrimitiveNode() {
if(sphere_)
delete sphere_;
if(cone_)
delete cone_;
}
/** /**
* Adds a primitive and returns its index. * Adds a primitive and returns its index.
...@@ -241,6 +246,7 @@ private: ...@@ -241,6 +246,7 @@ private:
// Sphere rendering // Sphere rendering
ACG::GLSphere* sphere_; ACG::GLSphere* sphere_;
ACG::GLCone* cone_;
}; };
......
...@@ -118,3 +118,8 @@ IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS ) ...@@ -118,3 +118,8 @@ IF( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} AND NOT ONLY_LIBS )
INSTALL( TARGETS glewinfo visualinfo DESTINATION bin ) INSTALL( TARGETS glewinfo visualinfo DESTINATION bin )
ENDIF( ) ENDIF( )
# Fake successful finder run
set (GLEW_FOUND true PARENT_SCOPE)
set (GLEW_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/include" PARENT_SCOPE)
set (GLEW_LIBRARY glew PARENT_SCOPE)
...@@ -128,6 +128,7 @@ SET (CTEST_DROP_SITE_CDASH FALSE) ...@@ -128,6 +128,7 @@ SET (CTEST_DROP_SITE_CDASH FALSE)
"${CMAKE_SOURCE_DIR}/PluginCollection-*/Plugin-*/CMakeLists.txt" "${CMAKE_SOURCE_DIR}/PluginCollection-*/Plugin-*/CMakeLists.txt"
"${CMAKE_SOURCE_DIR}/Package-*/Plugin-*/CMakeLists.txt" "${CMAKE_SOURCE_DIR}/Package-*/Plugin-*/CMakeLists.txt"
"${CMAKE_SOURCE_DIR}/Package-*/PluginCollection-*/Plugin-*/CMakeLists.txt" "${CMAKE_SOURCE_DIR}/Package-*/PluginCollection-*/Plugin-*/CMakeLists.txt"
"${CMAKE_SOURCE_DIR}/Type-*/Plugin-*/CMakeLists.txt"
) )
foreach (_plugin ${_plugins_in}) foreach (_plugin ${_plugins_in})
......