block type colors

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index c5a5098578c306a951c79d0157af6b7ce15c648b..e5cddcedadb7a722de3cf1c075cc9ce31f6408be 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,9 +5,10 @@
 #include <glm/gtc/matrix_transform.hpp>
 
 #include "camera.hpp"
+#include "controller.hpp"
 #include "init.hpp"
-#include "model.hpp"
 #include "shader.hpp"
+#include "world.hpp"
 
 
 namespace blank {
@@ -41,11 +42,22 @@ private:
        float pitch_sensitivity;
        float yaw_sensitivity;
 
+       BlockTypeRegistry blockType;
+
        Camera cam;
-       Model model;
+       Chunk chunk;
+
+       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;