diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-10 16:46:26 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-10 16:46:26 +0200 |
| commit | d42ec5c0e89559abd276334b6c4804e1eaa5e9c7 (patch) | |
| tree | c6afda3e3f51d4ac79ffcdabd2edfc6d36df4201 /shaders/terrain_fragment.glsl | |
| parent | fa1216b691dc5be3429858dcff845239b1aec417 (diff) | |
| parent | 7d93cab1eb1629b068858a68ac5e5840fe84a83a (diff) | |
Merge branch 'master' into win32
Conflicts:
gui.h
quadtree.cpp
scene.cpp
scene.h
Diffstat (limited to 'shaders/terrain_fragment.glsl')
| -rw-r--r-- | shaders/terrain_fragment.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shaders/terrain_fragment.glsl b/shaders/terrain_fragment.glsl index 0925c6b..c3f0d46 100644 --- a/shaders/terrain_fragment.glsl +++ b/shaders/terrain_fragment.glsl @@ -4,7 +4,7 @@ varying vec3 normal, light_pos, pos; uniform sampler2D tex[3]; uniform sampler2D marktex; -uniform vec3 selpos; +uniform vec3 selpos, player_pos; uniform bool show_sel; void main() { @@ -27,6 +27,7 @@ void main() { vec2 st = vec2((pos.x + 1 - selpos.x) / 2, (pos.z + 1 - selpos.z) / 2); gl_FragColor += texture2D(marktex, st); } + gl_FragColor = mix(gl_FragColor, gl_Fog.color, pow(length(player_pos - pos), 2) / 10000); } /* vim: set syn=glsl: */ |