X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcolorcurve.cpp;h=6b456dfe31bbc55a21d0148459c43a5d800e8f42;hb=f07dffb230b53efcf5e2706493b065f020077fdc;hp=d008593e047a0c2f9fed620471dcdea1057d794c;hpb=9733137499a84f44c29d06d2551d41a903de1112;p=libs%2Fgl.git

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index d008593e..6b456dfe 100644
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -1,3 +1,5 @@
+#include <cmath>
+#include "color.h"
 #include "colorcurve.h"
 #include "mesh.h"
 #include "shader.h"
@@ -9,6 +11,7 @@ namespace {
 
 static const char fragment_src[] =
 	"uniform sampler2D texture;\n"
+	"uniform sampler1D curve;\n"
 	"uniform float peak;\n"
 	"uniform float brightness;\n"
 	"varying vec2 texcoord;\n"
@@ -21,17 +24,15 @@ static const char fragment_src[] =
 	"		vec3 saturated = sample.rgb/maxc;\n"
 	"		if(maxc>1.0+peak)\n"
 	"		{\n"
-	"			gl_FragColor.rgb = mix(vec3(1.0), saturated, 1.0/pow(brightness, maxc-1-peak));\n"
+	"			sample.rgb = mix(vec3(1.0), saturated, 1.0/pow(brightness, maxc-1.0-peak));\n"
 	"		}\n"
 	"		else\n"
 	"		{\n"
 	"			float x = (1.0+peak-maxc)/(2.0*peak);\n"
-	"			gl_FragColor.rgb = saturated.rgb*(1.0-peak+(1-x*x)*peak);\n"
+	"			sample.rgb = saturated.rgb*(1.0-peak+(1.0-x*x)*peak);\n"
 	"		}\n"
-	"		gl_FragColor.a = sample.a;\n"
 	"	}\n"
-	"	else\n"
-	"		gl_FragColor = sample;\n"
+	"	gl_FragColor = vec4(texture1D(curve, sample.r).r, texture1D(curve, sample.g).r, texture1D(curve, sample.b).r, sample.a);\n"
 	"}";
 
 }
@@ -46,8 +47,16 @@ ColorCurve::ColorCurve():
 	shprog.attach_shader_owned(new FragmentShader(fragment_src));
 	shprog.link();
 
+	shdata.uniform("texture", 0);
+	shdata.uniform("curve", 1);
+
+	curve.storage(LUMINANCE, 256);
+	curve.set_min_filter(LINEAR);
+	curve.set_wrap(CLAMP_TO_EDGE);
+
 	set_peak(0.2);
 	set_brightness(1.5);
+	set_linear();
 }
 
 void ColorCurve::set_peak(float p)
@@ -64,11 +73,40 @@ void ColorCurve::set_brightness(float b)
 	shdata.uniform("brightness", b);
 }
 
+void ColorCurve::set_gamma(float g)
+{
+	if(g<0.1 || g>10)
+		throw invalid_argument("ColorCurve::set_gamma");
+
+	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);
+}
+
+void ColorCurve::set_srgb()
+{
+	unsigned char curve_data[256];
+	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);
+}
+
+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);
+}
+
 void ColorCurve::render(const Texture2D &color_buf, const Texture2D &)
 {
 	Bind _bind_shader(shprog);
 	shdata.apply();
 	Bind _bind_tex(color_buf);
+	Bind _bind_curve(curve, 1);
 	quad.draw();
 }