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

diff --git a/src/app.hpp b/src/app.hpp
index e5cddce..cb71411 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,7 +6,9 @@
 
 #include "camera.hpp"
 #include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
 #include "world.hpp"
 
@@ -17,14 +19,21 @@ 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();
@@ -36,32 +45,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;
+	HUD hud;
+	World world;
+	FPSController controller;
 
-	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;
+	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;
+	int place_id;
 
 };