explicit reference for world coordinates

[blank.git] / src / ui / Interface.hpp

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 0d338bed9f3949a91c9854a254ac1c2fade51486..5cf82076a74b0f629dc15930f2dca2b3c001296e 100644 (file)
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -7,18 +7,19 @@
 #include "../app/FPSController.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../audio/Sound.hpp"
-#include "../graphics/Font.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 Chunk;
 class Environment;
 class Viewport;
 class World;
@@ -70,6 +71,9 @@ public:
        void ToggleDebug();
        void UpdateCounter();
        void UpdatePosition();
+       void UpdateOrientation();
+       void UpdateBlockInfo();
+       void UpdateEntityInfo();
 
        void PostMessage(const char *);
        void PostMessage(const std::string &msg) {
@@ -82,24 +86,28 @@ public:
 
 private:
        void CheckAim();
+       void UpdateOutline();
 
 private:
        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;
 
        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;
 
@@ -116,6 +124,8 @@ private:
 
        glm::ivec3 fwd, rev;
 
+       bool debug;
+
 };
 
 }