X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=gl_shaders%2Fdefault.f.glsl;h=490efabef796096809fbbc85c6079aaff90cc149;hp=388ba76a607608108f07ad2a31ebf4b6f5d74345;hb=63d7f3b0e70ab5e3d530c579b1881967c96b0b92;hpb=d03d86eb8489e7ab4c5460cea5ee265b0c1ee487 diff --git a/gl_shaders/default.f.glsl b/gl_shaders/default.f.glsl index 388ba76..490efab 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,7 @@ 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.w = 1.0; }