use collision structures for ray tests

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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index 82eade3be2b06771e49ffd159409520c12f42bbb..2538c46cc9176f9a677c255738370504edd283d2 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,8 @@ public:
        void ToggleDebug();
        void UpdateCounter();
        void UpdatePosition();
+       void UpdateOrientation();
+       void UpdateBlockInfo();
 
        void PostMessage(const char *);
        void PostMessage(const std::string &msg) {
@@ -82,24 +85,26 @@ 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;
+       Block last_displayed;
        MessageBox messages;
        IntervalTimer msg_timer;
 
@@ -114,7 +119,9 @@ private:
        Sound place_sound;
        Sound remove_sound;
 
-       glm::tvec3<int> fwd, rev;
+       glm::ivec3 fwd, rev;
+
+       bool debug;
 
 };