Commit a9a0e559 authored by Martin Heistermann's avatar Martin Heistermann
Browse files

Introduce ACG::to_Vec4f for color conversions to replace duplicated versions in Propvis.

parent 42750e34
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#define OM_PROPERTY_VISUALIZER_BOOLEAN_CC #define OM_PROPERTY_VISUALIZER_BOOLEAN_CC
#include "OMPropertyVisualizerBoolean.hh" #include "OMPropertyVisualizerBoolean.hh"
#include <ACG/Utils/ColorConversion.hh>
template <typename MeshT> template <typename MeshT>
OMPropertyVisualizerBoolean<MeshT>::OMPropertyVisualizerBoolean(MeshT* _mesh, PropertyInfo _propertyInfo) OMPropertyVisualizerBoolean<MeshT>::OMPropertyVisualizerBoolean(MeshT* _mesh, PropertyInfo _propertyInfo)
...@@ -74,8 +75,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeFaceProp(bool _setDrawMode) ...@@ -74,8 +75,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeFaceProp(bool _setDrawMode)
MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh; MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh;
typename MeshT::Color colorTrue, colorFalse; typename MeshT::Color colorTrue, colorFalse;
colorTrue = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorTrue->color()); colorTrue = ACG::to_Vec4f(booleanWidget->colorTrue->color());
colorFalse = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorFalse->color()); colorFalse = ACG::to_Vec4f(booleanWidget->colorFalse->color());
OpenMesh::FPropHandleT< bool > prop; OpenMesh::FPropHandleT< bool > prop;
...@@ -103,8 +104,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeEdgeProp(bool _setDrawMode) ...@@ -103,8 +104,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeEdgeProp(bool _setDrawMode)
MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh; MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh;
typename MeshT::Color colorTrue, colorFalse; typename MeshT::Color colorTrue, colorFalse;
colorTrue = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorTrue->color()); colorTrue = ACG::to_Vec4f(booleanWidget->colorTrue->color());
colorFalse = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorFalse->color()); colorFalse = ACG::to_Vec4f(booleanWidget->colorFalse->color());
OpenMesh::EPropHandleT< bool > prop; OpenMesh::EPropHandleT< bool > prop;
...@@ -131,8 +132,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeHalfedgeProp(bool _setDrawMode ...@@ -131,8 +132,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeHalfedgeProp(bool _setDrawMode
MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh; MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh;
typename MeshT::Color colorTrue, colorFalse; typename MeshT::Color colorTrue, colorFalse;
colorTrue = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorTrue->color()); colorTrue = ACG::to_Vec4f(booleanWidget->colorTrue->color());
colorFalse = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorFalse->color()); colorFalse = ACG::to_Vec4f(booleanWidget->colorFalse->color());
OpenMesh::HPropHandleT< bool > prop; OpenMesh::HPropHandleT< bool > prop;
...@@ -160,8 +161,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeVertexProp(bool _setDrawMode) ...@@ -160,8 +161,8 @@ void OMPropertyVisualizerBoolean<MeshT>::visualizeVertexProp(bool _setDrawMode)
MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh; MeshT* mesh = OMPropertyVisualizer<MeshT>::mesh;
typename MeshT::Color colorTrue, colorFalse; typename MeshT::Color colorTrue, colorFalse;
colorTrue = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorTrue->color()); colorTrue = ACG::to_Vec4f(booleanWidget->colorTrue->color());
colorFalse = OMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorFalse->color()); colorFalse = ACG::to_Vec4f(booleanWidget->colorFalse->color());
OpenMesh::VPropHandleT< bool > prop; OpenMesh::VPropHandleT< bool > prop;
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#define OM_PROPERTY_VISUALIZER_DOUBLE_CC #define OM_PROPERTY_VISUALIZER_DOUBLE_CC
#include <ACG/Utils/ColorConversion.hh>
#include "OMPropertyVisualizerDouble.hh" #include "OMPropertyVisualizerDouble.hh"
template <typename MeshT> template <typename MeshT>
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#define OM_PROPERTY_VISUALIZER_INTEGER_CC #define OM_PROPERTY_VISUALIZER_INTEGER_CC
#include <ACG/Utils/ColorConversion.hh>
#include "OMPropertyVisualizerInteger.hh" #include "OMPropertyVisualizerInteger.hh"
template <typename MeshT, typename T> template <typename MeshT, typename T>
...@@ -79,8 +80,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeFaceProp(bool _setDrawMode) ...@@ -79,8 +80,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeFaceProp(bool _setDrawMode)
IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget); IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget);
typename MeshT::Color colorMin, colorMax; typename MeshT::Color colorMin, colorMax;
colorMin = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMin->color()); colorMin = ACG::to_Vec4f(integerWidget->intMin->color());
colorMax = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMax->color()); colorMax = ACG::to_Vec4f(integerWidget->intMax->color());
// color coder in [0,1] // color coder in [0,1]
ACG::ColorCoder cc; ACG::ColorCoder cc;
...@@ -169,8 +170,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeEdgeProp(bool _setDrawMode) ...@@ -169,8 +170,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeEdgeProp(bool _setDrawMode)
IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget); IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget);
typename MeshT::Color colorMin, colorMax; typename MeshT::Color colorMin, colorMax;
colorMin = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMin->color()); colorMin = ACG::to_Vec4f(integerWidget->intMin->color());
colorMax = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMax->color()); colorMax = ACG::to_Vec4f(integerWidget->intMax->color());
// color coder in [0,1] // color coder in [0,1]
ACG::ColorCoder cc; ACG::ColorCoder cc;
...@@ -260,8 +261,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeHalfedgeProp(bool _setDrawM ...@@ -260,8 +261,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeHalfedgeProp(bool _setDrawM
IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget); IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget);
typename MeshT::Color colorMin, colorMax; typename MeshT::Color colorMin, colorMax;
colorMin = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMin->color()); colorMin = ACG::to_Vec4f(integerWidget->intMin->color());
colorMax = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMax->color()); colorMax = ACG::to_Vec4f(integerWidget->intMax->color());
// color coder in [0,1] // color coder in [0,1]
ACG::ColorCoder cc; ACG::ColorCoder cc;
...@@ -350,8 +351,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeVertexProp(bool _setDrawMod ...@@ -350,8 +351,8 @@ void OMPropertyVisualizerInteger<MeshT, T>::visualizeVertexProp(bool _setDrawMod
IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget); IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget);
typename MeshT::Color colorMin, colorMax; typename MeshT::Color colorMin, colorMax;
colorMin = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMin->color()); colorMin = ACG::to_Vec4f(integerWidget->intMin->color());
colorMax = OMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMax->color()); colorMax = ACG::to_Vec4f(integerWidget->intMax->color());
// color coder in [0,1] // color coder in [0,1]
ACG::ColorCoder cc; ACG::ColorCoder cc;
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include "OMPropertyVisualizerVector2.hh" #include "OMPropertyVisualizerVector2.hh"
#include <OpenMesh/Core/Utils/Property.hh> #include <OpenMesh/Core/Utils/Property.hh>
#include <ACG/Utils/ColorConversion.hh>
template <typename MeshT, typename VectorType> template <typename MeshT, typename VectorType>
OMPropertyVisualizerVector2<MeshT, VectorType>::OMPropertyVisualizerVector2(MeshT* _mesh, PropertyInfo _propertyInfo) OMPropertyVisualizerVector2<MeshT, VectorType>::OMPropertyVisualizerVector2(MeshT* _mesh, PropertyInfo _propertyInfo)
...@@ -314,7 +315,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeFacePropAsStrokes( ...@@ -314,7 +315,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeFacePropAsStrokes(
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenMesh::FPropHandleT< VectorType > prop; OpenMesh::FPropHandleT< VectorType > prop;
...@@ -354,7 +355,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeEdgePropAsStrokes( ...@@ -354,7 +355,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeEdgePropAsStrokes(
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
//TODO check if this also works if the property is Vec3f //TODO check if this also works if the property is Vec3f
OpenMesh::EPropHandleT< VectorType > prop; OpenMesh::EPropHandleT< VectorType > prop;
...@@ -391,7 +392,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeHalfedgePropAsStro ...@@ -391,7 +392,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeHalfedgePropAsStro
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
//TODO check if this also works if the property is Vec3f //TODO check if this also works if the property is Vec3f
OpenMesh::HPropHandleT< VectorType > prop; OpenMesh::HPropHandleT< VectorType > prop;
...@@ -426,7 +427,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeVertexPropAsStroke ...@@ -426,7 +427,7 @@ void OMPropertyVisualizerVector2<MeshT, VectorType>::visualizeVertexPropAsStroke
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
//TODO check if this also works if the property is Vec3f //TODO check if this also works if the property is Vec3f
OpenMesh::VPropHandleT< VectorType > prop; OpenMesh::VPropHandleT< VectorType > prop;
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#define OM_PROPERTY_VISUALIZER_VECTOR_CC #define OM_PROPERTY_VISUALIZER_VECTOR_CC
#include "OMPropertyVisualizerVector.hh" #include "OMPropertyVisualizerVector.hh"
#include <ACG/Utils/ColorConversion.hh>
template <typename MeshT> template <typename MeshT>
OMPropertyVisualizerVector<MeshT>::OMPropertyVisualizerVector(MeshT* _mesh, PropertyInfo _propertyInfo) OMPropertyVisualizerVector<MeshT>::OMPropertyVisualizerVector(MeshT* _mesh, PropertyInfo _propertyInfo)
...@@ -305,7 +306,7 @@ template <typename MeshT> ...@@ -305,7 +306,7 @@ template <typename MeshT>
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenMesh::FPropHandleT< typename MeshT::Point > prop; OpenMesh::FPropHandleT< typename MeshT::Point > prop;
...@@ -344,7 +345,7 @@ void OMPropertyVisualizerVector<MeshT>::visualizeEdgePropAsStrokes() ...@@ -344,7 +345,7 @@ void OMPropertyVisualizerVector<MeshT>::visualizeEdgePropAsStrokes()
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
//TODO check if this also works if the property is Vec3f //TODO check if this also works if the property is Vec3f
OpenMesh::EPropHandleT< typename MeshT::Point > prop; OpenMesh::EPropHandleT< typename MeshT::Point > prop;
...@@ -380,7 +381,7 @@ void OMPropertyVisualizerVector<MeshT>::visualizeHalfedgePropAsStrokes() ...@@ -380,7 +381,7 @@ void OMPropertyVisualizerVector<MeshT>::visualizeHalfedgePropAsStrokes()
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
//TODO check if this also works if the property is Vec3f //TODO check if this also works if the property is Vec3f
OpenMesh::HPropHandleT< typename MeshT::Point > prop; OpenMesh::HPropHandleT< typename MeshT::Point > prop;
...@@ -414,7 +415,7 @@ void OMPropertyVisualizerVector<MeshT>::visualizeVertexPropAsStrokes() ...@@ -414,7 +415,7 @@ void OMPropertyVisualizerVector<MeshT>::visualizeVertexPropAsStrokes()
lineNode->clear(); lineNode->clear();
typename MeshT::Color color = OMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); typename MeshT::Color color = ACG::to_Vec4f(vectorWidget->lineColor->color());
//TODO check if this also works if the property is Vec3f //TODO check if this also works if the property is Vec3f
OpenMesh::VPropHandleT< typename MeshT::Point > prop; OpenMesh::VPropHandleT< typename MeshT::Point > prop;
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#define OVM_PROPERTY_VISUALIZER_BOOLEAN_CC #define OVM_PROPERTY_VISUALIZER_BOOLEAN_CC
#include <ACG/Utils/ColorConversion.hh>
#include "OVMPropertyVisualizerBoolean.hh" #include "OVMPropertyVisualizerBoolean.hh"
template <typename MeshT> template <typename MeshT>
...@@ -74,8 +75,8 @@ void OVMPropertyVisualizerBoolean<MeshT>::visualizeProp(PropType prop, EntityIte ...@@ -74,8 +75,8 @@ void OVMPropertyVisualizerBoolean<MeshT>::visualizeProp(PropType prop, EntityIte
BooleanWidget* booleanWidget = static_cast<BooleanWidget*>(PropertyVisualizer::widget); BooleanWidget* booleanWidget = static_cast<BooleanWidget*>(PropertyVisualizer::widget);
ACG::Vec4f colorTrue, colorFalse; ACG::Vec4f colorTrue, colorFalse;
colorTrue = OVMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorTrue->color()); colorTrue = ACG::to_Vec4f(booleanWidget->colorTrue->color());
colorFalse = OVMPropertyVisualizer<MeshT>::convertColor(booleanWidget->colorFalse->color()); colorFalse = ACG::to_Vec4f(booleanWidget->colorFalse->color());
VolumeMeshObject<MeshT>* object; VolumeMeshObject<MeshT>* object;
PluginFunctions::getObject(OVMPropertyVisualizer<MeshT>::mObjectID, object); PluginFunctions::getObject(OVMPropertyVisualizer<MeshT>::mObjectID, object);
......
...@@ -53,6 +53,12 @@ ...@@ -53,6 +53,12 @@
#include "OVMPropertyVisualizerDouble.hh" #include "OVMPropertyVisualizerDouble.hh"
#include <ACG/Utils/IColorCoder.hh>
#include <ACG/Utils/LinearTwoColorCoder.hh>
#include <ACG/Utils/ColorConversion.hh>
#include <QObject>
template <typename MeshT> template <typename MeshT>
OVMPropertyVisualizerDouble<MeshT>::OVMPropertyVisualizerDouble(MeshT* _mesh, int objectID, PropertyInfo _propertyInfo) OVMPropertyVisualizerDouble<MeshT>::OVMPropertyVisualizerDouble(MeshT* _mesh, int objectID, PropertyInfo _propertyInfo)
: OVMPropertyVisualizer<MeshT>(_mesh, objectID, _propertyInfo) : OVMPropertyVisualizer<MeshT>(_mesh, objectID, _propertyInfo)
...@@ -70,10 +76,8 @@ void OVMPropertyVisualizerDouble<MeshT>::visualizeProp(PropType prop, EntityIter ...@@ -70,10 +76,8 @@ void OVMPropertyVisualizerDouble<MeshT>::visualizeProp(PropType prop, EntityIter
if (!prop) return; if (!prop) return;
DoubleWidget* doubleWidget = static_cast<DoubleWidget*>(PropertyVisualizer::widget); DoubleWidget* doubleWidget = static_cast<DoubleWidget*>(PropertyVisualizer::widget);
ACG::Vec4f colorMin, colorMax; ACG::Vec4f colorMin = ACG::to_Vec4f(doubleWidget->doubleMin->color());
ACG::Vec4f colorMax = ACG::to_Vec4f(doubleWidget->doubleMax->color());
colorMin = OVMPropertyVisualizer<MeshT>::convertColor(doubleWidget->doubleMin->color());
colorMax = OVMPropertyVisualizer<MeshT>::convertColor(doubleWidget->doubleMax->color());
// color coder in [0,1] // color coder in [0,1]
ACG::ColorCoder cc; ACG::ColorCoder cc;
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#define OVM_PROPERTY_VISUALIZER_ITEGER_CC #define OVM_PROPERTY_VISUALIZER_ITEGER_CC
#include "OVMPropertyVisualizerInteger.hh" #include "OVMPropertyVisualizerInteger.hh"
#include <ACG/Utils/ColorConversion.hh>
template <typename MeshT, typename T> template <typename MeshT, typename T>
OVMPropertyVisualizerInteger<MeshT,T>::OVMPropertyVisualizerInteger(MeshT* _mesh, int objectID, PropertyInfo _propertyInfo, bool isUnsigned) OVMPropertyVisualizerInteger<MeshT,T>::OVMPropertyVisualizerInteger(MeshT* _mesh, int objectID, PropertyInfo _propertyInfo, bool isUnsigned)
...@@ -83,8 +84,8 @@ void OVMPropertyVisualizerInteger<MeshT, T>::visualizeProp(PropType prop, Entity ...@@ -83,8 +84,8 @@ void OVMPropertyVisualizerInteger<MeshT, T>::visualizeProp(PropType prop, Entity
IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget); IntegerWidget* integerWidget = static_cast<IntegerWidget*>(PropertyVisualizer::widget);
ACG::Vec4f colorMin, colorMax; ACG::Vec4f colorMin, colorMax;
colorMin = OVMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMin->color()); colorMin = ACG::to_Vec4f(integerWidget->intMin->color());
colorMax = OVMPropertyVisualizer<MeshT>::convertColor(integerWidget->intMax->color()); colorMax = ACG::to_Vec4f(integerWidget->intMax->color());
std::map< int, ACG::Vec4f> randomColor; std::map< int, ACG::Vec4f> randomColor;
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#define OVM_PROPERTY_VISUALIZER_VECTOR_CC #define OVM_PROPERTY_VISUALIZER_VECTOR_CC
#include <ACG/Utils/ColorConversion.hh>
#include "OVMPropertyVisualizerVector.hh" #include "OVMPropertyVisualizerVector.hh"
...@@ -222,7 +223,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeFacePropAsStrokes() ...@@ -222,7 +223,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeFacePropAsStrokes()
lineNode->clear(); lineNode->clear();
ACG::Vec4f color = OVMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); ACG::Vec4f color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenVolumeMesh::FacePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_face_property<ACG::Vec3d>(PropertyVisualizer::propertyInfo.propName()); OpenVolumeMesh::FacePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_face_property<ACG::Vec3d>(PropertyVisualizer::propertyInfo.propName());
...@@ -263,7 +264,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeEdgePropAsStrokes() ...@@ -263,7 +264,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeEdgePropAsStrokes()
lineNode->clear(); lineNode->clear();
ACG::Vec4f color = OVMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); ACG::Vec4f color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenVolumeMesh::EdgePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_edge_property<ACG::Vec3d>(OVMPropertyVisualizer<MeshT>::propertyInfo.propName()); OpenVolumeMesh::EdgePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_edge_property<ACG::Vec3d>(OVMPropertyVisualizer<MeshT>::propertyInfo.propName());
if ( !prop ) if ( !prop )
...@@ -299,7 +300,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeHalfedgePropAsStrokes() ...@@ -299,7 +300,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeHalfedgePropAsStrokes()
lineNode->clear(); lineNode->clear();
ACG::Vec4f color = OVMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); ACG::Vec4f color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenVolumeMesh::HalfEdgePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_halfedge_property<ACG::Vec3d>(OVMPropertyVisualizer<MeshT>::propertyInfo.propName()); OpenVolumeMesh::HalfEdgePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_halfedge_property<ACG::Vec3d>(OVMPropertyVisualizer<MeshT>::propertyInfo.propName());
if ( !prop ) if ( !prop )
...@@ -334,7 +335,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeVertexPropAsStrokes() ...@@ -334,7 +335,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeVertexPropAsStrokes()
lineNode->clear(); lineNode->clear();
ACG::Vec4f color = OVMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); ACG::Vec4f color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenVolumeMesh::VertexPropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_vertex_property<ACG::Vec3d>(OVMPropertyVisualizer<MeshT>::propertyInfo.propName()); OpenVolumeMesh::VertexPropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_vertex_property<ACG::Vec3d>(OVMPropertyVisualizer<MeshT>::propertyInfo.propName());
if ( !prop ) if ( !prop )
...@@ -365,7 +366,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeCellPropAsStrokes() ...@@ -365,7 +366,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeCellPropAsStrokes()
lineNode->clear(); lineNode->clear();
ACG::Vec4f color = OVMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); ACG::Vec4f color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenVolumeMesh::CellPropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_cell_property<ACG::Vec3d>(PropertyVisualizer::propertyInfo.propName()); OpenVolumeMesh::CellPropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_cell_property<ACG::Vec3d>(PropertyVisualizer::propertyInfo.propName());
...@@ -402,7 +403,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeHalffacePropAsStrokes() ...@@ -402,7 +403,7 @@ void OVMPropertyVisualizerVector<MeshT>::visualizeHalffacePropAsStrokes()
lineNode->clear(); lineNode->clear();
ACG::Vec4f color = OVMPropertyVisualizer<MeshT>::convertColor(vectorWidget->lineColor->color()); ACG::Vec4f color = ACG::to_Vec4f(vectorWidget->lineColor->color());
OpenVolumeMesh::HalfFacePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_halfface_property<ACG::Vec3d>(PropertyVisualizer::propertyInfo.propName()); OpenVolumeMesh::HalfFacePropertyT<ACG::Vec3d> prop = OVMPropertyVisualizer<MeshT>::mesh->template request_halfface_property<ACG::Vec3d>(PropertyVisualizer::propertyInfo.propName());
......
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