Derive ProgramCompiler::DeclarationCombiner from BlockModifier

[libs/gl.git] / source / colorcurve.h

diff --git a/source/colorcurve.h b/source/colorcurve.h
index 82a8526f2f113a91bec2e7217719825b1d6ea311..608af44888ce9edcc3030d135cac98abb3728772 100644 (file)
--- a/source/colorcurve.h
+++ b/source/colorcurve.h
@@ -1,39 +1,59 @@
-#ifndef COLORCURVE_H_
-#define COLORCURVE_H_
+#ifndef MSP_GL_COLORCURVE_H_
+#define MSP_GL_COLORCURVE_H_
 
 #include "postprocessor.h"
 #include "program.h"
 #include "programdata.h"
+#include "texture1d.h"
+#include "texturing.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-Processes oversaturated colors to preserve hues.  When one color component 
-exceeds 1.0, the others are scaled towards white.  A transition curve is also
-applied near 1.0 to prevent the abrupt change in the gradient.
+Processes oversaturated colors to preserve hues.  When one color component
+exceeds 1.0, the overflow is distributed to the other components, scaling the
+color towards white.
 
-Only makes sense when used in an HDR framebuffer.
+Gamma or sRGB correction can also be applied to the output.  It can be used to
+improve color reproduction by performing lighting calculations in linear color
+space and converting to sRGB for display.
 */
 class ColorCurve: public PostProcessor
 {
 private:
        Program shprog;
        ProgramData shdata;
+       Texture1D curve;
+       Texturing texturing;
        const Mesh &quad;
 
 public:
        ColorCurve();
 
-       /// Sets the size of the peak zone.  Must be between 0 and 1, inclusive.
-       void set_peak(float);
+       /** Set exposure adjustment in EV units.  Positive values brighten the
+       image, negative values darken it.  Zero is neutral. */
+       void set_exposure_adjust(float);
+
+       /** Sets the exponent of the */
+       void set_brightness_response(float);
 
-       /** Sets brightness for oversaturated colors.  Must be >= 1.  Suggested
-       values are between 1.5 and 2.0; a value of 1.0 will clamp colors to the
-       saturated value. */
+       // Deprecated functions
+       void set_peak(float);
        void set_brightness(float);
 
-       virtual void render(const Texture2D &, const Texture2D &);
+       /** Sets the gamma value used for mapping output colors.  Allowed range is
+       from 0.1 to 10. */
+       void set_gamma(float);
+
+       /** Sets output mapping to sRGB.  This is almost, but not exactly equivalent
+       to set_gamma(2.2). */
+       void set_srgb();
+
+       /// Sets output mapping to linear.  This is equivalent to set_gamma(1).
+       void set_linear();
+
+       virtual void render(Renderer &, const Texture2D &, const Texture2D &);
 };
 
 } // namespace GL