From b53826079429939cdfbda073608cb85be8ba0738 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 7 Mar 2015 11:29:57 -0500 Subject: Created entity-component system Also tweaked the bloom flicker, tweaked the scanline texture, created a second test map, and created some currently unused sound effects. --- shaders/bloom2.fragment | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'shaders') diff --git a/shaders/bloom2.fragment b/shaders/bloom2.fragment index eca56ea..da44ea1 100644 --- a/shaders/bloom2.fragment +++ b/shaders/bloom2.fragment @@ -18,14 +18,14 @@ void main() color = vec3(0.0); //color += texture(tex2, UV).rgb / 2.0; color += texture(blurTex, UV).rgb; - color = max(vec3(0.0), color - 0.25); + color = max(vec3(0.0), color - 0.5); //color *= color; - float flicker = 0.5 + nrand(vec2(iGlobalTime)); + //float flicker = 0.5 + nrand(vec2(iGlobalTime)); //flicker *= (flicker); - flicker = sqrt(flicker); + //flicker = sqrt(flicker); //flicker = pow(flicker, 1.0/8.0); - color *= flicker; + //color *= flicker; //color *= mix(vec3(0.0), color, flicker); color += texture(clearTex, UV).rgb; -- cgit 1.4.1