special treatment for players

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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index d045cc900b2e5215fea3c3dcc00eb443e7ee02fa..aab8b156596e5cdf42ba691bb8cbe8a381c46dc4 100644 (file)
--- 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 Environment;
 class Viewport;
 class World;
@@ -27,6 +28,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,6 +42,9 @@ public:
 
        Interface(const Config &, Environment &, World &);
 
+       Entity &Player() noexcept { return ctrl.Controlled(); }
+       const Entity &Player() const noexcept { return ctrl.Controlled(); }
+
        void HandlePress(const SDL_KeyboardEvent &);
        void HandleRelease(const SDL_KeyboardEvent &);
        void Handle(const SDL_MouseMotionEvent &);
@@ -55,12 +61,6 @@ public:
        void PlaceBlock();
        void RemoveBlock() noexcept;
 
-       void PrintBlockInfo();
-       void PrintChunkInfo();
-       void PrintLightInfo();
-       void PrintSelectionInfo();
-       void Print(const Block &);
-
        void SelectNext();
        void SelectPrevious();
 
@@ -71,6 +71,8 @@ public:
        void UpdateCounter();
        void UpdatePosition();
        void UpdateOrientation();
+       void UpdateBlockInfo();
+       void UpdateEntityInfo();
 
        void PostMessage(const char *);
        void PostMessage(const std::string &msg) {
@@ -83,6 +85,7 @@ public:
 
 private:
        void CheckAim();
+       void UpdateOutline();
 
 private:
        Environment &env;
@@ -91,9 +94,8 @@ private:
        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;
@@ -101,6 +103,10 @@ private:
        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;