summaryrefslogtreecommitdiff
path: root/ui/text.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ui/text.cpp')
-rw-r--r--ui/text.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/ui/text.cpp b/ui/text.cpp
index b776b90..7cb7d30 100644
--- a/ui/text.cpp
+++ b/ui/text.cpp
@@ -4,19 +4,13 @@
#include "uiComponent.h"
#include <array>
#include <cache.h>
-#include <filesystem>
#include <glArrays.h>
#include <glm/gtc/type_ptr.hpp>
-#include <map>
-#include <memory>
#include <utility>
-const std::filesystem::path font {"/usr/share/fonts/hack/Hack-Regular.ttf"};
-
-Text::Text(std::string_view s, Position pos, glm::vec3 c) : UIComponent {pos}, colour {c}
+Text::Text(std::string_view s, const Font & font, Position pos, glm::vec3 c) : UIComponent {pos}, colour {c}
{
- for (const auto & textureQuads :
- Font::cachedFontRenderings.get(font, static_cast<unsigned int>(pos.size.y))->render(s)) {
+ for (const auto & textureQuads : font.render(s)) {
auto & rendering
= models.emplace_back(textureQuads.first, static_cast<GLsizei>(6 * textureQuads.second.size()));
glBindVertexArray(rendering.vao);