summaryrefslogtreecommitdiff
path: root/scene.h
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-05-11 19:30:31 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2011-05-11 19:30:31 +0200
commit63e3b825580c8fbf6b84d441c92ed39348e51c17 (patch)
tree1d315af990adf5160554ccf7e2fb615223b44220 /scene.h
parentd42ec5c0e89559abd276334b6c4804e1eaa5e9c7 (diff)
Working win32 port.
Diffstat (limited to 'scene.h')
-rw-r--r--scene.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/scene.h b/scene.h
index e700351..72bf506 100644
--- a/scene.h
+++ b/scene.h
@@ -8,7 +8,7 @@
#include "gui.h"
#include "tool.h"
-//#include <FTGL/ftgl.h>
+#include <FTGL/ftgl.h>
class Scene {
public:
@@ -16,7 +16,7 @@ class Scene {
Vector3 pos;
float yvel;
Terrain *terrain;
- //FTFont *font;
+ FTFont *font;
GUI *gui;
Tool *tool;
@@ -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;