X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fcolorcurve.cpp;h=30cb2bc7b6621ab8fe1452434a2a9b206f974c49;hp=697c7257fe84059dcc0eeef53244af28d0bc5e52;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hpb=9a63244c1342337915c4610401a24c09fa72cc3d

diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp
index 697c7257..30cb2bc7 100644
--- a/source/effects/colorcurve.cpp
+++ b/source/effects/colorcurve.cpp
@@ -4,7 +4,6 @@
 #include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
-#include "shader.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -12,17 +11,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ColorCurve::ColorCurve(Resources &resources):
-	shprog(resources.get<Program>("_colorcurve.glsl")),
-	quad(resources.get<Mesh>("_fullscreen_quad.mesh")),
-	linear_sampler(resources.get<Sampler>("_linear_clamp.samp")),
-	nearest_sampler(resources.get<Sampler>("_nearest_clamp.samp"))
+ColorCurve::ColorCurve():
+	shprog(Resources::get_global().get<Program>("_colorcurve.glsl.shader")),
+	quad(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
+	linear_sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
+	nearest_sampler(Resources::get_global().get<Sampler>("_nearest_clamp.samp"))
 {
-	shdata.uniform("source", 0);
-	shdata.uniform("curve", 1);
-
 	curve.storage(LUMINANCE8, 256, 1);
-	texturing.attach(1, curve, &linear_sampler);
 
 	set_exposure_adjust(0.0f);
 	set_brightness_response(0.4f);
@@ -38,6 +33,7 @@ void ColorCurve::set_brightness_response(float b)
 {
 	if(b<=0 || b>1)
 		throw invalid_argument("ColorCurve::set_brightness_response");
+	// Calculate an offset value to obtain a derivative of 1 at zero intensity.
 	float t = (b<1 ? pow(b, 1/(1-b)) : 0.0f);
 	shdata.uniform("brightness_response", b, t, pow(t, b));
 }
@@ -72,25 +68,27 @@ void ColorCurve::set_linear()
 
 void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)
 {
-	texturing.attach(0, color_buf, &nearest_sampler);
-
 	Renderer::Push push(renderer);
 	renderer.set_shader_program(&shprog, &shdata);
-	renderer.set_texturing(&texturing);
+	renderer.set_texture("source", &color_buf, &nearest_sampler);
+	renderer.set_texture("curve", &curve, &linear_sampler);
 	quad.draw(renderer);
 }
 
+void ColorCurve::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	shdata.set_debug_name(name+" [UBO]");
+	curve.set_debug_name(name+"/curve.tex");
+#else
+	(void)name;
+#endif
+}
 
-ColorCurve::Template::Template():
-	exposure_adjust(0.0f),
-	brightness_response(0.4f),
-	gamma(1.0f),
-	srgb(false)
-{ }
 
-ColorCurve *ColorCurve::Template::create(Resources &res, unsigned, unsigned) const
+ColorCurve *ColorCurve::Template::create(unsigned, unsigned) const
 {
-	RefPtr<ColorCurve> colorcurve = new ColorCurve(res);
+	RefPtr<ColorCurve> colorcurve = new ColorCurve();
 	colorcurve->set_exposure_adjust(exposure_adjust);
 	colorcurve->set_brightness_response(brightness_response);
 	if(srgb)