X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=2538c46cc9176f9a677c255738370504edd283d2;hb=d2fa8ca97d291508ce3812fb052a8255d3190d00;hp=1e2e8834ba7a507f369661e4f68ca84eba583749;hpb=1bc6f085c53cdeaa08e2c00e821d4e2e25cae1c8;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 1e2e883..2538c46 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -1,22 +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 "../graphics/Font.hpp"
+#include "../audio/Sound.hpp"
 #include "../model/geometry.hpp"
 #include "../model/OutlineModel.hpp"
 #include "../world/Block.hpp"
+#include "../world/EntityCollision.hpp"
+#include "../world/WorldCollision.hpp"
 
+#include <string>
 #include <glm/glm.hpp>
+#include <SDL.h>
 
 
 namespace blank {
 
-class Assets;
-class Chunk;
-class FrameCounter;
+class Environment;
 class Viewport;
 class World;
 
@@ -30,10 +34,11 @@ public:
 
 		bool keyboard_disabled = false;
 		bool mouse_disabled = false;
+		bool audio_disabled = false;
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, const Assets &, const FrameCounter &, World &);
+	Interface(const Config &, Environment &, World &);
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -42,8 +47,6 @@ public:
 	void HandleRelease(const SDL_MouseButtonEvent &);
 	void Handle(const SDL_MouseWheelEvent &);
 
-	void Resize(const Viewport &);
-
 	void FaceBlock();
 	void TurnBlock();
 
@@ -62,8 +65,19 @@ public:
 	void SelectNext();
 	void SelectPrevious();
 
-	void ToggleCounter();
+	void ToggleAudio();
+	void ToggleVisual();
+
+	void ToggleDebug();
 	void UpdateCounter();
+	void UpdatePosition();
+	void UpdateOrientation();
+	void UpdateBlockInfo();
+
+	void PostMessage(const char *);
+	void PostMessage(const std::string &msg) {
+		PostMessage(msg.c_str());
+	}
 
 	void Update(int dt);
 
@@ -71,27 +85,28 @@ public:
 
 private:
 	void CheckAim();
+	void UpdateOutline();
 
 private:
-	const FrameCounter &counter;
+	Environment &env;
 	World &world;
 	FPSController ctrl;
-	Font font;
 	HUD hud;
 
 	Ray aim;
-	Chunk *aim_chunk;
-	int aim_block;
-	glm::vec3 aim_normal;
+	WorldCollision aim_world;
+	EntityCollision aim_entity;
 
 	OutlineModel outline;
 	glm::mat4 outline_transform;
 
-	bool show_counter;
-	Texture counter_tex;
-	SpriteModel counter_sprite;
-	glm::mat4 counter_transform;
-	float counter_x;
+	FixedText counter_text;
+	FixedText position_text;
+	FixedText orientation_text;
+	FixedText block_text;
+	Block last_displayed;
+	MessageBox messages;
+	IntervalTimer msg_timer;
 
 	Config config;
 
@@ -101,7 +116,12 @@ private:
 	Block remove;
 	Block selection;
 
-	glm::tvec3<int> fwd, rev;
+	Sound place_sound;
+	Sound remove_sound;
+
+	glm::ivec3 fwd, rev;
+
+	bool debug;
 
 };