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

diff --git a/src/app.hpp b/src/app.hpp
index 0015403..0b0e64e 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,6 +6,7 @@
 
 #include "camera.hpp"
 #include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
 #include "model.hpp"
 #include "shader.hpp"
@@ -36,36 +37,23 @@ private:
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
-	Program program;
-
-	float move_velocity;
-	float pitch_sensitivity;
-	float yaw_sensitivity;
-
-	BlockTypeRegistry blockType;
+	DirectionalLighting program;
 
 	Camera cam;
-	Chunk chunk;
-	OutlineModel outline;
+	HUD hud;
+	World world;
+	FPSController controller;
 
+	OutlineModel outline;
 	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;
 
 };