X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=e1f328ac5e7717acf37fd933c62ad3f5843d8f93;hb=5588a6a9b1e2fb6fee8f1166f855ef497e551a09;hp=e5cddcedadb7a722de3cf1c075cc9ce31f6408be;hpb=ac8765b510707d77cac9620778f40ddf3a4ad2a2;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index e5cddce..e1f328a 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,7 +6,9 @@
 
 #include "camera.hpp"
 #include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
 #include "world.hpp"
 
@@ -17,7 +19,6 @@ class Application {
 
 public:
 	Application();
-	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -36,32 +37,27 @@ private:
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
-	Program program;
+	DirectionalLighting program;
 
 	float move_velocity;
 	float pitch_sensitivity;
 	float yaw_sensitivity;
 
-	BlockTypeRegistry blockType;
-
 	Camera cam;
-	Chunk chunk;
-
-	glm::vec3 light_position;
-	glm::vec3 light_color;
-	float light_power;
+	HUD hud;
+	World world;
+	OutlineModel outline;
 
-	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 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;
 
 };