X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=e1f328ac5e7717acf37fd933c62ad3f5843d8f93;hb=5588a6a9b1e2fb6fee8f1166f855ef497e551a09;hp=1c3c69da31833dd67df43086667369d4922846ed;hpb=5700ea3c08ea5e4a5c743f0413b65dc8eebfd220;p=blank.git diff --git a/src/app.hpp b/src/app.hpp index 1c3c69d..e1f328a 100644 --- 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,31 +37,20 @@ private: Window window; GLContext ctx; InitGLEW init_glew; - Program program; + DirectionalLighting program; float move_velocity; float pitch_sensitivity; float yaw_sensitivity; Camera cam; + 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;