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_vertex.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_vertex.glsl')
| -rw-r--r-- | shaders/terrain_vertex.glsl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shaders/terrain_vertex.glsl b/shaders/terrain_vertex.glsl index 5fcd17b..27da83f 100644 --- a/shaders/terrain_vertex.glsl +++ b/shaders/terrain_vertex.glsl @@ -1,11 +1,12 @@ #version 120 varying vec3 normal, light_pos, pos; +uniform vec2 chunk_pos; void main() { normal = gl_Normal; light_pos = vec3(0, 1, 0); - pos = gl_Vertex.xyz; + pos = gl_Vertex.xyz + vec3(chunk_pos.x, 0, chunk_pos.y); gl_TexCoord[0] = gl_MultiTexCoord0; gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; |