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

diff --git a/src/app.hpp b/src/app.hpp
index f3ee141..0b0e64e 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,9 +6,11 @@
 
 #include "camera.hpp"
 #include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
 #include "model.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -17,7 +19,6 @@ class Application {
 
 public:
 	Application();
-	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -36,31 +37,23 @@ private:
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
-	Program program;
-
-	float move_velocity;
-	float pitch_sensitivity;
-	float yaw_sensitivity;
+	DirectionalLighting program;
 
 	Camera cam;
-	Model model;
-	FPSController modelCtrl;
-
-	glm::vec3 light_position;
-	glm::vec3 light_color;
-	float light_power;
+	HUD hud;
+	World world;
+	FPSController controller;
 
-	GLuint m_handle;
-	GLuint v_handle;
-	GLuint mv_handle;
-	GLuint mvp_handle;
-	GLuint light_position_handle;
-	GLuint light_color_handle;
-	GLuint light_power_handle;
+	OutlineModel outline;
+	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;
 
 };