X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=413b6f19869430f22b665d690d4d8a67cd0ff50d;hb=46509f82dcea114b004c53a7f3a9608f2518077f;hp=e1f328ac5e7717acf37fd933c62ad3f5843d8f93;hpb=41e0223ec090142bf03066f4f5fc1f5005095072;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index e1f328a..413b6f1 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -1,14 +1,10 @@
 #ifndef BLANK_APP_HPP_
 #define BLANK_APP_HPP_
 
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
 #include "camera.hpp"
 #include "controller.hpp"
-#include "hud.hpp"
 #include "init.hpp"
-#include "model.hpp"
+#include "interface.hpp"
 #include "shader.hpp"
 #include "world.hpp"
 
@@ -23,13 +19,23 @@ 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();
 
+	static Entity &MakeTestEntity(World &);
+
 private:
 	InitSDL init_sdl;
 	InitIMG init_img;
@@ -39,26 +45,14 @@ private:
 	InitGLEW init_glew;
 	DirectionalLighting program;
 
-	float move_velocity;
-	float pitch_sensitivity;
-	float yaw_sensitivity;
-
 	Camera cam;
-	HUD hud;
 	World world;
-	OutlineModel outline;
+	Interface interface;
 
-	bool outline_visible;
-	glm::mat4 outline_transform;
+	RandomWalk test_controller;
 
 	bool running;
 
-	bool front, back, left, right, up, down;
-	bool place, remove, pick;
-
-	int remove_id;
-	int place_id;
-
 };
 
 }