X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=f3ee1410f5ee405a29e2a01b25fb2ab091fa4969;hb=3baab6cca7423d55ea08288d96570b02380b1fe9;hp=e525ec632e6459a8612539b6807cfad32549b89c;hpb=e1e349bb6035463529bc341c472987d229e1cdca;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index e525ec6..f3ee141 100644
--- 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,6 +26,7 @@ public:
 	void Loop(int dt);
 
 	void HandleEvents();
+	void Update(int dt);
 	void Render();
 
 private:
@@ -35,13 +38,30 @@ private:
 	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;
+
 };
 
 }