outline pointed-at block

[blank.git] / src / app.hpp

diff --git a/src/app.hpp b/src/app.hpp
index e525ec632e6459a8612539b6807cfad32549b89c..8c6d792bdd48f63041b9068a44c303737be8fd28 100644 (file)
--- a/src/app.hpp
+++ b/src/app.hpp
@@ -5,8 +5,11 @@
 #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 {
@@ -24,6 +27,7 @@ public:
        void Loop(int dt);
 
        void HandleEvents();
+       void Update(int dt);
        void Render();
 
 private:
@@ -35,13 +39,35 @@ private:
        InitGLEW init_glew;
        Program program;
 
+       float move_velocity;
+       float pitch_sensitivity;
+       float yaw_sensitivity;
+
+       BlockTypeRegistry blockType;
+
        Camera cam;
+       Chunk chunk;
+       OutlineModel outline;
+
+       bool outline_visible;
+       glm::mat4 outline_transform;
 
-       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;
+
 };
 
 }