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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 907f9c2..5cf8207 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,8 +20,6 @@
 
 namespace blank {
 
-class Chunk;
-class Entity;
 class Environment;
 class Viewport;
 class World;
@@ -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;