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

Cleanup font generators

Browse Source
This commit is contained in:
Georg Hagen
2025-03-02 18:58:33 +01:00
parent ee82919293
commit 6c796bb3a0
6 changed files with 24 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openVulkanoCpp/Scene/Text/BitmapFontAtlasGenerator.cpp
View File

@@ -11,21 +11,18 @@
namespace OpenVulkano::Scene
{
void BitmapFontAtlasGenerator::GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
const std::optional<std::string>& pngOutput)
void BitmapFontAtlasGenerator::GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset)
{
GenerateAtlas(Utils::ReadFile(fontFile), charset, pngOutput);
GenerateAtlas(Utils::ReadFile(fontFile), charset);
}
void BitmapFontAtlasGenerator::GenerateAtlas(const Array<char>& fontData, const std::set<uint32_t>& charset,
const std::optional<std::string>& pngOutput)
void BitmapFontAtlasGenerator::GenerateAtlas(const Array<char>& fontData, const std::set<uint32_t>& charset)
{
Generate({ reinterpret_cast<const uint8_t*>(fontData.Data()), fontData.Size() }, charset, pngOutput);
Generate(fontData.AsBytes(), charset);
}
void BitmapFontAtlasGenerator::Generate(const std::span<const uint8_t>& fontData,
const std::set<uint32_t>& inCs,
const std::optional<std::string>& pngOutput)
const std::set<uint32_t>& inCs)
{
const auto& [lib, face] = FontAtlasGeneratorBase::InitFreetype(fontData);
@@ -64,7 +61,6 @@ namespace OpenVulkano::Scene
FontAtlasType::BITMAP,
m_subpixelLayout.GetTextureDataFormat());
FillGlyphsInfo(allGlyphs, face, scaleFactor);
if (pngOutput) m_atlasData->Save(*pngOutput);
}
std::pair<std::vector<GlyphForPacking>, double>