X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=907f9c234a320e5434c0da1f21bd2244c397c958;hb=b0c2d423138dfb4849c679b3fb93e4336dcf5845;hp=1ade2d1bf326b4d776f60e4eb8e1821ae85a5c40;hpb=a1f911f8257f614f874c201fede5d5206f5b7e80;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 1ade2d1..907f9c2 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -1,27 +1,26 @@
 #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 <string>
 #include <glm/glm.hpp>
+#include <SDL.h>
 
 
 namespace blank {
 
-class Assets;
-class Audio;
 class Chunk;
-class FrameCounter;
+class Entity;
+class Environment;
 class Viewport;
 class World;
 
@@ -39,7 +38,7 @@ public:
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, const Assets &, Audio &, const FrameCounter &, World &);
+	Interface(const Config &, Environment &, World &);
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -72,6 +71,8 @@ public:
 	void ToggleDebug();
 	void UpdateCounter();
 	void UpdatePosition();
+	void UpdateOrientation();
+	void UpdateBlockInfo();
 
 	void PostMessage(const char *);
 	void PostMessage(const std::string &msg) {
@@ -84,17 +85,17 @@ public:
 
 private:
 	void CheckAim();
+	void UpdateOutline();
 
 private:
-	Audio &audio;
-	const FrameCounter &counter;
+	Environment &env;
 	World &world;
 	FPSController ctrl;
-	Font font;
 	HUD hud;
 
 	Ray aim;
 	Chunk *aim_chunk;
+	Entity *aim_entity;
 	int aim_block;
 	glm::vec3 aim_normal;
 
@@ -103,6 +104,9 @@ private:
 
 	FixedText counter_text;
 	FixedText position_text;
+	FixedText orientation_text;
+	FixedText block_text;
+	Block last_displayed;
 	MessageBox messages;
 	IntervalTimer msg_timer;
 
@@ -117,7 +121,9 @@ private:
 	Sound place_sound;
 	Sound remove_sound;
 
-	glm::tvec3<int> fwd, rev;
+	glm::ivec3 fwd, rev;
+
+	bool debug;
 
 };