simple HUD

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 28c7536e440ec781926eb7af2b8a8099e4bfe6ed..e1f328ac5e7717acf37fd933c62ad3f5843d8f93 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -6,6 +6,7 @@
 
 #include "camera.hpp"
 #include "controller.hpp"
+#include "hud.hpp"
 #include "init.hpp"
 #include "model.hpp"
 #include "shader.hpp"
@@ -36,33 +37,20 @@ private:
        Window window;
        GLContext ctx;
        InitGLEW init_glew;
-       Program program;
+       DirectionalLighting program;
 
        float move_velocity;
        float pitch_sensitivity;
        float yaw_sensitivity;
 
-       BlockTypeRegistry blockType;
-
        Camera cam;
-       Chunk chunk;
+       HUD hud;
+       World world;
        OutlineModel outline;
 
        bool outline_visible;
        glm::mat4 outline_transform;
 
-       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;
-
        bool running;
 
        bool front, back, left, right, up, down;