X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=e6226dc50454dff487aa8596460b68dcfdf0670a;hb=e74f1ad236429f05db90c0ace825277e2a3fbc05;hp=0b0e64e46681c26d167c5214e2d8193c256ca0eb;hpb=cb959294a8271969ddfe411471d7f04e82c4788a;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index 0b0e64e..e6226dc 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"
 
@@ -18,18 +14,37 @@ namespace blank {
 class Application {
 
 public:
-	Application();
+	struct Config {
+		bool vsync = true;
+		bool doublebuf = true;
+		int multisampling = 1;
+
+		Interface::Config interface = Interface::Config();
+		World::Config world = World::Config();
+	};
+
+	explicit Application(const Config &);
 
 	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;
@@ -37,24 +52,17 @@ private:
 	Window window;
 	GLContext ctx;
 	InitGLEW init_glew;
-	DirectionalLighting program;
+	BlockLighting chunk_prog;
+	DirectionalLighting entity_prog;
 
 	Camera cam;
-	HUD hud;
 	World world;
-	FPSController controller;
+	Interface interface;
 
-	OutlineModel outline;
-	bool outline_visible;
-	glm::mat4 outline_transform;
+	RandomWalk test_controller;
 
 	bool running;
 
-	bool place, remove, pick;
-
-	int remove_id;
-	int place_id;
-
 };
 
 }