projects
/
demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed issues in shaders
[demo]
/
gl_shaders
/
default.f.glsl
diff --git
a/gl_shaders/default.f.glsl
b/gl_shaders/default.f.glsl
index
88f0d69
..
f0f61d8
100644
(file)
--- a/
gl_shaders/default.f.glsl
+++ b/
gl_shaders/default.f.glsl
@@
-13,7
+13,7
@@
varying vec2 tex_coord;
// const float fog_density = 0.005;
uniform float fog_density;
// const float fog_density = 0.005;
uniform float fog_density;
-const vec4 sky_color = vec4(0.35, 0.5, 0.65, 1.0);
+const vec3 sky_color = vec3(0.35, 0.5, 0.65);
out vec4 color;
out vec4 color;
@@
-34,9
+34,8
@@
void main()
vec4 texel = texture2D(tex, tex_coord);
vec4 texel = texture2D(tex, tex_coord);
- vec4 object_color;
- object_color.xyz = diffuse.xyz * cdiff * texel.xyz + specular.xyz * cspec;
- object_color.w = 1.0;
+ vec3 object_color = diffuse.xyz * cdiff * texel.xyz + specular.xyz * cspec;
- color = mix(sky_color, object_color, fog);
+ color.xyz = mix(sky_color, object_color, fog);
+ color.w = 1.0;
}
}