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

text with smallest possible spacing between glyphs

Browse Source
This commit is contained in:
ohyzha
2025-01-22 17:08:14 +02:00
parent 8ebf3aa7d2
commit a73df1b4f3
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/ExampleApps/TextExampleApp.cpp
View File

@@ -34,7 +34,7 @@ namespace OpenVulkano
namespace fs = std::filesystem; namespace fs = std::filesystem;
constexpr int CREATE_BITMAP_ATLAS = 0; constexpr int CREATE_BITMAP_ATLAS = 0;
constexpr int CREATE_NEW_ATLAS = 0; //#define CREATE_NEW_ATLAS
class TextExampleAppImpl final : public TextExampleApp class TextExampleAppImpl final : public TextExampleApp
{ {
@@ -53,6 +53,8 @@ namespace OpenVulkano
texts.push_back(std::make_pair("Hello, World!", TextConfig())); texts.push_back(std::make_pair("Hello, World!", TextConfig()));
texts.push_back(std::make_pair("\u0410\u0411\u0412\u041F", TextConfig())); texts.push_back(std::make_pair("\u0410\u0411\u0412\u041F", TextConfig()));
texts.push_back(std::make_pair("Unsupported glyphs \u1E30\u1E31 are coming", TextConfig())); texts.push_back(std::make_pair("Unsupported glyphs \u1E30\u1E31 are coming", TextConfig()));
texts.push_back(std::make_pair("AAAA, ____", TextConfig()));
texts.push_back(std::make_pair("0123456789", TextConfig()));
texts.push_back(std::make_pair("This is first line\nSecond gg line\nThird G line", TextConfig())); texts.push_back(std::make_pair("This is first line\nSecond gg line\nThird G line", TextConfig()));
texts[1].second.backgroundColor.a = 255; texts[1].second.backgroundColor.a = 255;
@@ -72,12 +74,12 @@ namespace OpenVulkano
generator.GetAtlas()->Save("bitmap_atlas_packed.png"); generator.GetAtlas()->Save("bitmap_atlas_packed.png");
} }
#if defined(MSDFGEN_AVAILABLE) && CREATE_NEW_ATLAS #if defined(MSDFGEN_AVAILABLE) && defined(CREATE_NEW_ATLAS)
std::set<uint32_t> s = SdfFontAtlasGenerator::LoadAllGlyphs(fontPath); std::set<uint32_t> s = SdfFontAtlasGenerator::LoadAllGlyphs(fontPath);
m_atlasGenerator.GenerateAtlas(fontPath, s); m_atlasGenerator.GenerateAtlas(fontPath, s);
m_msdfAtlasGenerator.GenerateAtlas(fontPath, s); m_msdfAtlasGenerator.GenerateAtlas(fontPath, s);
m_atlasGenerator.GetAtlas()->Save("sdf_atlas_packed.png"); m_atlasGenerator.GetAtlas()->Save("sdf_atlas_packed.png");
m_msdfAtlasGenerator.GetAtlas()->Save("msdf_atlas_packed.png"); m_msdfAtlasGenerator.GetAtlas()->Save("msdf_atlas_packed.png");
#else #else
auto sdfMetadataInfo = resourceLoader.GetResource("sdf_atlas_packed.png"); auto sdfMetadataInfo = resourceLoader.GetResource("sdf_atlas_packed.png");
auto msdfMetadataInfo = resourceLoader.GetResource("msdf_atlas_packed.png"); auto msdfMetadataInfo = resourceLoader.GetResource("msdf_atlas_packed.png");
@@ -90,16 +92,14 @@ namespace OpenVulkano
for (int j = 0; j < texts.size(); j++) for (int j = 0; j < texts.size(); j++)
{ {
TextDrawable* t = nullptr; TextDrawable* t = nullptr;
#if defined(MSDFGEN_AVAILABLE) && CREATE_NEW_ATLAS #if defined(MSDFGEN_AVAILABLE) && defined(CREATE_NEW_ATLAS)
if (i < texts.size()) if (i < texts.size())
{ {
t = new TextDrawable(m_atlasGenerator.GetAtlasData(), texts[j].second); t = new TextDrawable(m_atlasGenerator.GetAtlas(), texts[j].second);
t->SetShader(&TextDrawable::GetSdfDefaultShader());
} }
else else
{ {
t = new TextDrawable(m_msdfAtlasGenerator.GetAtlasData(), texts[j].second); t = new TextDrawable(m_msdfAtlasGenerator.GetAtlas(), texts[j].second);
t->SetShader(&TextDrawable::GetMsdfDefaultShader());
} }
#else #else
if (i == 0) if (i == 0)

19
openVulkanoCpp/Scene/TextDrawable.cpp
View File

@@ -96,12 +96,14 @@ namespace OpenVulkano::Scene
const double lineHeight = m_atlasData->GetLineHeight(); const double lineHeight = m_atlasData->GetLineHeight();
double posY = pos.y; double posY = pos.y;
Math::Vector2f bmin(pos), bmax(pos); Math::Vector2f bmin(pos), bmax(pos);
float prevGlyphXBound = -INFINITY;
for (auto begin = text.begin(), end = text.end(); begin != end;) for (auto begin = text.begin(), end = text.end(); begin != end;)
{ {
uint32_t c = utf8::next(begin, end); uint32_t c = utf8::next(begin, end);
if (c == '\n') if (c == '\n')
{ {
posY -= lineHeight; posY -= lineHeight;
prevGlyphXBound = -INFINITY;
cursorX = pos.x; cursorX = pos.x;
continue; continue;
} }
@@ -115,19 +117,26 @@ namespace OpenVulkano::Scene
const GlyphInfo& info = symbols.at(c); const GlyphInfo& info = symbols.at(c);
float offset = 0;
const bool isZeroLenGlyph = info.pos[1].x == 0;
const bool isBitmap = m_atlasData->GetAtlasType().IsBitmap();
if (prevGlyphXBound != -INFINITY && !isZeroLenGlyph && !isBitmap)
{
offset = prevGlyphXBound - (info.pos[0].x + cursorX);
}
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
vertices->position[i].x = info.pos[i].x + cursorX; vertices->position[i].x = info.pos[i].x + cursorX + offset;
vertices->uv[i] = info.uv[i]; vertices->uv[i] = info.uv[i];
if (i < 2) vertices->position[i].y = posY - info.pos[i].y; if (i < 2) vertices->position[i].y = posY - info.pos[i].y;
else vertices->position[i].y = posY + info.pos[i].y; else vertices->position[i].y = posY + info.pos[i].y;
vertices->color = m_cfg.textColor; vertices->color = m_cfg.textColor;
vertices->background = m_cfg.backgroundColor; vertices->background = m_cfg.backgroundColor;
} }
// slight offset for bitmap atlas since it's tightly packed without any extra padding, while sdf has additional padding
// TODO: change to lower value(or ideally remove completely) to avoid overlapping and make less space between symbols cursorX += info.advance + (isBitmap ? 0.05 : 0);
// when setting for depth comparison operator will be available( <= ) prevGlyphXBound = isZeroLenGlyph ? cursorX : vertices->position[2].x;
cursorX += info.advance + 0.08;
if (!m_symbolCount) bmin.x = vertices->position[0].x; if (!m_symbolCount) bmin.x = vertices->position[0].x;
bmax.x = std::max(bmax.x, vertices->position[1].x); bmax.x = std::max(bmax.x, vertices->position[1].x);