X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FInterface.hpp;h=72db5d13eb94fbea290c434e8eae260234925cb3;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=eaed0fc0b15b5122752bedad02397068a0fcacc3;hpb=7c2a8b8285278b8a3077b311d82f05ea0463a96e;p=blank.git

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index eaed0fc..72db5d1 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -1,27 +1,28 @@
 #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 "../world/EntityCollision.hpp"
+#include "../world/Player.hpp"
+#include "../world/WorldCollision.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;
 
@@ -29,6 +30,8 @@ class Interface {
 
 public:
 	struct Config {
+		std::string player_name = "default";
+
 		float move_velocity = 0.005f;
 		float pitch_sensitivity = -0.0025f;
 		float yaw_sensitivity = -0.001f;
@@ -39,7 +42,9 @@ public:
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, const Assets &, Audio &, const FrameCounter &, World &);
+	Interface(const Config &, Environment &, World &, const Player &);
+
+	const Player &GetPlayer() noexcept { return player; }
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -57,20 +62,18 @@ public:
 	void PlaceBlock();
 	void RemoveBlock() noexcept;
 
-	void PrintBlockInfo();
-	void PrintChunkInfo();
-	void PrintLightInfo();
-	void PrintSelectionInfo();
-	void Print(const Block &);
-
 	void SelectNext();
 	void SelectPrevious();
 
 	void ToggleAudio();
 	void ToggleVisual();
 
-	void ToggleCounter();
+	void ToggleDebug();
 	void UpdateCounter();
+	void UpdatePosition();
+	void UpdateOrientation();
+	void UpdateBlockInfo();
+	void UpdateEntityInfo();
 
 	void PostMessage(const char *);
 	void PostMessage(const std::string &msg) {
@@ -83,24 +86,29 @@ public:
 
 private:
 	void CheckAim();
+	void UpdateOutline();
 
 private:
-	Audio &audio;
-	const FrameCounter &counter;
+	Environment &env;
 	World &world;
+	Player player;
 	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;
 
 	FixedText counter_text;
+	FixedText position_text;
+	FixedText orientation_text;
+	FixedText block_text;
+	FixedText entity_text;
+	Block last_block;
+	Entity *last_entity;
 	MessageBox messages;
 	IntervalTimer msg_timer;
 
@@ -115,7 +123,9 @@ private:
 	Sound place_sound;
 	Sound remove_sound;
 
-	glm::tvec3<int> fwd, rev;
+	glm::ivec3 fwd, rev;
+
+	bool debug;
 
 };