From c1b1558256997df22678f6405ea320ae454ad5b4 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 17 Feb 2015 13:32:29 -0500 Subject: Removed tool used to generate the font, also commited some stuff I forgot in the last commit --- shaders/bloom1.fragment | 2 +- shaders/bloom2.fragment | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'shaders') diff --git a/shaders/bloom1.fragment b/shaders/bloom1.fragment index 77031f2..4940933 100644 --- a/shaders/bloom1.fragment +++ b/shaders/bloom1.fragment @@ -21,7 +21,7 @@ vec2 rot2d(vec2 p, float a) void main() { const int NUM_TAPS = 12; - float max_siz = 1.0; + float max_siz = 15.0; vec2 fTaps_Poisson[NUM_TAPS]; fTaps_Poisson[0] = vec2(-.326, -.406); diff --git a/shaders/bloom2.fragment b/shaders/bloom2.fragment index 323f441..ac18124 100644 --- a/shaders/bloom2.fragment +++ b/shaders/bloom2.fragment @@ -51,7 +51,9 @@ void main() } vec3 bloom_c = (sum / vec4(NUM_TAPS)).rgb; - bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); + //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); + //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); + bloom_c = max(bloom_c - 0.25, vec3(0,0,0)); color = texture(screenTex, UV).rgb + bloom_c; } -- cgit 1.4.1