X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=e5cddcedadb7a722de3cf1c075cc9ce31f6408be;hb=ac8765b510707d77cac9620778f40ddf3a4ad2a2;hp=f3ee1410f5ee405a29e2a01b25fb2ab091fa4969;hpb=3baab6cca7423d55ea08288d96570b02380b1fe9;p=blank.git diff --git a/src/app.hpp b/src/app.hpp index f3ee141..e5cddce 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; + BlockTypeRegistry blockType; + Camera cam; - Model model; - FPSController modelCtrl; + Chunk chunk; glm::vec3 light_position; glm::vec3 light_color;