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

apply formatting to file

Browse Source
This commit is contained in:
ohyzha
2025-01-22 17:06:42 +02:00
parent f50bbc798e
commit 8ebf3aa7d2
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
openVulkanoCpp/Scene/SdfFontAtlasGenerator.cpp
View File

@@ -111,7 +111,7 @@ namespace OpenVulkano::Scene
template<int Channels> template<int Channels>
void SdfFontAtlasGeneratorGeneric<Channels>::Generate(msdfgen::FreetypeHandle* ft, msdfgen::FontHandle* font, void SdfFontAtlasGeneratorGeneric<Channels>::Generate(msdfgen::FreetypeHandle* ft, msdfgen::FontHandle* font,
const msdf_atlas::Charset& chset, const msdf_atlas::Charset& chset,
const std::optional<std::string>& pngOutput) const std::optional<std::string>& pngOutput)
{ {
std::vector<msdf_atlas::GlyphGeometry> glyphsGeometry; std::vector<msdf_atlas::GlyphGeometry> glyphsGeometry;
// FontGeometry is a helper class that loads a set of glyphs from a single font. // FontGeometry is a helper class that loads a set of glyphs from a single font.
@@ -122,7 +122,9 @@ namespace OpenVulkano::Scene
{ {
const double maxCornerAngle = 3.0; const double maxCornerAngle = 3.0;
for (msdf_atlas::GlyphGeometry& glyph : glyphsGeometry) for (msdf_atlas::GlyphGeometry& glyph : glyphsGeometry)
{
glyph.edgeColoring(&msdfgen::edgeColoringByDistance, maxCornerAngle, 0); glyph.edgeColoring(&msdfgen::edgeColoringByDistance, maxCornerAngle, 0);
}
} }
msdf_atlas::TightAtlasPacker packer; msdf_atlas::TightAtlasPacker packer;
@@ -147,8 +149,10 @@ namespace OpenVulkano::Scene
generator.generate(glyphsGeometry.data(), glyphsGeometry.size()); generator.generate(glyphsGeometry.data(), glyphsGeometry.size());
int idx = 0; int idx = 0;
m_atlasData = std::make_shared<FontAtlas>(Math::Vector2ui{ width, height }, fontGeometry.getMetrics().lineHeight, m_atlasData =
channelsCount == 1 ? FontAtlasType::SDF : FontAtlasType::MSDF, m_channelsCount == 1 ? DataFormat::R8_UNORM : DataFormat::R8G8B8A8_UNORM); std::make_shared<FontAtlas>(Math::Vector2ui { width, height }, fontGeometry.getMetrics().lineHeight,
channelsCount == 1 ? FontAtlasType::SDF : FontAtlasType::MSDF,
m_channelsCount == 1 ? DataFormat::R8_UNORM : DataFormat::R8G8B8A8_UNORM);
if constexpr (Channels == 3) if constexpr (Channels == 3)
{ {
@@ -164,7 +168,7 @@ namespace OpenVulkano::Scene
} }
} }
else else
{ {
const msdfgen::BitmapConstRef<msdfgen::byte, 1>& storage = generator.atlasStorage(); const msdfgen::BitmapConstRef<msdfgen::byte, 1>& storage = generator.atlasStorage();
memcpy(m_atlasData->GetTexture()->textureBuffer, storage.pixels, width * height); memcpy(m_atlasData->GetTexture()->textureBuffer, storage.pixels, width * height);
} }
@@ -174,7 +178,7 @@ namespace OpenVulkano::Scene
double l = 0, r = 0, t = 0, b = 0; double l = 0, r = 0, t = 0, b = 0;
}; };
for (const auto& glyph: glyphsGeometry) for (const auto& glyph : glyphsGeometry)
{ {
GlyphInfo& info = m_atlasData->GetGlyphs()[glyph.getCodepoint()]; GlyphInfo& info = m_atlasData->GetGlyphs()[glyph.getCodepoint()];
const msdf_atlas::GlyphBox& glyphBox = generator.getLayout()[idx++]; const msdf_atlas::GlyphBox& glyphBox = generator.getLayout()[idx++];
@@ -187,6 +191,8 @@ namespace OpenVulkano::Scene
double bearingY = glyphBox.bounds.t; double bearingY = glyphBox.bounds.t;
double w = glyphBaselineBbox.r - glyphBaselineBbox.l; double w = glyphBaselineBbox.r - glyphBaselineBbox.l;
double h = glyphBaselineBbox.t - glyphBaselineBbox.b; double h = glyphBaselineBbox.t - glyphBaselineBbox.b;
// UV mapping
double l = glyphAtlasBbox.l; double l = glyphAtlasBbox.l;
double r = glyphAtlasBbox.r; double r = glyphAtlasBbox.r;
double t = glyphAtlasBbox.t; double t = glyphAtlasBbox.t;
@@ -200,7 +206,10 @@ namespace OpenVulkano::Scene
SetGlyphData(info, { bearingX, bearingY }, { w, h }, glyphAtlasAABB, glyphBox.advance); SetGlyphData(info, { bearingX, bearingY }, { w, h }, glyphAtlasAABB, glyphBox.advance);
} }
if (pngOutput && !pngOutput->empty()) { m_atlasData->Save(*pngOutput); } if (pngOutput && !pngOutput->empty())
{
m_atlasData->Save(*pngOutput);
}
destroyFont(font); destroyFont(font);
deinitializeFreetype(ft); deinitializeFreetype(ft);
} }
@@ -208,4 +217,4 @@ namespace OpenVulkano::Scene
template class SdfFontAtlasGeneratorGeneric<1>; template class SdfFontAtlasGeneratorGeneric<1>;
template class SdfFontAtlasGeneratorGeneric<3>; template class SdfFontAtlasGeneratorGeneric<3>;
} }
#endif #endif