From cf64ce9a1312de5e9a76bb3f43105a4eac59eb15 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 2 Jan 2022 01:32:02 +0000
Subject: Use Cache system to persist font rendering for Text

---
 ui/text.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ui/text.cpp')

diff --git a/ui/text.cpp b/ui/text.cpp
index 2acfb7e..0c372a1 100644
--- a/ui/text.cpp
+++ b/ui/text.cpp
@@ -3,15 +3,19 @@
 #include "gfx/gl/uiShader.h"
 #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 auto font {"/usr/share/fonts/hack/Hack-Regular.ttf"};
+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}
 {
-	for (const auto & textureQuads : Font {font, static_cast<unsigned int>(pos.size.y)}.render(s)) {
+	for (const auto & textureQuads :
+			Font::cachedFontRenderings.get(font, static_cast<unsigned int>(pos.size.y))->render(s)) {
 		auto & rendering
 				= models.emplace_back(textureQuads.first, static_cast<GLsizei>(6 * textureQuads.second.size()));
 		glBindVertexArray(rendering.vao);
-- 
cgit v1.2.3