"streamlined" model/VAO handling

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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index d6c301981ef45125ac10cbf7a4eeabd7b987dbe6..eaed0fc0b15b5122752bedad02397068a0fcacc3 100644 (file)
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -4,18 +4,22 @@
 #include "HUD.hpp"
 #include "../app/FPSController.hpp"
 #include "../app/IntervalTimer.hpp"
+#include "../audio/Sound.hpp"
+#include "../graphics/FixedText.hpp"
 #include "../graphics/Font.hpp"
-#include "../graphics/Text.hpp"
+#include "../graphics/MessageBox.hpp"
 #include "../model/geometry.hpp"
 #include "../model/OutlineModel.hpp"
 #include "../world/Block.hpp"
 
+#include <string>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
 class Assets;
+class Audio;
 class Chunk;
 class FrameCounter;
 class Viewport;
@@ -31,10 +35,11 @@ public:
 
                bool keyboard_disabled = false;
                bool mouse_disabled = false;
+               bool audio_disabled = false;
                bool visual_disabled = false;
        };
 
-       Interface(const Config &, const Assets &, const FrameCounter &, World &);
+       Interface(const Config &, const Assets &, Audio &, const FrameCounter &, World &);
 
        void HandlePress(const SDL_KeyboardEvent &);
        void HandleRelease(const SDL_KeyboardEvent &);
@@ -61,9 +66,17 @@ public:
        void SelectNext();
        void SelectPrevious();
 
+       void ToggleAudio();
+       void ToggleVisual();
+
        void ToggleCounter();
        void UpdateCounter();
 
+       void PostMessage(const char *);
+       void PostMessage(const std::string &msg) {
+               PostMessage(msg.c_str());
+       }
+
        void Update(int dt);
 
        void Render(Viewport &) noexcept;
@@ -72,6 +85,7 @@ private:
        void CheckAim();
 
 private:
+       Audio &audio;
        const FrameCounter &counter;
        World &world;
        FPSController ctrl;
@@ -86,7 +100,9 @@ private:
        OutlineModel outline;
        glm::mat4 outline_transform;
 
-       Text counter_text;
+       FixedText counter_text;
+       MessageBox messages;
+       IntervalTimer msg_timer;
 
        Config config;
 
@@ -96,6 +112,9 @@ private:
        Block remove;
        Block selection;
 
+       Sound place_sound;
+       Sound remove_sound;
+
        glm::tvec3<int> fwd, rev;
 
 };