fix normal generated by chunk intersection test

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 0b0e64e46681c26d167c5214e2d8193c256ca0eb..6bd4e0d9a14a65e615eb62f9f14df5f8b33f5c9b 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -1,14 +1,9 @@
 #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,9 +18,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();
@@ -40,21 +43,11 @@ private:
        DirectionalLighting program;
 
        Camera cam;
-       HUD hud;
        World world;
-       FPSController controller;
-
-       OutlineModel outline;
-       bool outline_visible;
-       glm::mat4 outline_transform;
+       Interface interface;
 
        bool running;
 
-       bool place, remove, pick;
-
-       int remove_id;
-       int place_id;
-
 };
 
 }