FIX avoid memory leak in FontRegistry

- use SiD based font ids

Author: kikonen

src/text/FontAtlas.cpp

@@ -83,7 +83,7 @@ namespace text
             m_atlasSize == o.m_atlasSize;
     }
 
-    bool FontAtlas::valid()
+    bool FontAtlas::valid() const
     {
         return m_fontHandle && m_fontHandle->valid();
     }

src/text/FontAtlas.h

@@ -32,13 +32,14 @@ namespace text
 
         bool operator==(const FontAtlas& o) const noexcept;
 
-        bool valid();
+        bool valid() const;
 
         void prepare();
 
         void update();
 
-        FontHandle* getFont() {
+        FontHandle* getFont() const
+        {
             return m_fontHandle.get();
         }
 

src/text/FontHandle.cpp

@@ -46,7 +46,7 @@ namespace text
         //ftgl::texture_font_delete(m_font);
     }
 
-    bool FontHandle::valid()
+    bool FontHandle::valid() const
     {
         return m_font != nullptr;
     }

src/text/FontHandle.h

@@ -16,7 +16,7 @@ namespace text
         FontHandle(FontHandle&& o) noexcept;
         ~FontHandle();
 
-        bool valid();
+        bool valid() const;
 
         void create(
             const std::string& fullPath,

src/text/FontRegistry.cpp

@@ -1,7 +1,11 @@
 #include "FontRegistry.h"
 
+#include <fmt/format.h>
+
 #include "engine/UpdateContext.h"
 
+#include "ki/sid.h"
+
 #include "kigl/GLState.h"
 
 namespace
@@ -60,46 +64,35 @@ namespace text {
     {
         std::shared_lock lock(m_lock);
 
-        for (auto& font : m_fonts) {
+        for (auto& [fontId, font] : m_fonts) {
             font.prepare();
             font.update();
         }
     }
 
-    //text::FontAtlas* FontRegistry::modifyFont(text::font_id id)
-    //{
-    //    if (id < 1) return nullptr;
-    //
-    //    std::shared_lock lock(m_lock);
-    //    assert(id > 0 && id <= m_fonts.size());
-    //
-    //    return &m_fonts[id - 1];
-    //}
-
     text::font_id FontRegistry::registerFont(
         text::FontAtlas&& src)
     {
         std::unique_lock lock(m_lock);
 
-        text::font_id fontId = findFont(src);
-        if (!fontId) {
-            auto& font = m_fonts.emplace_back(std::move(src));
-            font.m_id = static_cast<text::font_id>(m_fonts.size());
-            fontId = font.m_id;
-        }
+        text::font_id fontId;
+        {
+            std::string key = fmt::format(
+                "{}_{}_{}",
+                src.m_name,
+                src.m_fontPath,
+                src.m_fontSize);
 
-        return fontId;
-    }
+            fontId = SID(key);
+        }
 
-    text::font_id FontRegistry::findFont(
-        const text::FontAtlas& src) const noexcept
-    {
-        const auto& it = std::find_if(
-            m_fonts.begin(), m_fonts.end(),
-            [&src](const auto& font) {
-                return font == src;
-            });
+        const auto& it = m_fonts.find(fontId);
+        if (it == m_fonts.end())
+        {
+            src.m_id = fontId;
+            m_fonts.insert({ fontId, std::move(src) });
+        }
 
-        return it != m_fonts.end() ? it->m_id : 0;
+        return fontId;
     }
 }

src/text/FontRegistry.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include <unordered_map>
 #include <shared_mutex>
 
 #include "text/FontAtlas.h"
@@ -23,32 +24,24 @@ namespace text {
 
         void updateRT(const UpdateContext& ctx);
 
-        text::FontAtlas* getDefaultFontAtlas() noexcept
+        const text::FontAtlas* getDefaultFontAtlas() const noexcept
         {
             return getFontAtlas(m_defaultFontId);
         }
 
-        text::FontAtlas* getFontAtlas(text::font_id id) noexcept
+        const text::FontAtlas* getFontAtlas(text::font_id id) const noexcept
         {
-            if (id < 1) return nullptr;
-
-            std::shared_lock lock(m_lock);
-            if (id < 1 || id > m_fonts.size()) return nullptr;
-
-            return m_fonts[id - 1].valid() ? & m_fonts[id - 1] : nullptr;
+            const auto& it = m_fonts.find(id);
+            return it != m_fonts.end() ? &it->second : nullptr;
         }
 
         text::font_id registerFont(
             text::FontAtlas&& src);
 
-    private:
-        text::font_id findFont(
-            const text::FontAtlas& src) const noexcept;
-
     private:
         mutable std::shared_mutex m_lock{};
 
-        std::vector<text::FontAtlas> m_fonts;
+        std::unordered_map<text::font_id, text::FontAtlas> m_fonts;
 
         text::font_id m_defaultFontId{ 0 };
     };

src/text/TextDraw.cpp

@@ -45,7 +45,7 @@ namespace
     //
     void addText(
         mesh::TextMesh* mesh,
-        text::FontAtlas* fontAtlas,
+        const text::FontAtlas* fontAtlas,
         std::string_view text,
         const glm::vec2& pivot,
         text::Align alignHorizontal,

src/text/size.h

@@ -4,5 +4,6 @@
 
 namespace text
 {
-    typedef uint8_t font_id;
+    // SID
+    typedef uint32_t font_id;
 }