diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-07 11:29:57 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-07 11:29:57 -0500 |
| commit | b53826079429939cdfbda073608cb85be8ba0738 (patch) | |
| tree | 3c40de4658f0cea01cd3938f07fe82788ef3dd01 /shaders | |
| parent | 0751446e1d069263d25abcff49a32a380231709a (diff) | |
| download | therapy-b53826079429939cdfbda073608cb85be8ba0738.tar.gz therapy-b53826079429939cdfbda073608cb85be8ba0738.tar.bz2 therapy-b53826079429939cdfbda073608cb85be8ba0738.zip | |
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.
Diffstat (limited to 'shaders')
| -rw-r--r-- | shaders/bloom2.fragment | 8 |
1 files changed, 4 insertions, 4 deletions
| 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() | |||
| 18 | color = vec3(0.0); | 18 | color = vec3(0.0); |
| 19 | //color += texture(tex2, UV).rgb / 2.0; | 19 | //color += texture(tex2, UV).rgb / 2.0; |
| 20 | color += texture(blurTex, UV).rgb; | 20 | color += texture(blurTex, UV).rgb; |
| 21 | color = max(vec3(0.0), color - 0.25); | 21 | color = max(vec3(0.0), color - 0.5); |
| 22 | //color *= color; | 22 | //color *= color; |
| 23 | 23 | ||
| 24 | float flicker = 0.5 + nrand(vec2(iGlobalTime)); | 24 | //float flicker = 0.5 + nrand(vec2(iGlobalTime)); |
| 25 | //flicker *= (flicker); | 25 | //flicker *= (flicker); |
| 26 | flicker = sqrt(flicker); | 26 | //flicker = sqrt(flicker); |
| 27 | //flicker = pow(flicker, 1.0/8.0); | 27 | //flicker = pow(flicker, 1.0/8.0); |
| 28 | color *= flicker; | 28 | //color *= flicker; |
| 29 | //color *= mix(vec3(0.0), color, flicker); | 29 | //color *= mix(vec3(0.0), color, flicker); |
| 30 | 30 | ||
| 31 | color += texture(clearTex, UV).rgb; | 31 | color += texture(clearTex, UV).rgb; |