simple (text) progress display for preloader

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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index eaed0fc0b15b5122752bedad02397068a0fcacc3..82eade3be2b06771e49ffd159409520c12f42bbb 100644 (file)
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -1,13 +1,13 @@
 #ifndef BLANK_UI_INTERFACE_HPP_
 #define BLANK_UI_INTERFACE_HPP_
 
+#include "FixedText.hpp"
 #include "HUD.hpp"
+#include "MessageBox.hpp"
 #include "../app/FPSController.hpp"
 #include "../app/IntervalTimer.hpp"
 #include "../audio/Sound.hpp"
-#include "../graphics/FixedText.hpp"
 #include "../graphics/Font.hpp"
-#include "../graphics/MessageBox.hpp"
 #include "../model/geometry.hpp"
 #include "../model/OutlineModel.hpp"
 #include "../world/Block.hpp"
@@ -18,10 +18,8 @@
 
 namespace blank {
 
-class Assets;
-class Audio;
 class Chunk;
-class FrameCounter;
+class Environment;
 class Viewport;
 class World;
 
@@ -39,7 +37,7 @@ public:
                bool visual_disabled = false;
        };
 
-       Interface(const Config &, const Assets &, Audio &, const FrameCounter &, World &);
+       Interface(const Config &, Environment &, World &);
 
        void HandlePress(const SDL_KeyboardEvent &);
        void HandleRelease(const SDL_KeyboardEvent &);
@@ -69,8 +67,9 @@ public:
        void ToggleAudio();
        void ToggleVisual();
 
-       void ToggleCounter();
+       void ToggleDebug();
        void UpdateCounter();
+       void UpdatePosition();
 
        void PostMessage(const char *);
        void PostMessage(const std::string &msg) {
@@ -85,8 +84,7 @@ private:
        void CheckAim();
 
 private:
-       Audio &audio;
-       const FrameCounter &counter;
+       Environment &env;
        World &world;
        FPSController ctrl;
        Font font;
@@ -101,6 +99,7 @@ private:
        glm::mat4 outline_transform;
 
        FixedText counter_text;
+       FixedText position_text;
        MessageBox messages;
        IntervalTimer msg_timer;