Moved relevant code to the Scene class.

1 files changed, 25 insertions, 0 deletions

diff --git a/scene.h b/scene.h
index 2429fcc..869ea55 100644
--- a/scene.h
+++ b/scene.h
@@ -3,6 +3,10 @@
 
 #include "vector.h"
 #include "quadtree.h"
+#include "gl.h"
+#include "shader.h"
+
+#include <FTGL/ftgl.h>
 
 class Scene {
 	public:
@@ -10,6 +14,24 @@ class Scene {
 		Vector3 pos;
 		float yvel;
 		Quadtree *qt;
+		FTFont *font;
+
+		bool running;
+		bool grid;
+		bool terrain;
+		bool gravity;
+
+		Quadtree::QuadNode *last_node;
+
+		unsigned int last_time;
+		Vector3 selected;
+
+		bool do_select, show_selection;
+		int sx, sy;
+
+		GLShaderProgram terrain_program;
+
+		GLuint grass_texture, rock_texture, soil_texture;
 
 		Scene();
 		~Scene();
@@ -18,6 +40,9 @@ class Scene {
 		void move(float forward, float right, int steps);
 		bool select(int x, int y, float& px, float& py, float& pz);
 		void update();
+		void events();
+		void render();
+		GLuint load_texture(const char *filename);
 };
 
 #endif