X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FHUD.hpp;h=a1662f49e657099be2f7765d0216aeb323624a9a;hb=5998b18978bd8e7a0c9deb516474634e1d3521c9;hp=4b60127e685d7eb45462a9b3453b4c43a3251a44;hpb=5d2da8a07411ad6417d6ed8d1be997189cf5ce89;p=blank.git diff --git a/src/ui/HUD.hpp b/src/ui/HUD.hpp index 4b60127..a1662f4 100644 --- a/src/ui/HUD.hpp +++ b/src/ui/HUD.hpp @@ -1,10 +1,9 @@ #ifndef BLANK_UI_HUD_H_ #define BLANK_UI_HUD_H_ -#include "../graphics/Texture.hpp" -#include "../model/Model.hpp" +#include "../graphics/FixedText.hpp" +#include "../model/EntityModel.hpp" #include "../model/OutlineModel.hpp" -#include "../model/SpriteModel.hpp" #include @@ -32,14 +31,11 @@ private: const BlockTypeRegistry &types; const Font &font; - Model block; - Model::Buffer block_buf; + EntityModel block; + EntityModel::Buffer block_buf; glm::mat4 block_transform; - Texture block_label; - SpriteModel label_sprite; - glm::mat4 label_transform; - SDL_Color label_color; + FixedText block_label; bool block_visible;