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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 907f9c2..7c9a91e 100644
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -10,6 +10,8 @@
 #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>
@@ -18,7 +20,6 @@
 
 namespace blank {
 
-class Chunk;
 class Entity;
 class Environment;
 class Viewport;
@@ -28,6 +29,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;
@@ -38,7 +41,10 @@ public:
 		bool visual_disabled = false;
 	};
 
-	Interface(const Config &, Environment &, World &);
+	Interface(const Config &, Environment &, World &, Entity &);
+
+	Entity &Player() noexcept { return ctrl.Controlled(); }
+	const Entity &Player() const noexcept { return ctrl.Controlled(); }
 
 	void HandlePress(const SDL_KeyboardEvent &);
 	void HandleRelease(const SDL_KeyboardEvent &);
@@ -56,12 +62,6 @@ public:
 	void PlaceBlock();
 	void RemoveBlock() noexcept;
 
-	void PrintBlockInfo();
-	void PrintChunkInfo();
-	void PrintLightInfo();
-	void PrintSelectionInfo();
-	void Print(const Block &);
-
 	void SelectNext();
 	void SelectPrevious();
 
@@ -73,6 +73,7 @@ public:
 	void UpdatePosition();
 	void UpdateOrientation();
 	void UpdateBlockInfo();
+	void UpdateEntityInfo();
 
 	void PostMessage(const char *);
 	void PostMessage(const std::string &msg) {
@@ -94,10 +95,8 @@ private:
 	HUD hud;
 
 	Ray aim;
-	Chunk *aim_chunk;
-	Entity *aim_entity;
-	int aim_block;
-	glm::vec3 aim_normal;
+	WorldCollision aim_world;
+	EntityCollision aim_entity;
 
 	OutlineModel outline;
 	glm::mat4 outline_transform;
@@ -106,7 +105,9 @@ private:
 	FixedText position_text;
 	FixedText orientation_text;
 	FixedText block_text;
-	Block last_displayed;
+	FixedText entity_text;
+	Block last_block;
+	Entity *last_entity;
 	MessageBox messages;
 	IntervalTimer msg_timer;