Merge branch 'master' into es-rewrite

3 files changed, 12 insertions, 11 deletions

@@ -16,18 +16,18 @@ float nrand(vec2 n)
 void main()
 {
   color = vec3(0.0);
-  //color += texture(tex2, UV).rgb / 2.0;
+  color += texture(clearTex, UV).rgb / 2.0;
   color += texture(blurTex, UV).rgb;
   color = max(vec3(0.0), color - 0.5);
-  //color *= color;
+  color *= color;
   
-  //float flicker =  0.5 + nrand(vec2(iGlobalTime));
-  //flicker *= (flicker);
+  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 *= mix(vec3(0.0), color, flicker);
   
   color += texture(clearTex, UV).rgb;
-  //color = clamp(color, vec3(0.0), vec3(1.0));
+  color = clamp(color, vec3(0.0), vec3(1.0));
 }
@@ -15,14 +15,15 @@ const float Tuning_Dimming = 0.0;
 const float Tuning_Satur = 1.13;
 const float Tuning_ReflScalar = 0.3;
 const float Tuning_Barrel = 0;//0.12;
-const float Tuning_Scanline_Brightness = 0.45;
-const float Tuning_Scanline_Opacity = 0.55;
+const float Tuning_Scanline_Brightness = 0.5;//0.45;
+const float Tuning_Scanline_Opacity = 0.75;//0.55;
 const float Tuning_Diff_Brightness = 0.75;
-const float Tuning_Spec_Brightness = 0.35;
+const float Tuning_Spec_Brightness = 0.5;//0.35;
 const float Tuning_Spec_Power = 50.0;
-const float Tuning_Fres_Brightness = 1.0;
+const float Tuning_Fres_Brightness = 0.0;//1.0;
 
 uniform vec2 resolution;
+uniform vec3 frameColor;
 
 vec4 sampleCRT(vec2 uv)
 {
@@ -23,6 +23,6 @@ void main()
   mat3 invWorldRot = transpose(mat3(worldMat[0].xyz, worldMat[1].xyz, worldMat[2].xyz));
   vec3 worldPos = (worldMat * vec4(vertexPosition_modelspace,1)).xyz;
   
-  camDirIn = invWorldRot * (vec3(2,0,0) - worldPos);
+  camDirIn = invWorldRot * (vec3(3.75,0,0) - worldPos);
   lightDirIn = invWorldRot * (Tuning_LightPos - worldPos);
 }