X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=1c3c69da31833dd67df43086667369d4922846ed;hb=5700ea3c08ea5e4a5c743f0413b65dc8eebfd220;hp=c5a5098578c306a951c79d0157af6b7ce15c648b;hpb=49c81f76b80e0de99ca57db49510eb5e3385e1d1;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index c5a5098..1c3c69d 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,9 +5,11 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
 #include "model.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -16,7 +18,6 @@ class Application {
 
 public:
 	Application();
-	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -42,14 +43,31 @@ private:
 	float yaw_sensitivity;
 
 	Camera cam;
-	Model model;
+	World world;
+	OutlineModel outline;
 
-	GLuint vtx_buf;
+	bool outline_visible;
+	glm::mat4 outline_transform;
+
+	glm::vec3 light_position;
+	glm::vec3 light_color;
+	float light_power;
+
+	GLuint m_handle;
+	GLuint v_handle;
+	GLuint mv_handle;
 	GLuint mvp_handle;
+	GLuint light_position_handle;
+	GLuint light_color_handle;
+	GLuint light_power_handle;
 
 	bool running;
 
 	bool front, back, left, right, up, down;
+	bool place, remove, pick;
+
+	int remove_id;
+	int place_id;
 
 };