3 files changed, 26 insertions, 92 deletions

@@ -4,51 +4,13 @@ in vec2 UV;
 
 out vec3 color;
 
-uniform sampler2D screenTex;
-uniform float iGlobalTime;
-uniform vec2 resolution;
-
-float nrand(vec2 n)
-{
-  return fract(sin(dot(n.xy, vec2(19.9898, 78.233))) * 43758.5453);
-}
-
-vec2 rot2d(vec2 p, float a)
-{
-  vec2 sc = vec2(sin(a), cos(a));
-  return vec2(dot(p, vec2(sc.y, -sc.x)), dot(p, sc.xy));
-}
+uniform vec2 offset;
+uniform sampler2D inTex;
 
 void main()
 {
-  const int NUM_TAPS = 12;
-  float max_siz = 15.0;
-  
-  vec2 fTaps_Poisson[NUM_TAPS];
-  fTaps_Poisson[0]  = vec2(-.326, -.406);
-  fTaps_Poisson[1]  = vec2(-.840, -.074);
-  fTaps_Poisson[2]  = vec2(-.696,  .457);
-  fTaps_Poisson[3]  = vec2(-.203,  .621);
-  fTaps_Poisson[4]  = vec2( .962, -.195);
-  fTaps_Poisson[5]  = vec2( .473, -.480);
-  fTaps_Poisson[6]  = vec2( .519,  .767);
-  fTaps_Poisson[7]  = vec2( .185, -.893);
-  fTaps_Poisson[8]  = vec2( .507,  .064);
-  fTaps_Poisson[9]  = vec2( .896,  .412);
-  fTaps_Poisson[10] = vec2(-.322, -.933);
-  fTaps_Poisson[11] = vec2(-.792, -.598);
-  
-  vec4 sum = vec4(0);
-  float rnd = 6.28 * nrand(UV + fract(iGlobalTime));
-  vec4 basis = vec4(rot2d(vec2(1,0), rnd), rot2d(vec2(0,1), rnd));
-  for (int i=0; i<NUM_TAPS; i++)
-  {
-    vec2 ofs = fTaps_Poisson[i];
-    ofs = vec2(dot(ofs, basis.xz), dot(ofs, basis.yw));
-    
-    vec2 texcoord = UV + max_siz * ofs / resolution;
-    sum += texture(screenTex, texcoord, -10.0);
-  }
-  
-  color = (sum / vec4(NUM_TAPS)).rgb;
+  color = vec3(0.0);
+  color += (5.0/16.0) * texture(inTex, UV - offset).rgb;
+  color += (6.0/16.0) * texture(inTex, UV).rgb;
+  color += (5.0/16.0) * texture(inTex, UV + offset).rgb;
 }
@@ -4,58 +4,30 @@ in vec2 UV;
 
 out vec3 color;
 
-uniform sampler2D screenTex;
-uniform sampler2D downsampledTex;
+uniform sampler2D clearTex;
+uniform sampler2D blurTex;
 uniform float iGlobalTime;
-uniform vec2 resolution;
 
 float nrand(vec2 n)
 {
   return fract(sin(dot(n.xy, vec2(19.9898, 78.233))) * 43758.5453);
 }
 
-vec2 rot2d(vec2 p, float a)
-{
-  vec2 sc = vec2(sin(a), cos(a));
-  return vec2(dot(p, vec2(sc.y, -sc.x)), dot(p, sc.xy));
-}
-
 void main()
 {
-  const int NUM_TAPS = 12;
-  float max_siz = 1.0;
-  
-  vec2 fTaps_Poisson[NUM_TAPS];
-  fTaps_Poisson[0]  = vec2(-.326, -.406);
-  fTaps_Poisson[1]  = vec2(-.840, -.074);
-  fTaps_Poisson[2]  = vec2(-.696,  .457);
-  fTaps_Poisson[3]  = vec2(-.203,  .621);
-  fTaps_Poisson[4]  = vec2( .962, -.195);
-  fTaps_Poisson[5]  = vec2( .473, -.480);
-  fTaps_Poisson[6]  = vec2( .519,  .767);
-  fTaps_Poisson[7]  = vec2( .185, -.893);
-  fTaps_Poisson[8]  = vec2( .507,  .064);
-  fTaps_Poisson[9]  = vec2( .896,  .412);
-  fTaps_Poisson[10] = vec2(-.322, -.933);
-  fTaps_Poisson[11] = vec2(-.792, -.598);
-  
-  vec4 sum = vec4(0);
-  float rnd = 6.28 * nrand(UV + fract(iGlobalTime));
-  vec4 basis = vec4(rot2d(vec2(1,0), rnd), rot2d(vec2(0,1), rnd));
-  for (int i=0; i<NUM_TAPS; i++)
-  {
-    vec2 ofs = fTaps_Poisson[i];
-    ofs = vec2(dot(ofs, basis.xz), dot(ofs, basis.yw));
-    
-    vec2 texcoord = UV + max_siz * ofs / (resolution / vec2(16.0));
-    sum += texture(downsampledTex, texcoord, -10.0);
-  }
+  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 *= color;
   
-  vec3 bloom_c = (sum / vec4(NUM_TAPS)).rgb;
-  bloom_c *= bloom_c;
-  //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));
+  float flicker =  0.5 + nrand(vec2(iGlobalTime));
+  //flicker *= (flicker);
+  flicker = sqrt(flicker);
+  //flicker = pow(flicker, 1.0/8.0);
+  color *= flicker;
+  //color *= mix(vec3(0.0), color, flicker);
   
-  color = texture(screenTex, UV).rgb + bloom_c;
+  color += texture(clearTex, UV).rgb;
+  //color = clamp(color, vec3(0.0), vec3(1.0));
 }
@@ -12,11 +12,11 @@ uniform sampler2D scanlinestex;
 
 const float Tuning_Overscan = 1.08;
 const float Tuning_Dimming = 0.0;
-const float Tuning_Satur = 1.0;
+const float Tuning_Satur = 1.13;
 const float Tuning_ReflScalar = 0.3;
-const float Tuning_Barrel = 0; //0.12;
+const float Tuning_Barrel = 0;//0.12;
 const float Tuning_Scanline_Brightness = 0.45;
-const float Tuning_Scanline_Opacity = 0.5;
+const float Tuning_Scanline_Opacity = 0.55;
 const float Tuning_Diff_Brightness = 0.75;
 const float Tuning_Spec_Brightness = 0.35;
 const float Tuning_Spec_Power = 50.0;
@@ -26,7 +26,7 @@ uniform vec2 resolution;
 
 vec4 sampleCRT(vec2 uv)
 {
-  vec2 CRTMask_Scale = resolution / vec2(6.0, 5.0);
+  vec2 CRTMask_Scale = vec2(320.0,200.0) / vec2(2.0, 1.0);
   
   vec2 scanuv = uv * CRTMask_Scale;
   vec3 scantex = texture(scanlinestex, scanuv).rgb;
@@ -61,7 +61,7 @@ void main()
   spec = pow(spec, Tuning_Spec_Power);
   vec4 colorspec = vec4(0.25, 0.25, 0.25, 1) * spec * Tuning_Spec_Brightness;
   
-  float fres = 1.0f - dot(camDir, norm);
+  float fres = 1.0 - dot(camDir, norm);
   fres = (fres*fres) * Tuning_Fres_Brightness;
   vec4 colorfres = vec4(0.45, 0.4, 0.5, 1) * fres;