X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcolorcurve.cpp;h=0b62583fc4e810e9ea8a772a99dde7fb74db6e4c;hb=47bfbdc8cf844aa079995fca34a3b906b49a4f66;hp=81b5a43e7a6ef4d6724a39e2ea182e7ecd63586a;hpb=d1e3975c163694d7bca6417463462be950019e5e;p=libs%2Fgl.git

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 81b5a43e..0b62583f 100644
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -18,28 +18,28 @@ ColorCurve::ColorCurve():
 	shdata.uniform("source", 0);
 	shdata.uniform("curve", 1);
 
-	curve.storage(LUMINANCE, 256);
-	curve.set_min_filter(LINEAR);
-	curve.set_wrap(CLAMP_TO_EDGE);
+	curve.storage(LUMINANCE8, 256, 1);
+	Sampler &sampler = curve.get_default_sampler();
+	sampler.set_min_filter(LINEAR);
+	sampler.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)
 {
-	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 +50,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 +59,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,7 +67,7 @@ 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 &)
@@ -77,7 +77,48 @@ void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Te
 	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