Removed unsused TMOs. Removed unused sliders and adjusted to default position others.

include/openspace/rendering/framebufferrenderer.h

@@ -128,23 +128,17 @@ public:
     void updateRaycastData();
     void updateDeferredcastData();
     void updateHDRAndFiltering();
-    void updateMSAASamplingPattern();
-
+    
     void setResolution(glm::ivec2 res) override;
     void setNAaSamples(int nAaSamples) override;
     void setHDRExposure(float hdrExposure) override;
     void setGamma(float gamma) override;
-    void setMaxWhite(float maxWhite) override;
-    void setToneMapOperator(int tmOp) override;
     void setHue(float hue) override;
     void setValue(float value) override;
     void setSaturation(float sat) override;
-    void setLightness(float lightness) override;
-    void setColorSpace(unsigned int colorspace) override;
-
+    
     int nAaSamples() const override;
-    const std::vector<double>& mSSAPattern() const override;
-
+    
     void update() override;
     void performRaycasterTasks(const std::vector<RaycasterTask>& tasks);
     void performDeferredTasks(const std::vector<DeferredcasterTask>& tasks);
@@ -181,8 +175,7 @@ private:
     UniformCache(mainColorTexture, blackoutFactor, nAaSamples) _uniformCache;
     
     UniformCache(hdrFeedingTexture, blackoutFactor, hdrExposure, gamma,
-                 toneMapOperator, maxWhite, Hue, Saturation, Value, 
-                 Lightness, colorSpace, nAaSamples) _hdrUniformCache;
+                 Hue, Saturation, Value, nAaSamples) _hdrUniformCache;
 
     GLint _defaultFBO;
     GLuint _screenQuad;
@@ -204,20 +197,14 @@ private:
 
     glm::ivec2 _resolution = glm::ivec2(0);
     int _nAaSamples;
+    
     float _hdrExposure = 3.7f;
     float _gamma = 0.95f;
     float _maxWhite = 5.0f;
-    int _toneMapOperator = 8;
-    bool _histogramEnabled = false;
     float _hue = 1.f;
-    float _saturation = 1.2f;
+    float _saturation = 1.f;
     float _value = 1.f;
-    float _lightness = 1.1f;
-    unsigned int _colorSpace = 1;
-
-    std::vector<double> _mSAAPattern;
-    std::vector<float> _histoPoints;
-
+    
     ghoul::Dictionary _rendererData;
 };
 

include/openspace/rendering/renderengine.h

@@ -65,26 +65,6 @@ public:
         Invalid
     };
 
-    // The next enum should be synchronized with the 
-    // defines in hdr.glsl file.
-    enum class ToneMapOperators {
-        EXPONENTIAL = 0,
-        LINEAR, //1
-        SIMPLE_REINHARD, //2
-        LUM_BASED_REINHARD, //3
-        WHITE_PRESERVING, //4
-        ROM_BIN_DA_HOUSE, //5
-        FILMIC, //6
-        UNCHARTED, //7
-        COSTA, //8
-        PHOTOGRAPHIC_REINHARD, //9
-    };
-
-    enum class COLORSPACE {
-        HSV = 0,
-        HSL
-    };
-
     RenderEngine();
     ~RenderEngine();
 
@@ -229,26 +209,19 @@ private:
     properties::FloatProperty _globalBlackOutFactor;
     properties::IntProperty _nAaSamples;
     
-    properties::PropertyOwner _tmoOwner;
+    properties::BoolProperty _disableHDRPipeline;
     properties::FloatProperty _hdrExposure;
-    properties::FloatProperty _maxWhite;
-    properties::OptionProperty _toneMapOperator;
-    
-    properties::PropertyOwner _imageOwner;
     properties::FloatProperty _gamma;
 
     properties::FloatProperty _hue;
     properties::FloatProperty _saturation;
     properties::FloatProperty _value;
-    properties::FloatProperty _lightness;
-
+    
     properties::FloatProperty _horizFieldOfView;
 
     properties::Vec3Property _globalRotation;
     properties::Vec3Property _screenSpaceRotation;
     properties::Vec3Property _masterRotation;
-
-    properties::OptionProperty _colorSpace;
     
     uint64_t _frameNumber = 0;
 

include/openspace/rendering/renderer.h

@@ -52,16 +52,10 @@ public:
     virtual void setNAaSamples(int nAaSamples) = 0;
     virtual void setHDRExposure(float hdrExposure) = 0;
     virtual void setGamma(float gamma) = 0;
-    virtual void setMaxWhite(float maxWhite) = 0;
-    virtual void setToneMapOperator(int tmOp) = 0;
     virtual void setHue(float hue) = 0;
     virtual void setValue(float value) = 0;
     virtual void setSaturation(float sat) = 0;
-    virtual void setLightness(float lightness) = 0;
-    virtual void setColorSpace(unsigned int colorspace) = 0;
-
     virtual int nAaSamples() const = 0;
-    virtual const std::vector<double>& mSSAPattern() const = 0;
 
     /**
     * Set raycasting uniforms on the program object, and setup raycasting.