X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FHUD.hpp;h=b6ae7d7656cba0298f013ee24833ec0aeab0a0dc;hb=225a7e66ed3f3f03ab458ab39c914ed55cd69600;hp=4b60127e685d7eb45462a9b3453b4c43a3251a44;hpb=5d2da8a07411ad6417d6ed8d1be997189cf5ce89;p=blank.git

diff --git a/src/ui/HUD.hpp b/src/ui/HUD.hpp
index 4b60127..b6ae7d7 100644
--- a/src/ui/HUD.hpp
+++ b/src/ui/HUD.hpp
@@ -1,10 +1,10 @@
 #ifndef BLANK_UI_HUD_H_
 #define BLANK_UI_HUD_H_
 
-#include "../graphics/Texture.hpp"
-#include "../model/Model.hpp"
-#include "../model/OutlineModel.hpp"
-#include "../model/SpriteModel.hpp"
+#include "FixedText.hpp"
+#include "MessageBox.hpp"
+#include "../graphics/EntityMesh.hpp"
+#include "../graphics/PrimitiveMesh.hpp"
 
 #include <glm/glm.hpp>
 
@@ -13,37 +13,89 @@ namespace blank {
 
 class Block;
 class BlockTypeRegistry;
+class Config;
+class ConnectionHandler;
+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 ConnectionHandler &);
+
+	// 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;
-
-	Texture block_label;
-	SpriteModel label_sprite;
-	glm::mat4 label_transform;
-	SDL_Color label_color;
-
+	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;
 
 };