Remove the deprecated ProgramBuilder class

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 81b5a43e7a6ef4d6724a39e2ea182e7ecd63586a..8811b065fd3b6f0dddddd86a8e091e08d97bc224 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -13,33 +13,32 @@ namespace GL {
 
 ColorCurve::ColorCurve():
        shprog("colorcurve.glsl"),
-       quad(get_fullscreen_quad())
+       quad(get_fullscreen_quad()),
+       linear_sampler(get_linear_sampler()),
+       nearest_sampler(get_nearest_sampler())
 {
        shdata.uniform("source", 0);
        shdata.uniform("curve", 1);
 
-       curve.storage(LUMINANCE, 256);
-       curve.set_min_filter(LINEAR);
-       curve.set_wrap(CLAMP_TO_EDGE);
-       texturing.attach(1, curve);
+       curve.storage(LUMINANCE8, 256, 1);
+       texturing.attach(1, curve, linear_sampler.get());
 
-       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)
 {
-       if(p<0 || p>1)
-               throw invalid_argument("ColorCurve::set_peak");
-       shdata.uniform("peak", p);
+       shdata.uniform("exposure", pow(2.0f, e));
 }
 
-void ColorCurve::set_brightness(float b)
+void ColorCurve::set_brightness_response(float b)
 {
-       if(b<1)
-               throw invalid_argument("ColorCurve::set_brightness");
-       shdata.uniform("brightness", 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_gamma(float g)
@@ -50,7 +49,7 @@ void ColorCurve::set_gamma(float g)
        unsigned char curve_data[256];
        for(unsigned i=0; i<256; ++i)
                curve_data[i] = pow(i/255.0f, 1/g)*255+0.5f;
-       curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
+       curve.image(0, curve_data);
 }
 
 void ColorCurve::set_srgb()
@@ -59,7 +58,7 @@ void ColorCurve::set_srgb()
        curve_data[0] = 0;
        for(unsigned i=1; i<256; ++i)
                curve_data[i] = to_srgb(i/255.0f)*255+0.5f;
-       curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
+       curve.image(0, curve_data);
 }
 
 void ColorCurve::set_linear()
@@ -67,17 +66,58 @@ void ColorCurve::set_linear()
        unsigned char curve_data[256];
        for(unsigned i=0; i<256; ++i)
                curve_data[i] = i;
-       curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
+       curve.image(0, curve_data);
 }
 
 void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)
 {
-       texturing.attach(0, color_buf);
+       texturing.attach(0, color_buf, nearest_sampler.get());
 
        Renderer::Push push(renderer);
        renderer.set_shader_program(&shprog, &shdata);
        renderer.set_texturing(&texturing);
-       quad.draw(renderer);
+       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