X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp.hpp;h=6bd4e0d9a14a65e615eb62f9f14df5f8b33f5c9b;hb=c3c5045f06327db2a3c97eae77a072bc06677286;hp=cb71411de60e312231f0ac847580f8baf914d579;hpb=119a7b6a7fdea2d501fc7b3410ffb22f72e8a1b8;p=blank.git diff --git a/src/app.hpp b/src/app.hpp index cb71411..6bd4e0d 100644 --- a/src/app.hpp +++ b/src/app.hpp @@ -1,14 +1,9 @@ #ifndef BLANK_APP_HPP_ #define BLANK_APP_HPP_ -#include -#include - #include "camera.hpp" -#include "controller.hpp" -#include "hud.hpp" #include "init.hpp" -#include "model.hpp" +#include "interface.hpp" #include "shader.hpp" #include "world.hpp" @@ -48,21 +43,11 @@ private: DirectionalLighting program; Camera cam; - HUD hud; World world; - FPSController controller; - - OutlineModel outline; - bool outline_visible; - glm::mat4 outline_transform; + Interface interface; bool running; - bool place, remove, pick; - - int remove_id; - int place_id; - }; }