GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add global instance of font factory

Browse Source
This commit is contained in:
Georg Hagen
2025-02-04 22:17:40 +01:00
parent a8d4946751
commit 8926f5dd51
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openVulkanoCpp/Scene/Text/FontAtlasFactory.cpp
View File

@@ -14,6 +14,8 @@
namespace OpenVulkano::Scene namespace OpenVulkano::Scene
{ {
FontAtlasFactory FontAtlasFactory::INSTANCE = FontAtlasFactory(); // Global factory
FontAtlasFactory::FontIdentifier::FontIdentifier(const std::string& font_, const std::set<uint32_t>& charset, FontAtlasFactory::FontIdentifier::FontIdentifier(const std::string& font_, const std::set<uint32_t>& charset,
SubpixelLayout subpixelLayout_, float ptSize_, SubpixelLayout subpixelLayout_, float ptSize_,
FontAtlasType atlasType_) FontAtlasType atlasType_)

16
openVulkanoCpp/Scene/Text/FontAtlasFactory.hpp
View File

@@ -26,19 +26,25 @@ namespace OpenVulkano::Scene
float ptSize = 0; float ptSize = 0;
FontAtlasType atlasType; FontAtlasType atlasType;
}; };
static FontAtlasFactory INSTANCE;
const bool m_allowSystemFonts;
mutable std::map<FontIdentifier, FontAtlas::Ptr> m_atlasesCache;
public: public:
FontAtlasFactory(bool allowSystemFonts = true) : m_allowSystemFonts(allowSystemFonts) {} static FontAtlasFactory& GetInstance() { return INSTANCE; }
FontAtlasFactory(const bool allowSystemFonts = true) : m_allowSystemFonts(allowSystemFonts) {}
[[nodiscard]] FontAtlas::Ptr GetFontAtlasScalable(const std::string& fontIdentifier, bool msdf = true, [[nodiscard]] FontAtlas::Ptr GetFontAtlasScalable(const std::string& fontIdentifier, bool msdf = true,
const std::set<uint32_t>& charset = {}) const; const std::set<uint32_t>& charset = {}) const;
[[nodiscard]] FontAtlas::Ptr GetFontAtlas(const std::string& fontIdentifier, float ptSize, [[nodiscard]] FontAtlas::Ptr GetFontAtlas(const std::string& fontIdentifier, float ptSize,
SubpixelLayout subpixelLayout = SubpixelLayout::UNKNOWN, SubpixelLayout subpixelLayout = SubpixelLayout::UNKNOWN,
const std::set<uint32_t>& charset = {}) const; const std::set<uint32_t>& charset = {}) const;
private: private:
Array<char> FindFont(const std::string& fontFile) const; Array<char> FindFont(const std::string& fontFile) const;
private:
const bool m_allowSystemFonts;
mutable std::map<FontIdentifier, FontAtlas::Ptr> m_atlasesCache;
}; };
} }