X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=00b76e66b0c2232ea48cfc0eec1f053e03c3aaac;hb=3f35e70a6b66daf2ffd59590e98e2dd11e6eaabb;hp=a08a0bf5c6a3add3518ea571333bce3e44d6c212;hpb=955fbb45dedb570520fc45d2ce69f420bed2ad08;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index a08a0bf..00b76e6 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -4,18 +4,23 @@
 #include "HUD.hpp"
 #include "../app/FPSController.hpp"
 #include "../app/IntervalTimer.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 <SDL.h>
+#include <string>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
+class Assets;
 class Chunk;
-class DirectionalLighting;
+class FrameCounter;
+class Viewport;
 class World;
 
 class Interface {
@@ -31,7 +36,7 @@ public:
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, World &);
+	Interface(const Config &, const Assets &, const FrameCounter &, World &);
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -39,7 +44,6 @@ public:
 	void HandlePress(const SDL_MouseButtonEvent &);
 	void HandleRelease(const SDL_MouseButtonEvent &);
 	void Handle(const SDL_MouseWheelEvent &);
-	void Handle(const SDL_WindowEvent &) noexcept;
 
 	void FaceBlock();
 	void TurnBlock();
@@ -59,16 +63,26 @@ public:
 	void SelectNext();
 	void SelectPrevious();
 
+	void ToggleCounter();
+	void UpdateCounter();
+
+	void PostMessage(const char *);
+	void PostMessage(const std::string &msg) {
+		PostMessage(msg.c_str());
+	}
+
 	void Update(int dt);
 
-	void Render(DirectionalLighting &) noexcept;
+	void Render(Viewport &) noexcept;
 
 private:
 	void CheckAim();
 
 private:
+	const FrameCounter &counter;
 	World &world;
 	FPSController ctrl;
+	Font font;
 	HUD hud;
 
 	Ray aim;
@@ -79,6 +93,10 @@ private:
 	OutlineModel outline;
 	glm::mat4 outline_transform;
 
+	FixedText counter_text;
+	MessageBox messages;
+	IntervalTimer msg_timer;
+
 	Config config;
 
 	IntervalTimer place_timer;