Merge branch 'develop' fix to v2.34

Author: paddywwoof

pi3d/shaders/2d_flat.fs

@@ -2,8 +2,6 @@
 
 varying vec2 pix_inv;
 
-//fragcolor
-
 void main(void) {
   vec2 coord = vec2(gl_FragCoord);
   //coord.y += 0.5;
@@ -17,6 +15,4 @@ void main(void) {
   if (texc.a < unib[0][2]) discard; // ------ to allow rendering behind the transparent parts of this object
   gl_FragColor = texc;
   gl_FragColor.a *= unif[5][2];
-}
-
-
+}

pi3d/shaders/clashtest.fs

@@ -12,4 +12,4 @@ void main(void) {
   vec4 texc = texture2D(tex0, texcoordout); // ------ material or basic colour from texture
   if (dist > 2.5 || texc.a < 0.6) discard; // ------ only render near, non-transparent parts of objects
   gl_FragColor = texc;
-}
+}

pi3d/shaders/conway.fs

@@ -28,4 +28,4 @@ void main(void) {
   else if (ntot != 2.0) texc = vec4(smoothstep(0.0, 5.0, ntot), 1.0, 0.0, 0.0);
   gl_FragColor = texc;
   gl_FragColor.a = 1.0;
-}
+}

pi3d/shaders/defocus.fs

@@ -1,7 +1,5 @@
 #include std_head_fs.inc
 
-//fragcolor
-
 void main(void) {
   vec4 texc = vec4(0.0, 0.0, 0.0, 1.0); // we don't save the alpha value of the rendering so set this here to 1.0
   vec2 fcoord = vec2(0.0, 0.0);
@@ -16,6 +14,4 @@ void main(void) {
   }
   gl_FragColor = texc * 0.04;
   gl_FragColor.a = unif[5][2];
-}
-
-
+}

pi3d/shaders/mat_bump.fs

@@ -4,15 +4,11 @@ varying vec2 bumpcoordout;
 varying vec3 lightVector;
 varying float lightFactor;
 
-//fragcolor
-
 void main(void) {
 #include std_main_mat.inc
   vec3 bump = normalize(texture2D(tex0, bumpcoordout).rgb * 2.0 - 1.0);
 #include std_bump.inc
 
   gl_FragColor = mix(texc, vec4(unif[4], unif[5][1]), ffact); // ------ combine using factors
   gl_FragColor.a *= unif[5][2];
-}
-
-
+}

pi3d/shaders/mat_flat.fs

@@ -1,12 +1,8 @@
 #include std_head_fs.inc
 
-//fragcolor
-
 void main(void) {
 #include std_main_mat.inc
   //if (distance(gl_PointCoord, vec2(0.5)) > 0.5) discard; //circular points
   gl_FragColor = mix(texc, vec4(unif[4], unif[5][1]), ffact); // ------ combine using factors
   gl_FragColor.a *= unif[5][2];
-}
-
-
+}

pi3d/shaders/mat_light.fs

@@ -3,14 +3,10 @@
 varying vec3 lightVector;
 varying float lightFactor;
 
-//fragcolor
-
 void main(void) {
 #include std_main_mat.inc
 #include std_light.inc
 
   gl_FragColor = mix(texc, vec4(unif[4], unif[5][1]), ffact); // ------ combine using factors
   gl_FragColor.a *= unif[5][2];
-}
-
-
+}

pi3d/shaders/mat_pointsprite.fs

@@ -14,4 +14,4 @@ void main(void) {
   if (alpha < unib[0][2]) discard; // ------ to allow rendering behind the transparent parts of this object
   gl_FragColor = colour;
   gl_FragColor.a *= alpha;
-}
+}

pi3d/shaders/mat_reflect.fs

@@ -6,8 +6,6 @@ varying vec3 normout;
 varying vec3 lightVector;
 varying float lightFactor;
 
-//fragcolor
-
 void main(void) {
 #include std_main_mat.inc
   vec3 bump = normalize(texture2D(tex0, bumpcoordout).rgb * 2.0 - 1.0);
@@ -19,6 +17,4 @@ void main(void) {
 
   gl_FragColor = mix(mix(texc, shinec, shinefact), vec4(unif[4], unif[5][1]), ffact); // ------ combine using factors
   gl_FragColor.a *= unif[5][2];
-}
-
-
+}

pi3d/shaders/post_base.fs

@@ -2,8 +2,6 @@
 
 varying vec2 texcoordout;
 
-//fragcolor
-
 void main(void) {
   ///////////////////////////////////////////////////////////////////
   // you can do processing on the texture (or utilise other textures)
@@ -36,6 +34,4 @@ void main(void) {
   }
 
   gl_FragColor = texc;
-}
-
-
+}