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

diff --git a/src/app.hpp b/src/app.hpp
index d949567..f3ee141 100644
--- 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;