X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=gl_shaders%2Fdefault.f.glsl;h=98cf032592d0457f40b977eebe4bfead9e4b0fda;hb=243eb502c5dc70e586a9e81815234069bf623480;hp=388ba76a607608108f07ad2a31ebf4b6f5d74345;hpb=d03d86eb8489e7ab4c5460cea5ee265b0c1ee487;p=demo

diff --git a/gl_shaders/default.f.glsl b/gl_shaders/default.f.glsl
index 388ba76..98cf032 100644
--- a/gl_shaders/default.f.glsl
+++ b/gl_shaders/default.f.glsl
@@ -9,9 +9,9 @@ uniform float shininess;
 varying vec3 pos;
 varying vec3 normal;
 varying vec3 ldir;
-varying vec3 tex_coord;
+varying vec2 tex_coord;
 
-layout(location = 0) out vec4 color;
+out vec4 color;
 
 void main()
 {
@@ -25,5 +25,8 @@ void main()
 	float cdiff = max(dot(l, n), 0.0);
 	float cspec = pow(max(dot(r, vdir), 0.0), shininess);
 
-	color = diffuse * cdiff * texture2D(tex, tex_coord.xy) + specular * cspec;
+	vec4 texel = texture2D(tex, tex_coord);
+	//color.xyz = diffuse.xyz * cdiff * texel.xyz + specular.xyz * cspec;
+	color.xyz = diffuse.xyz * cdiff + specular.xyz * cspec;
+	color.w = 1.0;
 }