summaryrefslogtreecommitdiff
path: root/scene.h
diff options
context:
space:
mode:
authorJon Bergli Heier <snakebite@jvnv.net>2011-05-08 15:52:41 +0200
committerJon Bergli Heier <snakebite@jvnv.net>2011-05-08 15:52:41 +0200
commit595ac4744b75688f7ca61993c42ea9eedab3a6b7 (patch)
tree89f7e10b47fb4e709d2896d5e366305ec3a3ced8 /scene.h
parent7d5c1adf8e581599848b3fec54e0af88eb469046 (diff)
Merged Quadtree and friends into Terrain.
Diffstat (limited to 'scene.h')
-rw-r--r--scene.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene.h b/scene.h
index af4f96f..82c1100 100644
--- a/scene.h
+++ b/scene.h
@@ -2,7 +2,7 @@
#define SCENE_H
#include "vector.h"
-#include "quadtree.h"
+#include "terrain.h"
#include "gl.h"
#include "shader.h"
#include "gui.h"
@@ -15,7 +15,7 @@ class Scene {
float pitch, yaw;
Vector3 pos;
float yvel;
- Quadtree *qt;
+ Terrain *terrain;
FTFont *font;
GUI *gui;
Tool *tool;
@@ -23,11 +23,11 @@ class Scene {
bool running;
bool grid;
bool normals;
- bool terrain;
+ bool render_terrain;
bool gravity;
bool dialog;
- Quadtree::QuadNode *last_node;
+ Terrain::Node *last_node;
unsigned int last_time;
Vector3 selected;