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.

1 files changed, 4 insertions, 4 deletions

@@ -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;
 }