Commit f318af5c authored by Artur Grunau's avatar Artur Grunau
Browse files

Update the typedefs of floating point properties

Floating point properties were previously typedef'd to specific
instantiations of NumericProperty. Now that we have
FloatingPointProperty, which extends NumericProperty to control how many
decimal places should be shown when displaying the property's value, all
typedefs for floating point properties have been updated to point to it
instead.

As a result, many processors and pipelines needed to have their includes
and/or constructors fixed to import and work with the new typedefs.
parent 257fd9e1
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "core/pipeline/abstractprocessor.h" #include "core/pipeline/abstractprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace tgt { namespace tgt {
class Shader; class Shader;
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include <string> #include <string>
#include "core/pipeline/raycastingprocessor.h" #include "core/pipeline/raycastingprocessor.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h"
#include "core/properties/transferfunctionproperty.h" #include "core/properties/transferfunctionproperty.h"
namespace tgt { namespace tgt {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "core/properties/cameraproperty.h" #include "core/properties/cameraproperty.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/floatingpointproperty.h"
namespace tgt { namespace tgt {
class Shader; class Shader;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "core/pipeline/processordecoratorbackground.h" #include "core/pipeline/processordecoratorbackground.h"
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
namespace tgt { namespace tgt {
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#define SIMPLERAYCASTER_H__ #define SIMPLERAYCASTER_H__
#include "core/pipeline/raycastingprocessor.h" #include "core/pipeline/raycastingprocessor.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h"
#include "core/properties/transferfunctionproperty.h" #include "core/properties/transferfunctionproperty.h"
#include <string> #include <string>
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "core/pipeline/abstractprocessordecorator.h" #include "core/pipeline/abstractprocessordecorator.h"
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/optionproperty.h" #include "core/properties/optionproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
......
...@@ -44,7 +44,8 @@ namespace campvis { ...@@ -44,7 +44,8 @@ namespace campvis {
: AbstractProcessor() : AbstractProcessor()
, p_mirrorID("geometryID", "Output Geometry ID", "mirror", DataNameProperty::WRITE) , p_mirrorID("geometryID", "Output Geometry ID", "mirror", DataNameProperty::WRITE)
, p_mirrorCenter("mirrorCenter", "Mirror Center", tgt::vec3(1.f), tgt::vec3(-100.f), tgt::vec3(100.f), tgt::vec3(0.1f)) , p_mirrorCenter("mirrorCenter", "Mirror Center", tgt::vec3(1.f), tgt::vec3(-100.f), tgt::vec3(100.f), tgt::vec3(0.1f))
, p_mirrorNormal("mirrorNormal", "Mirror Normal", tgt::vec3(0.f, 1.f, 0.f), tgt::vec3(-1.f), tgt::vec3(1.f), tgt::vec3(0.01f), AbstractProcessor::VALID) , p_mirrorNormal("mirrorNormal", "Mirror Normal", tgt::vec3(0.f, 1.f, 0.f), tgt::vec3(-1.f), tgt::vec3(1.f),
tgt::vec3(0.001f), tgt::ivec3(3), AbstractProcessor::VALID)
, p_size("mirrorSize", "Mirror Size", 4.0f, 0.1f, 1000.0f, 0.1f) , p_size("mirrorSize", "Mirror Size", 4.0f, 0.1f, 1000.0f, 0.1f)
, p_numVertices("Roundness", "Roundness", 16, 4, 128, 1) , p_numVertices("Roundness", "Roundness", 16, 4, 128, 1)
, p_poi("poi", "Point of Interest", tgt::vec3::zero, tgt::vec3(-100.f), tgt::vec3(1000.f), tgt::vec3(0.1f)) , p_poi("poi", "Point of Interest", tgt::vec3::zero, tgt::vec3(-100.f), tgt::vec3(1000.f), tgt::vec3(0.1f))
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "core/classification/abstracttransferfunction.h" #include "core/classification/abstracttransferfunction.h"
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "core/properties/datanameproperty.h" #include "core/properties/datanameproperty.h"
#include "core/properties/floatingpointproperty.h"
#include "core/properties/genericproperty.h" #include "core/properties/genericproperty.h"
#include "core/properties/numericproperty.h" #include "core/properties/numericproperty.h"
#include "core/properties/cameraproperty.h" #include "core/properties/cameraproperty.h"
......
Supports Markdown
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