projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
terrain working - no culling
[demo]
/
gl_shaders
/
default.f.glsl
diff --git
a/gl_shaders/default.f.glsl
b/gl_shaders/default.f.glsl
index
98cf032
..
490efab
100644
(file)
--- a/
gl_shaders/default.f.glsl
+++ b/
gl_shaders/default.f.glsl
@@
-26,7
+26,6
@@
void main()
float cspec = pow(max(dot(r, vdir), 0.0), shininess);
vec4 texel = texture2D(tex, tex_coord);
float cspec = pow(max(dot(r, vdir), 0.0), shininess);
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.xyz = diffuse.xyz * cdiff * texel.xyz + specular.xyz * cspec;
color.w = 1.0;
}
color.w = 1.0;
}