X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=d045cc900b2e5215fea3c3dcc00eb443e7ee02fa;hb=5e8eee742138f2578e83e710ffc41408abd3073f;hp=f810ff0581f1358dd1bdaca2494df44de3dc23f5;hpb=afd253b2dd10fdf2d4655d3d4a5766e6aa8c1a2c;p=blank.git diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp index f810ff0..d045cc9 100644 --- a/src/ui/Interface.hpp +++ b/src/ui/Interface.hpp @@ -1,19 +1,19 @@ #ifndef BLANK_UI_INTERFACE_HPP_ #define BLANK_UI_INTERFACE_HPP_ +#include "FixedText.hpp" #include "HUD.hpp" +#include "MessageBox.hpp" #include "../app/FPSController.hpp" #include "../app/IntervalTimer.hpp" #include "../audio/Sound.hpp" -#include "../graphics/FixedText.hpp" -#include "../graphics/Font.hpp" -#include "../graphics/MessageBox.hpp" #include "../model/geometry.hpp" #include "../model/OutlineModel.hpp" #include "../world/Block.hpp" #include #include +#include namespace blank { @@ -70,6 +70,7 @@ public: void ToggleDebug(); void UpdateCounter(); void UpdatePosition(); + void UpdateOrientation(); void PostMessage(const char *); void PostMessage(const std::string &msg) { @@ -87,7 +88,6 @@ private: Environment &env; World &world; FPSController ctrl; - Font font; HUD hud; Ray aim; @@ -100,6 +100,7 @@ private: FixedText counter_text; FixedText position_text; + FixedText orientation_text; MessageBox messages; IntervalTimer msg_timer; @@ -114,7 +115,9 @@ private: Sound place_sound; Sound remove_sound; - glm::tvec3 fwd, rev; + glm::ivec3 fwd, rev; + + bool debug; };