Skip to content

Fix some TGLP values to match actual use #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix some TGLP values to match actual use #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f49481
Default width is *not* the width of the default character
piepie62 Sep 29, 2025
002d081
Update height and width by glyph
piepie62 Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions source/bcfnt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,6 @@ void BCFNT::addFont (std::shared_ptr<freetype::Face> face_,
int descent = std::numeric_limits<int>::max ();

lineFeed = std::max (lineFeed, static_cast<std::uint8_t> (face->size->metrics.height >> 6));
height =
std::max (height, static_cast<std::uint8_t> ((face->bbox.yMax - face->bbox.yMin) >> 6));
width = std::max (width, static_cast<std::uint8_t> ((face->bbox.xMax - face->bbox.xMin) >> 6));
maxWidth =
std::max (maxWidth, static_cast<std::uint8_t> (face->size->metrics.max_advance >> 6));
ascent = std::max (ascent, static_cast<std::uint8_t> (face->size->metrics.ascender >> 6));
descent = std::min (descent, static_cast<int> (face->size->metrics.descender) >> 6);

std::vector<std::shared_future<void>> futures;
std::mutex mutex;
Expand Down Expand Up @@ -385,6 +378,8 @@ void BCFNT::addFont (std::shared_ptr<freetype::Face> face_,
descent =
std::min<int> (descent, face->glyph->bitmap_top - face->glyph->bitmap.rows);
maxWidth = std::max<std::uint8_t> (maxWidth, face->glyph->bitmap.width);
height = std::max<std::uint8_t> (height, face->glyph->metrics.height >> 6);
width = std::max<std::uint8_t> (width, face->glyph->metrics.width >> 6);

glyphs.emplace (code, glyph);
};
Expand Down Expand Up @@ -661,9 +656,9 @@ bool BCFNT::serialize (const std::string &path)
<< static_cast<std::uint8_t> (0x1) // font type
<< static_cast<std::uint8_t> (lineFeed) // line feed
<< static_cast<std::uint16_t> (altIndex) // alternate char index
<< static_cast<std::uint8_t> (defaultWidth.left) // default width (left)
<< static_cast<std::uint8_t> (defaultWidth.glyphWidth) // default width (glyph width)
<< static_cast<std::uint8_t> (defaultWidth.charWidth) // default width (char width)
<< static_cast<std::uint8_t> (0) // default width (left)
<< static_cast<std::uint8_t> (cellWidth) // default width (glyph width)
<< static_cast<std::uint8_t> (cellWidth) // default width (char width)
<< static_cast<std::uint8_t> (0x1) // encoding
<< static_cast<std::uint32_t> (tglpOffset + 8) // TGLP offset
<< static_cast<std::uint32_t> (cwdhOffset + 8) // CWDH offset
Expand Down