move font color from texture to uniform

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

diff --git a/src/ui/Interface.hpp b/src/ui/Interface.hpp
index d01fe254a665ed0011c214a97fae7af4b9dbb030..1e2e8834ba7a507f369661e4f68ca84eba583749 100644 (file)
--- a/src/ui/Interface.hpp
+++ b/src/ui/Interface.hpp
@@ -9,7 +9,6 @@
 #include "../model/OutlineModel.hpp"
 #include "../world/Block.hpp"
 
-#include <SDL.h>
 #include <glm/glm.hpp>
 
 
@@ -17,9 +16,8 @@ namespace blank {
 
 class Assets;
 class Chunk;
-class BlendedSprite;
-class DirectionalLighting;
 class FrameCounter;
+class Viewport;
 class World;
 
 class Interface {
@@ -43,7 +41,8 @@ public:
        void HandlePress(const SDL_MouseButtonEvent &);
        void HandleRelease(const SDL_MouseButtonEvent &);
        void Handle(const SDL_MouseWheelEvent &);
-       void Handle(const SDL_WindowEvent &) noexcept;
+
+       void Resize(const Viewport &);
 
        void FaceBlock();
        void TurnBlock();
@@ -68,7 +67,7 @@ public:
 
        void Update(int dt);
 
-       void Render(DirectionalLighting &, BlendedSprite &) noexcept;
+       void Render(Viewport &) noexcept;
 
 private:
        void CheckAim();
@@ -92,7 +91,7 @@ private:
        Texture counter_tex;
        SpriteModel counter_sprite;
        glm::mat4 counter_transform;
-       SDL_Color counter_color;
+       float counter_x;
 
        Config config;