quartznet/raylib
Watch
3
0
Fork
You've already forked raylib
 0
Code Issues Pull requests Releases 25 Activity

Gave the option to choose between the Em Box font size metric and the ascent font size metric

Browse source
This commit is contained in:
ObedH 2026-07-03 10:47:29 -04:00
commit b52626074c
2 changed files with 1021 additions and 990 deletions
Download patch file Download diff file Expand all files Collapse all files

1983
src/raylib.h
View file

File diff suppressed because it is too large Load diff

26
src/rtext.c
View file

@ -130,6 +130,9 @@ static Font defaultFont = { 0 };
// Text vertical line spacing in pixels (between lines)
static int textLineSpacing = 2;
// The desired font scaling metric to use for calculating the font's ascent height
static FontSizeMetric fontSizeMetric = FONT_SIZE_METRIC_ASCENT;
//----------------------------------------------------------------------------------
// Other Modules Functions Declaration (required by text)
//----------------------------------------------------------------------------------
@ -639,8 +642,18 @@ GlyphInfo *LoadFontData(const unsigned char *fileData, int dataSize, int fontSiz
if (stbtt_InitFont(&fontInfo, (unsigned char *)fileData, 0)) // Initialize font for data reading
{
// Calculate font scale factor
float scaleFactor = stbtt_ScaleForPixelHeight(&fontInfo, (float)fontSize);
// Calculate font scale factor using desired font size metric
float scaleFactor = 0.0f;
if(fontSizeMetric == FONT_SIZE_METRIC_ASCENT) {
scaleFactor = stbtt_ScaleForPixelHeight(&fontInfo, (float)fontSize);
}
else if(fontSizeMetric == FONT_SIZE_METRIC_EM_BOX) {
scaleFactor = stbtt_ScaleForMappingEmToPixels(&fontInfo, (float)fontSize);
}
else {
TRACELOG(LOG_WARNING, "FONT: Invalid font size metric [%d], assuming FONT_METRIC_ASCENT", fontSizeMetric);
scaleFactor = stbtt_ScaleForPixelHeight(&fontInfo, (float)fontSize);
}
// Calculate font basic metrics
// NOTE: ascent is equivalent to font baseline
@ -2407,6 +2420,15 @@ const char *CodepointToUTF8(int codepoint, int *utf8Size)
return utf8;
}
// Allows the user to choose which font size metric they want (either FONT_SIZE_METRIC_ASCENT or FONT_SIZE_METRIC_EM_BOX)
void SetFontSizeMetric(FontSizeMetric metric) {
if(metric != FONT_SIZE_METRIC_ASCENT && metric != FONT_SIZE_METRIC_EM_BOX) {
TRACELOG(LOG_WARNING, "TEXT: Attempting to set font size metric to invalid enum [%d]");
return;
}
fontSizeMetric = metric;
}
// Get next codepoint in a UTF-8 encoded text, scanning until '\0' is found
// When an invalid UTF-8 byte is encountered, exit as soon as possible and a '?'(0x3f) codepoint is returned
// Total number of bytes processed are returned as a parameter