X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=28c7536e440ec781926eb7af2b8a8099e4bfe6ed;hb=8881c507009521d08648560984c0f50166224542;hp=d9b70469a527a98870ea279aabccdc6a3f7a4859;hpb=482114e156e91729f2529ea6bb1fe98dacdee97f;p=blank.git diff --git a/src/app.hpp b/src/app.hpp index d9b7046..28c7536 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -7,6 +7,7 @@ #include "camera.hpp" #include "controller.hpp" #include "init.hpp" +#include "model.hpp" #include "shader.hpp" #include "world.hpp" @@ -17,7 +18,6 @@ class Application { public: Application(); - ~Application(); Application(const Application &) = delete; Application &operator =(const Application &) = delete; @@ -42,10 +42,14 @@ private: float pitch_sensitivity; float yaw_sensitivity; - BlockType testBlockType; + BlockTypeRegistry blockType; Camera cam; Chunk chunk; + OutlineModel outline; + + bool outline_visible; + glm::mat4 outline_transform; glm::vec3 light_position; glm::vec3 light_color; @@ -62,6 +66,10 @@ private: bool running; bool front, back, left, right, up, down; + bool place, remove, pick; + + int remove_id; + int place_id; };