rename model -> controller

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 8bafb2368d4f685c7b60f629e5bcd39e6b883fca..d949567347f336e978fd62d7f15a1871140b49a1 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,8 +5,8 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
-#include "model.hpp"
 #include "shader.hpp"
 
 
@@ -25,6 +25,7 @@ public:
        void Loop(int dt);
 
        void HandleEvents();
+       void Update(int dt);
        void Render();
 
 private:
@@ -36,17 +37,20 @@ private:
        InitGLEW init_glew;
        Program program;
 
+       float move_velocity;
        float pitch_sensitivity;
        float yaw_sensitivity;
 
        Camera cam;
-       Model model;
+       FPSController model;
 
        GLuint vtx_buf;
        GLuint mvp_handle;
 
        bool running;
 
+       bool front, back, left, right, up, down;
+
 };
 
 }