block type colors

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index 5148a7a411a30669425b376ee9b73394802510c8..e5cddcedadb7a722de3cf1c075cc9ce31f6408be 100644 (file)
--- 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;
+
+       BlockTypeRegistry blockType;
+
        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;
+
 };
 
 }