X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=d9b70469a527a98870ea279aabccdc6a3f7a4859;hb=482114e156e91729f2529ea6bb1fe98dacdee97f;hp=5148a7a411a30669425b376ee9b73394802510c8;hpb=0a13b3fe342db83eef2c0ddc991a44452df77aa3;p=blank.git

diff --git a/src/app.hpp b/src/app.hpp
index 5148a7a..d9b7046 100644
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,8 +5,10 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -24,23 +26,43 @@ 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;
+
+	BlockType testBlockType;
+
 	Camera cam;
+	Chunk chunk;
 
-	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;
 
+	bool front, back, left, right, up, down;
+
 };
 
 }