Cosmetic fixes

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 81b5a43e7a6ef4d6724a39e2ea182e7ecd63586a..40f61b813dd088171beeea361b92dc91dac11a6e 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -23,23 +23,31 @@ ColorCurve::ColorCurve():
        curve.set_wrap(CLAMP_TO_EDGE);
        texturing.attach(1, curve);
 
-       set_peak(0.2);
-       set_brightness(1.5);
+       set_exposure_adjust(0.0f);
+       set_brightness_response(0.4f);
        set_linear();
 }
 
-void ColorCurve::set_peak(float p)
+void ColorCurve::set_exposure_adjust(float e)
+{
+       shdata.uniform("exposure", pow(2.0f, e));
+}
+
+void ColorCurve::set_brightness_response(float b)
+{
+       if(b<=0 || b>1)
+               throw invalid_argument("ColorCurve::set_brightness_response");
+       float t = (b<1 ? pow(b, 1/(1-b)) : 0.0f);
+       shdata.uniform("brightness_response", b, t, pow(t, b));
+}
+
+void ColorCurve::set_peak(float)
 {
-       if(p<0 || p>1)
-               throw invalid_argument("ColorCurve::set_peak");
-       shdata.uniform("peak", p);
 }
 
 void ColorCurve::set_brightness(float b)
 {
-       if(b<1)
-               throw invalid_argument("ColorCurve::set_brightness");
-       shdata.uniform("brightness", b);
+       set_brightness_response(1/b);
 }
 
 void ColorCurve::set_gamma(float g)
@@ -80,5 +88,46 @@ void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Te
        quad.draw(renderer);
 }
 
+
+ColorCurve::Template::Template():
+       exposure_adjust(0.0f),
+       brightness_response(0.4f),
+       gamma(1.0f),
+       srgb(false)
+{ }
+
+ColorCurve *ColorCurve::Template::create(unsigned, unsigned) const
+{
+       RefPtr<ColorCurve> colorcurve = new ColorCurve;
+       colorcurve->set_exposure_adjust(exposure_adjust);
+       colorcurve->set_brightness_response(brightness_response);
+       if(srgb)
+               colorcurve->set_srgb();
+       else
+               colorcurve->set_gamma(gamma);
+       return colorcurve.release();
+}
+
+
+ColorCurve::Template::Loader::Loader(Template &t):
+       DataFile::DerivedObjectLoader<Template, PostProcessor::Template::Loader>(t)
+{
+       add("brightness_response", &Template::brightness_response);
+       add("exposure_adjust", &Template::exposure_adjust);
+       add("gamma", &Loader::gamma);
+       add("srgb", &Loader::srgb);
+}
+
+void ColorCurve::Template::Loader::gamma(float g)
+{
+       obj.gamma = g;
+       obj.srgb = false;
+}
+
+void ColorCurve::Template::Loader::srgb()
+{
+       obj.srgb = true;
+}
+
 } // namespace GL
 } // namespace Msp