ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Enable tonemap."

Browse Source 
This reverts commit a0e63dea46e5fae41c92b54fa08369ffa206b2d2.
This commit is contained in:
Vincent Lejeune 2014-04-22 00:44:58 +02:00
parent 230076ffcb
commit e57339841b
2 changed files with 5 additions and 6 deletions
data/shaders
tonemap.frag
src/graphics
post_processing.cpp

7
data/shaders/tonemap.frag

@ -9,8 +9,8 @@ out vec4 FragColor;
vec3 getCIEYxy(vec3 rgbColor); vec3 getCIEYxy(vec3 rgbColor);
vec3 getRGBFromCIEXxy(vec3 YxyColor); vec3 getRGBFromCIEXxy(vec3 YxyColor);
float exposure = .3; float exposure = .4;
float whitePoint = 1.; float whitePoint = 1.5;
float delta = .1; float delta = .1;
void main() void main()
@ -22,6 +22,5 @@ void main()
vec3 Yxy = getCIEYxy(col.xyz); vec3 Yxy = getCIEYxy(col.xyz);
float Lp = Yxy.r * exposure / avgLuminance; float Lp = Yxy.r * exposure / avgLuminance;
Yxy.r = (Lp * (1. * Lp / (whitePoint * whitePoint))) / (1. + Lp); Yxy.r = (Lp * (1. * Lp / (whitePoint * whitePoint))) / (1. + Lp);
FragColor = vec4(getRGBFromCIEXxy(Yxy), 1.); FragColor.xyz = getRGBFromCIEXxy(Yxy);
} }

4
src/graphics/post_processing.cpp

@ -637,10 +637,10 @@ void PostProcessing::render()
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND); glDisable(GL_BLEND);
computeLogLuminance(in_rtt); /* computeLogLuminance(in_rtt);
toneMap(out_fbo, in_rtt); toneMap(out_fbo, in_rtt);
std::swap(in_rtt, out_rtt); std::swap(in_rtt, out_rtt);
std::swap(in_fbo, out_fbo); std::swap(in_fbo, out_fbo);*/
PROFILER_PUSH_CPU_MARKER("- Bloom", 0xFF, 0x00, 0x00); PROFILER_PUSH_CPU_MARKER("- Bloom", 0xFF, 0x00, 0x00);
if (UserConfigParams::m_bloom) if (UserConfigParams::m_bloom)