Move to 'using namespace std;' in all .cpp files.

[movit] / gamma_expansion_effect.frag

diff --git a/gamma_expansion_effect.frag b/gamma_expansion_effect.frag
index 1174a3e85cc85f20defcae93812df1da555e3ca4..359b026450c916f52d9f486bac11c2f6dcff3b71 100644 (file)
--- a/gamma_expansion_effect.frag
+++ b/gamma_expansion_effect.frag
@@ -1,11 +1,19 @@
-// Expand sRGB gamma curve.
+// Expand gamma curve.
+
+uniform float PREFIX(linear_scale);
+uniform float PREFIX(c0), PREFIX(c1), PREFIX(c2), PREFIX(c3), PREFIX(c4);
+uniform float PREFIX(beta);
 
 vec4 FUNCNAME(vec2 tc) {
        vec4 x = INPUT(tc);
 
-       x.r = texture1D(PREFIX(expansion_curve_tex), x.r).x;
-       x.g = texture1D(PREFIX(expansion_curve_tex), x.g).x;
-       x.b = texture1D(PREFIX(expansion_curve_tex), x.b).x;
+       vec3 a = x.rgb * PREFIX(linear_scale);
+
+       // Fourth-order polynomial approximation to pow(). See the .cpp file for details.
+       vec3 b = PREFIX(c0) + (PREFIX(c1) + (PREFIX(c2) + (PREFIX(c3) + PREFIX(c4) * x.rgb) * x.rgb) * x.rgb) * x.rgb;
+
+       vec3 f = vec3(greaterThan(x.rgb, vec3(PREFIX(beta))));
+       x = vec4(mix(a, b, f), x.a);
 
        return x;
 }