X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=cb71411de60e312231f0ac847580f8baf914d579;hb=e70967c971f77a4ac0f5c074e6eb94bdd0e2b7ab;hp=9534da7ec1d6f3a0677dda703e2dfea4bb19d63d;hpb=982b69ce8c393ae18beed5239191b8bc2ee1d5d1;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index 9534da7..cb71411 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"
@@ -22,9 +23,17 @@ public:
 	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();
@@ -38,20 +47,17 @@ private:
 	InitGLEW init_glew;
 	DirectionalLighting program;
 
-	float move_velocity;
-	float pitch_sensitivity;
-	float yaw_sensitivity;
-
 	Camera cam;
+	HUD hud;
 	World world;
-	OutlineModel outline;
+	FPSController controller;
 
+	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;