X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=cb71411de60e312231f0ac847580f8baf914d579;hb=f01ebd81ff047eb3209e25e183564f72f587915f;hp=e525ec632e6459a8612539b6807cfad32549b89c;hpb=e1e349bb6035463529bc341c472987d229e1cdca;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index e525ec6..cb71411 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,15 +19,23 @@ class Application {
 
 public:
 	Application();
-	~Application();
 
 	Application(const Application &) = delete;
 	Application &operator =(const Application &) = delete;
 
+	/// run until user quits
 	void Run();
 	void Loop(int dt);
 
+	/// run for n frames
+	void RunN(size_t n);
+	/// run for t milliseconds
+	void RunT(size_t t);
+	/// run for n frames, assuming t milliseconds for each
+	void RunS(size_t n, size_t t);
+
 	void HandleEvents();
+	void Update(int dt);
 	void Render();
 
 private:
@@ -33,15 +45,24 @@ private:
 	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;
+
 };
 
 }