summaryrefslogtreecommitdiff
path: root/scene.h
diff options
context:
space:
mode:
Diffstat (limited to 'scene.h')
-rw-r--r--scene.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/scene.h b/scene.h
index 247b52c..6c75c91 100644
--- a/scene.h
+++ b/scene.h
@@ -9,8 +9,13 @@
#include "tool.h"
#include "scripting.h"
#include "player.h"
+#include "model.h"
#include <FTGL/ftgl.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiScene.h>
+
+using models::Model;
class Scene {
public:
@@ -46,8 +51,15 @@ class Scene {
GLShaderProgram terrain_program;
GLShaderProgram water_program;
+ GLShaderProgram tree_program;
GLuint grass_texture, rock_texture, soil_texture, water_texture, marker_texture, placeholder_texture;
+ std::map<std::string, GLuint> scene_textures;
+
+ Assimp::Importer ai_importer;
+ const aiScene *tree_scene;
+
+ Model *tree;
Scene();
~Scene();
@@ -59,6 +71,7 @@ class Scene {
void events();
void render();
GLuint load_texture(const char *filename);
+ GLuint load_texture(aiTexture *texture);
void sort_players();
};