Added bloom!

6 files changed, 195 insertions, 10 deletions

@@ -0,0 +1,53 @@
+#version 330 core
+
+in vec2 UV;
+
+out vec3 color;
+
+uniform sampler2D screenTex;
+uniform float iGlobalTime;
+
+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 / vec2(1024.0,768.0);
+    sum += texture(screenTex, texcoord, -10.0);
+  }
+  
+  color = (sum / vec4(NUM_TAPS)).rgb;
+}
@@ -0,0 +1,11 @@
+#version 330 core
+
+layout(location = 0) in vec3 vPos;
+
+out vec2 UV;
+
+void main()
+{
+  gl_Position = vec4(vPos, 1);
+  UV = (vPos.xy + vec2(1,1))/2;
+}
@@ -0,0 +1,57 @@
+#version 330 core
+
+in vec2 UV;
+
+out vec3 color;
+
+uniform sampler2D screenTex;
+uniform sampler2D downsampledTex;
+uniform float iGlobalTime;
+
+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 / vec2(64.0,48.0);
+    sum += texture(downsampledTex, texcoord, -10.0);
+  }
+  
+  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);
+  
+  color = texture(screenTex, UV).rgb + bloom_c;
+}
@@ -0,0 +1,11 @@
+#version 330 core
+
+layout(location = 0) in vec3 vPos;
+
+out vec2 UV;
+
+void main()
+{
+  gl_Position = vec4(vPos, 1);
+  UV = (vPos.xy + vec2(1,1))/2;
+}
@@ -1,7 +1,10 @@
 #version 330 core
 
 in vec2 UV;
-in vec3 norm;
+in vec3 normIn;
+in vec3 camDirIn;
+in vec3 lightDirIn;
+//in vec3 vertPos;
 
 out vec3 color;
 
@@ -10,20 +13,19 @@ uniform sampler2D scanlinestex;
 
 const vec2 UVScalar = vec2(1.0, 1.0);
 const vec2 UVOffset = vec2(0.0, 0.0);
-const vec2 CRTMask_Scale = vec2(85.0, 153.6);
+const vec2 CRTMask_Scale = vec2(85.0, 153.6)*4.0;
 const vec2 CRTMask_Offset = vec2(0.0, 0.0);
 const float Tuning_Overscan = 1.0;
-const float Tuning_Dimming = 0.5;
+const float Tuning_Dimming = 0.0;
 const float Tuning_Satur = 1.35;
 const float Tuning_ReflScalar = 0.3;
-const float Tuning_Barrel = 0.12;
-const float Tuning_Scanline_Brightness = 0.25;
+const float Tuning_Barrel = 0; //0.12;
+const float Tuning_Scanline_Brightness = 0.5;
 const float Tuning_Scanline_Opacity = 0.5;
 const float Tuning_Diff_Brightness = 0.5;
 const float Tuning_Spec_Brightness = 0.35;
 const float Tuning_Spec_Power = 50.0;
 const float Tuning_Fres_Brightness = 1.0;
-const vec3 Tuning_LightPos = vec3(5.0, -10.0, 0.0);
 
 vec4 sampleCRT(vec2 uv)
 {
@@ -52,5 +54,39 @@ vec4 sampleCRT(vec2 uv)
 
 void main()
 {
-  color = sampleCRT(UV).rgb;
+  vec3 norm = normalize(normIn);
+  vec3 camDir = normalize(camDirIn);
+  vec3 lightDir = normalize(lightDirIn);
+  //vec3 refl = reflect(camDir, normIn);
+  
+  float diffuse = clamp(dot(norm, lightDir), 0.0f, 1.0f);
+  vec4 colordiff = vec4(0.175, 0.15, 0.2, 1) * diffuse * Tuning_Diff_Brightness;
+  
+  vec3 halfVec = normalize(lightDir + camDir);
+  float spec = clamp(dot(norm, halfVec), 0.0f, 1.0f);
+  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);
+  fres = (fres*fres) * Tuning_Fres_Brightness;
+  vec4 colorfres = vec4(0.45, 0.4, 0.5, 1) * fres;/*
+  
+  float lambertian = max(dot(camDirNorm,norm),0.0);
+  vec4 colorspec = vec4(0.0);
+  vec4 colorfres = vec4(0.0);
+  vec4 colordiff = vec4(0.175,0.15,0.2,1) * lambertian * Tuning_Diff_Brightness;
+  if (lambertian > 0.0)
+  {
+    vec3 viewDir = normalize(-vertPos);
+    vec3 halfDir = normalize(camDirNorm + viewDir);
+    float specAngle = max(dot(halfDir, normnorm), 0.0);
+    colorspec = vec4(0.25,0.25,0.25,1) * pow(specAngle, Tuning_Spec_Power) * Tuning_Spec_Brightness;
+  }*/
+  
+  vec4 emissive = sampleCRT(UV);
+  
+  vec4 nearfinal = colorfres + colordiff + colorspec + emissive;
+  vec4 final = nearfinal * mix(vec4(1,1,1,1), vec4(0,0,0,0), Tuning_Dimming);
+  
+  color = final.rgb;
 }
@@ -4,11 +4,28 @@ layout(location = 0) in vec3 vertexPosition_modelspace;
 layout(location = 1) in vec3 vertexNormal;
 
 out vec2 UV;
-out vec3 norm;
+out vec3 normIn;
+out vec3 camDirIn;
+out vec3 lightDirIn;
+//out vec3 vertPos;
+
+uniform mat4 MVP;
+uniform mat4 worldMat;
+
+const vec3 Tuning_LightPos = vec3(1, 1, 1.0);
 
 void main()
 {
-  gl_Position = vec4(vertexPosition_modelspace,1);
+  gl_Position = MVP * vec4(vertexPosition_modelspace,1);
   UV = (vertexPosition_modelspace.xy+vec2(1,1))/2.0;
-  norm = vertexNormal;
+  normIn = vertexNormal;
+  
+  mat3 invWorldRot = transpose(mat3(worldMat[0].xyz, worldMat[1].xyz, worldMat[2].xyz));
+  //mat3 invWorldRot = mat3(1.0f);
+  vec3 worldPos = (worldMat * vec4(vertexPosition_modelspace,1)).xyz;
+  camDirIn = invWorldRot * (vec3(0,0,1) - worldPos);
+  //camDir = worldPos;
+  lightDirIn = invWorldRot * (Tuning_LightPos - worldPos);
+  //vec4 vertPos4 =  vec4(vertexPosition_modelspace,1);
+  //vertPos = vec3(vertPos4) / vertPos4.w;
 }