add some light and color

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 5148a7a411a30669425b376ee9b73394802510c8..f3ee1410f5ee405a29e2a01b25fb2ab091fa4969 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,7 +5,9 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
 
 
@@ -24,23 +26,42 @@ public:
        void Loop(int dt);
 
        void HandleEvents();
+       void Update(int dt);
        void Render();
 
 private:
        InitSDL init_sdl;
+       InitIMG init_img;
        InitGL init_gl;
        Window window;
        GLContext ctx;
        InitGLEW init_glew;
        Program program;
 
+       float move_velocity;
+       float pitch_sensitivity;
+       float yaw_sensitivity;
+
        Camera cam;
+       Model model;
+       FPSController modelCtrl;
+
+       glm::vec3 light_position;
+       glm::vec3 light_color;
+       float light_power;
 
-       GLuint vtx_buf;
+       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;
+
 };
 
 }