X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FHUD.hpp;fp=src%2Fui%2FHUD.hpp;h=32a167b865d2979209f763a1e12341280f3b2f28;hb=3542823a1af7f5063d7cc8da84efa248eb889b8a;hp=d15643f4d4476090fc98138e10bcdaeffc2cbd14;hpb=1c2994622a6b73f90cbd3ec9c09ffb4d7724cab4;p=blank.git diff --git a/src/ui/HUD.hpp b/src/ui/HUD.hpp index d15643f..32a167b 100644 --- a/src/ui/HUD.hpp +++ b/src/ui/HUD.hpp @@ -3,8 +3,8 @@ #include "FixedText.hpp" #include "MessageBox.hpp" -#include "../model/EntityModel.hpp" -#include "../model/OutlineModel.hpp" +#include "../graphics/EntityMesh.hpp" +#include "../graphics/OutlineMesh.hpp" #include @@ -57,13 +57,13 @@ private: const Player &player; // block focus - OutlineModel outline; + OutlineMesh outline; glm::mat4 outline_transform; bool outline_visible; // "inventory" - EntityModel block; - EntityModel::Buffer block_buf; + EntityMesh block; + EntityMesh::Buffer block_buf; glm::mat4 block_transform; FixedText block_label; bool block_visible; @@ -82,7 +82,7 @@ private: IntervalTimer msg_timer; // crosshair - OutlineModel crosshair; + OutlineMesh crosshair; };