X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=28c7536e440ec781926eb7af2b8a8099e4bfe6ed;hb=8881c507009521d08648560984c0f50166224542;hp=f3ee1410f5ee405a29e2a01b25fb2ab091fa4969;hpb=3baab6cca7423d55ea08288d96570b02380b1fe9;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index f3ee141..28c7536 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -9,6 +9,7 @@
 #include "init.hpp"
 #include "model.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -17,7 +18,6 @@ class Application {
 
 public:
 	Application();
-	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -42,9 +42,14 @@ private:
 	float pitch_sensitivity;
 	float yaw_sensitivity;
 
+	BlockTypeRegistry blockType;
+
 	Camera cam;
-	Model model;
-	FPSController modelCtrl;
+	Chunk chunk;
+	OutlineModel outline;
+
+	bool outline_visible;
+	glm::mat4 outline_transform;
 
 	glm::vec3 light_position;
 	glm::vec3 light_color;
@@ -61,6 +66,10 @@ private:
 	bool running;
 
 	bool front, back, left, right, up, down;
+	bool place, remove, pick;
+
+	int remove_id;
+	int place_id;
 
 };