X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;fp=src%2Fapp.hpp;h=d9b70469a527a98870ea279aabccdc6a3f7a4859;hb=482114e156e91729f2529ea6bb1fe98dacdee97f;hp=f3ee1410f5ee405a29e2a01b25fb2ab091fa4969;hpb=32a385382b73072438c99b533686a4bb9ba4742c;p=blank.git diff --git a/src/app.hpp b/src/app.hpp index f3ee141..d9b7046 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -7,8 +7,8 @@ #include "camera.hpp" #include "controller.hpp" #include "init.hpp" -#include "model.hpp" #include "shader.hpp" +#include "world.hpp" namespace blank { @@ -42,9 +42,10 @@ private: float pitch_sensitivity; float yaw_sensitivity; + BlockType testBlockType; + Camera cam; - Model model; - FPSController modelCtrl; + Chunk chunk; glm::vec3 light_position; glm::vec3 light_color;