cleanup with minor tweaks

android/assets/shaders/combine.fsh

@@ -11,14 +11,15 @@ varying vec2 vTexCoord;
 
 uniform sampler2D u_texture;
 uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
 
 void main() {
 	vec4 origColor = texture2D(u_texture, vTexCoord);
 	vec4 blurredColor = texture2D(u_texture1, vTexCoord);
-	vec4 lightFilterColor = texture2D(u_texture2, vTexCoord);
 	
 	vec4 result;
-	result = origColor + blurredColor;	
-	gl_FragColor = result*vColor;
+	result = origColor + blurredColor;
+	result.a = vColor.a;
+	result.rgb *= vColor.rgb;
+	gl_FragColor = result;
+
 }

android/assets/shaders/gaussian_blur.fsh

@@ -43,5 +43,5 @@ void main() {
 	sum += texture2D(u_texture, vec2(tc.x + 4.0*blur*hstep, tc.y + 4.0*blur*vstep)) * 0.035855;
 	sum += texture2D(u_texture, vec2(tc.x + 5.0*blur*hstep, tc.y + 5.0*blur*vstep)) * 0.014374;
 
-	gl_FragColor = vec4(sum.rgb, 1.0);
+	gl_FragColor = sum;
 }

android/assets/shaders/gaussian_blur.vsh

@@ -1,15 +0,0 @@
-attribute vec4 a_position;
-attribute vec4 a_color;
-attribute vec2 a_texCoord0;
-
-uniform mat4 u_projTrans;
-
-varying vec4 vColor;
-varying vec2 vTexCoord;
-
-void main() {
-	vColor = a_color;
-	vTexCoord = a_texCoord0;
-	
-	gl_Position = u_projTrans * a_position;
-}