X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=0b0e64e46681c26d167c5214e2d8193c256ca0eb;hb=9c1f7b20394808f7ec7a6cadd9e0dd665c6f6bd5;hp=5148a7a411a30669425b376ee9b73394802510c8;hpb=0a13b3fe342db83eef2c0ddc991a44452df77aa3;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index 5148a7a..0b0e64e 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,8 +5,12 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -15,7 +19,6 @@ class Application {
 
 public:
 	Application();
-	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
@@ -24,23 +27,34 @@ public:
 	void Loop(int dt);
 
 	void HandleEvents();
+	void Update(int dt);
 	void Render();
 
 private:
 	InitSDL init_sdl;
+	InitIMG init_img;
 	InitGL init_gl;
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
-	Program program;
+	DirectionalLighting program;
 
 	Camera cam;
+	HUD hud;
+	World world;
+	FPSController controller;
 
-	GLuint vtx_buf;
-	GLuint mvp_handle;
+	OutlineModel outline;
+	bool outline_visible;
+	glm::mat4 outline_transform;
 
 	bool running;
 
+	bool place, remove, pick;
+
+	int remove_id;
+	int place_id;
+
 };
 
 }