diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-02-19 20:10:11 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-02-19 20:10:11 -0500 |
commit | cd48894563052baeddff64f6bbc13ccc7fa6e081 (patch) | |
tree | c7ab2a9b4cbb7ac0d921cf486aef00c5b5623144 /shaders/bloom2.fragment | |
parent | c1b1558256997df22678f6405ea320ae454ad5b4 (diff) | |
download | therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.tar.gz therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.tar.bz2 therapy-cd48894563052baeddff64f6bbc13ccc7fa6e081.zip |
Added CRT mesh!
Also a character sprite, changed up the map file format, fixed some shader bugs
Diffstat (limited to 'shaders/bloom2.fragment')
-rw-r--r-- | shaders/bloom2.fragment | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shaders/bloom2.fragment b/shaders/bloom2.fragment index ac18124..aa69f0f 100644 --- a/shaders/bloom2.fragment +++ b/shaders/bloom2.fragment | |||
@@ -51,9 +51,10 @@ void main() | |||
51 | } | 51 | } |
52 | 52 | ||
53 | vec3 bloom_c = (sum / vec4(NUM_TAPS)).rgb; | 53 | vec3 bloom_c = (sum / vec4(NUM_TAPS)).rgb; |
54 | bloom_c *= bloom_c; | ||
54 | //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); | 55 | //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); |
55 | //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); | 56 | //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); |
56 | bloom_c = max(bloom_c - 0.25, vec3(0,0,0)); | 57 | //bloom_c = max(bloom_c - 0.25, vec3(0,0,0)); |
57 | 58 | ||
58 | color = texture(screenTex, UV).rgb + bloom_c; | 59 | color = texture(screenTex, UV).rgb + bloom_c; |
59 | } | 60 | } |