Merge pull request #7 from hatkirby/es-rewrite

The ECS rewrite exceeds the original branch in functionality, so it is time to merge it in.

5 files changed, 28 insertions, 25 deletions

@@ -2,15 +2,16 @@
 
 in vec2 UV;
 
-out vec3 color;
+out vec4 color;
 
 uniform vec2 offset;
 uniform sampler2D inTex;
 
 void main()
 {
-  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;
+  vec3 mval = vec3(0.0);
+  mval += (5.0/16.0) * texture(inTex, UV - offset).rgb;
+  mval += (6.0/16.0) * texture(inTex, UV).rgb;
+  mval += (5.0/16.0) * texture(inTex, UV + offset).rgb;
+  color = vec4(mval, 1.0);
 }
@@ -2,7 +2,7 @@
 
 in vec2 UV;
 
-out vec3 color;
+out vec4 color;
 
 uniform sampler2D clearTex;
 uniform sampler2D blurTex;
@@ -15,19 +15,21 @@ float nrand(vec2 n)
 
 void main()
 {
-  color = vec3(0.0);
-  color += texture(clearTex, UV).rgb / 2.0;
-  color += texture(blurTex, UV).rgb;
-  color = max(vec3(0.0), color - 0.5);
-  color *= color;
-  
+  vec3 mval = vec3(0.0);
+  mval += texture(clearTex, UV).rgb / 2.0;
+  mval += texture(blurTex, UV).rgb;
+  mval = max(vec3(0.0), mval - 0.5);
+  mval *= mval;
+
   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(clearTex, UV).rgb;
-  color = clamp(color, vec3(0.0), vec3(1.0));
+  //mval *= flicker;
+  mval *= mix(vec3(0.0), mval, flicker);
+
+  mval += texture(clearTex, UV).rgb;
+  mval = clamp(mval, vec3(0.0), vec3(1.0));
+
+  color = vec4(mval, 1.0);
 }
@@ -1,10 +1,10 @@
 #version 330 core
 
-out vec3 color;
+out vec4 color;
 
 uniform vec3 vecColor;
 
 void main()
 {
-  color = vecColor;
+  color = vec4(vecColor, 1.0);
 }
@@ -5,7 +5,7 @@ in vec3 normIn;
 in vec3 camDirIn;
 in vec3 lightDirIn;
 
-out vec3 color;
+out vec4 color;
 
 uniform sampler2D rendertex;
 uniform sampler2D scanlinestex;
@@ -15,8 +15,8 @@ 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.5;//0.45;
-const float Tuning_Scanline_Opacity = 0.75;//0.55;
+const float Tuning_Scanline_Brightness = 0.55;
+const float Tuning_Scanline_Opacity = 0.55;
 const float Tuning_Diff_Brightness = 0.75;
 const float Tuning_Spec_Brightness = 0.5;//0.35;
 const float Tuning_Spec_Power = 50.0;
@@ -71,5 +71,5 @@ void main()
   vec4 nearfinal = colorfres + colordiff + colorspec + emissive;
   //vec4 final = nearfinal * mix(vec4(1,1,1,1), vec4(0,0,0, 0), Tuning_Dimming);
   
-  color = nearfinal.rgb;
+  color = nearfinal;
 }
@@ -2,7 +2,7 @@
 
 in vec2 UV;
 
-out vec3 color;
+out vec4 color;
 
 uniform sampler2D curFrameSampler;
 uniform sampler2D NTSCArtifactSampler;
@@ -61,5 +61,5 @@ void main()
   Cur_Local = clamp(Cur_Local + (offset * Tuning_Sharp * mix(vec4(1,1,1,1), NTSCArtifact, Tuning_NTSC)), vec4(0,0,0,0), vec4(1,1,1,1));
   Cur_Local = clamp(max(Cur_Local, Tuning_Persistence * (1.0 / (1.0 + (2.0 * Tuning_Bleed))) * (Prev_Local + ((Prev_Left + Prev_Right) * Tuning_Bleed))), vec4(0,0,0,0), vec4(1,1,1,1));
   
-  color = Cur_Local.xyz;
+  color = vec4(Cur_Local.rgb, 1.0);
 }