diff options
author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-11 20:18:54 +0200 |
---|---|---|
committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-11 20:18:54 +0200 |
commit | 40079a61d9269e54379985d16795c30499044ed5 (patch) | |
tree | 8c789271456ff7a5d9afccb74d5b08c8de96cbec /scene.h | |
parent | 0ad016d39848584f51df9d2464b6aef5ab31485a (diff) | |
parent | bd843834dd6655d96b64d1ab72ab7b2983946199 (diff) |
Merge branch 'win32'
Diffstat (limited to 'scene.h')
-rw-r--r-- | scene.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -36,6 +36,8 @@ class Scene { int sx, sy; GLShaderProgram terrain_program; + //GLVertexShader terrain_vertex; + //GLFragmentShader terrain_fragment; GLuint grass_texture, rock_texture, soil_texture, marker_texture; |