fix normal generated by chunk intersection test

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index f3ee1410f5ee405a29e2a01b25fb2ab091fa4969..6bd4e0d9a14a65e615eb62f9f14df5f8b33f5c9b 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -1,14 +1,11 @@
 #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 "init.hpp"
-#include "model.hpp"
+#include "interface.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -17,14 +14,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 +40,14 @@ private:
        Window window;
        GLContext ctx;
        InitGLEW init_glew;
-       Program program;
-
-       float move_velocity;
-       float pitch_sensitivity;
-       float yaw_sensitivity;
+       DirectionalLighting program;
 
        Camera cam;
-       Model model;
-       FPSController modelCtrl;
-
-       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;
+       World world;
+       Interface interface;
 
        bool running;
 
-       bool front, back, left, right, up, down;
-
 };
 
 }