glm backwards compatibility

[blank.git] / src / ui / HUD.hpp

diff --git a/src/ui/HUD.hpp b/src/ui/HUD.hpp
index 47e0fd453f635f7b048dab826d798f3a1c76cc77..cbe28762727c81e90c47f973298bce545f3a6393 100644 (file)
--- a/src/ui/HUD.hpp
+++ b/src/ui/HUD.hpp
@@ -1,45 +1,100 @@
 #ifndef BLANK_UI_HUD_H_
 #define BLANK_UI_HUD_H_
 
-#include "../graphics/Text.hpp"
-#include "../model/Model.hpp"
-#include "../model/OutlineModel.hpp"
-
-#include <glm/glm.hpp>
+#include "FixedText.hpp"
+#include "MessageBox.hpp"
+#include "../graphics/EntityMesh.hpp"
+#include "../graphics/glm.hpp"
+#include "../graphics/PrimitiveMesh.hpp"
 
 
 namespace blank {
 
 class Block;
 class BlockTypeRegistry;
+class Config;
+class CongestionControl;
+class Environment;
 class Font;
+class Player;
 class Viewport;
 
 class HUD {
 
 public:
-       HUD(const BlockTypeRegistry &, const Font &);
+       explicit HUD(Environment &, Config &, const Player &);
 
        HUD(const HUD &) = delete;
        HUD &operator =(const HUD &) = delete;
 
-       void Display(const Block &);
-
+       // focus
+       void FocusBlock(const Chunk &, int);
+       void FocusEntity(const Entity &);
+       void FocusNone();
+
+       // "inventory"
+       void DisplayNone();
+       void Display(const BlockType &);
+
+       // debug overlay
+       void UpdateDebug();
+       void UpdateCounter();
+       void UpdatePosition();
+       void UpdateOrientation();
+
+       // net stats
+       void UpdateNetStats(const CongestionControl &);
+
+       // message box
+       void PostMessage(const char *);
+       void PostMessage(const std::string &msg) {
+               PostMessage(msg.c_str());
+       }
+       // whether to always render message box regardless of last post
+       void KeepMessages(bool k) { msg_keep = k; }
+
+       void Update(int dt);
        void Render(Viewport &) noexcept;
 
 private:
-       const BlockTypeRegistry &types;
-       const Font &font;
-
-       Model block;
-       Model::Buffer block_buf;
+       Environment &env;
+       Config &config;
+       const Player &player;
+
+       // block focus
+       PrimitiveMesh outline;
+       glm::mat4 outline_transform;
+       bool outline_visible;
+
+       // "inventory"
+       EntityMesh block;
+       EntityMesh::Buffer block_buf;
        glm::mat4 block_transform;
-
-       Text block_label;
-
+       FixedText block_label;
        bool block_visible;
 
-       OutlineModel crosshair;
+       // debug overlay
+       FixedText counter_text;
+       FixedText position_text;
+       FixedText orientation_text;
+       FixedText block_text;
+       FixedText entity_text;
+       bool show_block;
+       bool show_entity;
+
+       // net stats
+       FixedText bandwidth_text;
+       FixedText rtt_text;
+       FixedText packet_loss_text;
+       bool show_net;
+
+       // message box
+       MessageBox messages;
+       CoarseTimer msg_timer;
+       bool msg_keep;
+
+       // crosshair
+       PrimitiveMesh crosshair;
 
 };