add some light and color

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index d949567347f336e978fd62d7f15a1871140b49a1..f3ee1410f5ee405a29e2a01b25fb2ab091fa4969 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -7,6 +7,7 @@
 #include "camera.hpp"
 #include "controller.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
 
 
@@ -42,10 +43,20 @@ private:
        float yaw_sensitivity;
 
        Camera cam;
-       FPSController model;
+       Model model;
+       FPSController modelCtrl;
 
-       GLuint vtx_buf;
+       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;