Some fixes to assignment management in UnusedVariableLocator

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index ad2c51ca337f35340974226253e706a58f58b088..f1c090308458b4edbf9360d5018a80d817389471 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -2,6 +2,7 @@
 #include "color.h"
 #include "colorcurve.h"
 #include "mesh.h"
+#include "renderer.h"
 #include "shader.h"
 #include "texture2d.h"
 
@@ -20,24 +21,33 @@ ColorCurve::ColorCurve():
        curve.storage(LUMINANCE, 256);
        curve.set_min_filter(LINEAR);
        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)
@@ -68,14 +78,14 @@ void ColorCurve::set_linear()
        curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
 }
 
-void ColorCurve::render(const Texture2D &color_buf, const Texture2D &)
+void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)
 {
-       Bind _bind_shader(shprog);
-       shdata.apply();
-       Bind _bind_mesh(quad);
-       Bind _bind_tex(color_buf);
-       Bind _bind_curve(curve, 1);
-       quad.draw();
+       texturing.attach(0, color_buf);
+
+       Renderer::Push push(renderer);
+       renderer.set_shader_program(&shprog, &shdata);
+       renderer.set_texturing(&texturing);
+       quad.draw(renderer);
 }
 
 } // namespace GL