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

diff --git a/src/app.hpp b/src/app.hpp
index 9ec5f1f..f3ee141 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -4,7 +4,10 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
+#include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
+#include "model.hpp"
 #include "shader.hpp"
 
 
@@ -23,22 +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;
 
-	GLuint vtx_buf;
-	glm::mat4 mvp;
+	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 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;
+
 };
 
 }