X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FHUD.hpp;h=cab8f93e0bf13c26cccb69a6a3a4d48b6ac28fa9;hb=75172fd735e34082c34b47ae7c194445b53038d9;hp=d15643f4d4476090fc98138e10bcdaeffc2cbd14;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git diff --git a/src/ui/HUD.hpp b/src/ui/HUD.hpp index d15643f..cab8f93 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/PrimitiveMesh.hpp" #include @@ -57,13 +57,13 @@ private: const Player &player; // block focus - OutlineModel outline; + PrimitiveMesh 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; + PrimitiveMesh crosshair; };