diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-07 14:22:45 -0500 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-07 14:22:45 -0500 |
| commit | da454bb943929ae649c09ca948e7c83644c35712 (patch) | |
| tree | 1358ea11b33b17b41c8073df9ddb6228a617f831 /shaders/bloom2.fragment | |
| parent | 97d7fb425da906947cc45e11fadb35f708da50d6 (diff) | |
| parent | 1e8de01d3704c584e43e1b84947487c2aaddb7d7 (diff) | |
| download | therapy-da454bb943929ae649c09ca948e7c83644c35712.tar.gz therapy-da454bb943929ae649c09ca948e7c83644c35712.tar.bz2 therapy-da454bb943929ae649c09ca948e7c83644c35712.zip | |
Merge branch 'master' into es-rewrite
Diffstat (limited to 'shaders/bloom2.fragment')
| -rw-r--r-- | shaders/bloom2.fragment | 12 |
1 files changed, 6 insertions, 6 deletions
| diff --git a/shaders/bloom2.fragment b/shaders/bloom2.fragment index da44ea1..4c50e86 100644 --- a/shaders/bloom2.fragment +++ b/shaders/bloom2.fragment | |||
| @@ -16,18 +16,18 @@ float nrand(vec2 n) | |||
| 16 | void main() | 16 | void main() |
| 17 | { | 17 | { |
| 18 | color = vec3(0.0); | 18 | color = vec3(0.0); |
| 19 | //color += texture(tex2, UV).rgb / 2.0; | 19 | color += texture(clearTex, UV).rgb / 2.0; |
| 20 | color += texture(blurTex, UV).rgb; | 20 | color += texture(blurTex, UV).rgb; |
| 21 | color = max(vec3(0.0), color - 0.5); | 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; |
| 32 | //color = clamp(color, vec3(0.0), vec3(1.0)); | 32 | color = clamp(color, vec3(0.0), vec3(1.0)); |
| 33 | } | 33 | } |