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

Rework some text related functions

Browse Source
This commit is contained in:
Georg Hagen
2025-03-01 20:00:27 +01:00
parent bfff861673
commit 0a027b8bb7
8 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,16 +14,16 @@ namespace OpenVulkano::Scene
void BitmapFontAtlasGenerator::GenerateAtlas(const std::string& fontFile, const std::set<uint32_t>& charset,
const std::optional<std::string>& pngOutput)
{
Generate(fontFile, charset, pngOutput);
GenerateAtlas(Utils::ReadFile(fontFile), charset, pngOutput);
}
void BitmapFontAtlasGenerator::GenerateAtlas(const Array<char>& fontData, const std::set<uint32_t>& charset,
const std::optional<std::string>& pngOutput)
{
Generate(fontData, charset, pngOutput);
Generate({ reinterpret_cast<const uint8_t*>(fontData.Data()), fontData.Size() }, charset, pngOutput);
}
void BitmapFontAtlasGenerator::Generate(const std::variant<std::string, Array<char>>& source,
void BitmapFontAtlasGenerator::Generate(const std::span<const uint8_t>& fontData,
const std::set<uint32_t>& chset,
const std::optional<std::string>& pngOutput)
{
@@ -33,7 +33,7 @@ namespace OpenVulkano::Scene
return;
}
const auto& [lib, face] = FontAtlasGeneratorBase::InitFreetype(source);
const auto& [lib, face] = FontAtlasGeneratorBase::InitFreetype(fontData);
FT_Set_Pixel_Sizes(face.get(), 0, m_pixelSizeConfig.CalculatePixelSize());
if (m_subpixelLayout != SubpixelLayout::UNKNOWN)
{