X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=9534da7ec1d6f3a0677dda703e2dfea4bb19d63d;hb=982b69ce8c393ae18beed5239191b8bc2ee1d5d1;hp=d949567347f336e978fd62d7f15a1871140b49a1;hpb=81531352f0af10ef357e82595098fa596795f000;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index d949567..9534da7 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -7,7 +7,9 @@
 #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;
@@ -35,21 +36,26 @@ private:
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
-	Program program;
+	DirectionalLighting program;
 
 	float move_velocity;
 	float pitch_sensitivity;
 	float yaw_sensitivity;
 
 	Camera cam;
-	FPSController model;
+	World world;
+	OutlineModel outline;
 
-	GLuint vtx_buf;
-	GLuint mvp_handle;
+	bool outline_visible;
+	glm::mat4 outline_transform;
 
 	bool running;
 
 	bool front, back, left, right, up, down;
+	bool place, remove, pick;
+
+	int remove_id;
+	int place_id;
 
 };