X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcolorcurve.cpp;h=78a7fc168f13439bcfbeb7f772e125cdd6519493;hb=2ba5af95fb7341b0e6b212e28d03208c6747aae5;hp=f1c090308458b4edbf9360d5018a80d817389471;hpb=444151a0c0c31eac99663c19dda87a7c543bee84;p=libs%2Fgl.git

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index f1c09030..78a7fc16 100644
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -18,9 +18,10 @@ 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_exposure_adjust(0.0f);
@@ -41,15 +42,6 @@ void ColorCurve::set_brightness_response(float b)
 	shdata.uniform("brightness_response", b, t, pow(t, b));
 }
 
-void ColorCurve::set_peak(float)
-{
-}
-
-void ColorCurve::set_brightness(float b)
-{
-	set_brightness_response(1/b);
-}
-
 void ColorCurve::set_gamma(float g)
 {
 	if(g<0.1 || g>10)
@@ -58,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()
@@ -67,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()
@@ -75,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 &)
@@ -88,5 +80,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