16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00

rename, configurable gamma mode

This commit is contained in:
milek7
2018-10-17 19:16:32 +02:00
parent 2ffdb35d0f
commit b9fbe7452b
14 changed files with 59 additions and 43 deletions

View File

@@ -12,6 +12,5 @@ void main()
vec2 texcoord = f_coords;
vec3 hdr_color = texture(tex1, texcoord).xyz;
vec3 mapped = tonemap(hdr_color);
out_color = vec4(mapped, 1.0);
out_color = tonemap(vec4(hdr_color, 1.0));
}

View File

@@ -31,12 +31,7 @@ vec3 filmic(vec3 x)
return filmicF(x) / filmicF(vec3(11.2f));
}
vec3 tonemap(vec3 x)
{
return ACESFilm(x);
}
vec4 tonemap(vec4 x)
{
return vec4(tonemap(x.rgb), x.a);
return FBOUT(vec4(ACESFilm(x.rgb), x.a));
}