blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 781 Projects 19 Wiki Activity

UI: Improved Initial Vfont Sizes #109228

Closed
Harley Acheson wants to merge 1 commits from Harley/blender:vfontsize into main
pull from: Harley/blender:vfontsize
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 3 +18 -33
3 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_vfontdata.h
View File

@ -24,7 +24,6 @@ typedef struct VFontData {
char name[128];
float scale;
/* Calculated from the font. */
float em_height;
float ascender;
} VFontData;

16
source/blender/blenkernel/intern/vfont.cc
View File

@ -768,21 +768,15 @@ enum {
* Em height: Space most glyphs should fit within.
* Ascent: the recommended distance above the baseline to fit most characters.
* Descent: the recommended distance below the baseline to fit most characters.
*
* We obtain ascent and descent from the font itself (FT_Face->ascender / face->height).
* And in some cases it is even the same value as FT_Face->bbox.yMax/yMin
* (font top and bottom respectively).
*
* The em_height here is relative to FT_Face->bbox.
*/
static float vfont_ascent(const VFontData *vfd)
{
return vfd->ascender * vfd->em_height;
return vfd->ascender;
}
static float vfont_descent(const VFontData *vfd)
{
return vfd->em_height - vfont_ascent(vfd);
return 1.0f - vfont_ascent(vfd);
}
/**
@ -1321,8 +1315,8 @@ static bool vfont_to_curve(Object *ob,
yoff = textbox_y_origin - vfont_ascent(vfd);
break;
case CU_ALIGN_Y_CENTER:
yoff = ((((vfd->em_height + (lines - 1) * linedist) * 0.5f) - vfont_ascent(vfd)) -
(tb_scale.h * 0.5f) + textbox_y_origin);
yoff = (((lines * linedist * 0.5f) - vfont_ascent(vfd)) - (tb_scale.h * 0.5f) +
textbox_y_origin);
break;
case CU_ALIGN_Y_BOTTOM_BASELINE:
yoff = textbox_y_origin + ((lines - 1) * linedist) - tb_scale.h;
@ -1352,7 +1346,7 @@ static bool vfont_to_curve(Object *ob,
yoff = -vfont_ascent(vfd);
break;
case CU_ALIGN_Y_CENTER:
yoff = ((vfd->em_height + (lnr - 1) * linedist) * 0.5f) - vfont_ascent(vfd);
yoff = (lnr * linedist * 0.5f) - vfont_ascent(vfd);
break;
case CU_ALIGN_Y_BOTTOM_BASELINE:
yoff = (lnr - 1) * linedist;

34
source/blender/blenkernel/intern/vfontdata_freetype.cc
View File

@ -14,6 +14,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_TRUETYPE_TABLES_H
/* not needed yet */
// #include FT_GLYPH_H
// #include FT_BBOX_H
@ -283,32 +284,23 @@ VFontData *BKE_vfontdata_from_freetypefont(PackedFile *pf)
BLI_str_utf8_invalid_strip(vfd->name, strlen(vfd->name));
}
/* Blender default BFont is not "complete". */
const bool complete_font = (face->ascender != 0) && (face->descender != 0) &&
(face->ascender != face->descender);
int cap_height = int(float(face->units_per_EM) * 0.7f);
if (complete_font) {
/* We can get descender as well, but we simple store descender in relation to the ascender.
* Also note that descender is stored as a negative number. */
vfd->ascender = float(face->ascender) / (face->ascender - face->descender);
TT_OS2 *os2_table = static_cast<TT_OS2 *>(FT_Get_Sfnt_Table(face, FT_SFNT_OS2));
if (os2_table && os2_table->version > 1) {
cap_height = os2_table->sCapHeight;
}
else {
vfd->ascender = 0.8f;
vfd->em_height = 1.0f;
}
/* Adjust font size */
if (face->bbox.yMax != face->bbox.yMin) {
vfd->scale = float(1.0 / double(face->bbox.yMax - face->bbox.yMin));
if (complete_font) {
vfd->em_height = float(face->ascender - face->descender) /
(face->bbox.yMax - face->bbox.yMin);
FT_UInt gi = FT_Get_Char_Index(face, (FT_ULong)'H');
if (gi && FT_Load_Glyph(face, gi, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP) == FT_Err_Ok) {
cap_height = face->glyph->metrics.height;
}
}
else {
vfd->scale = 1.0f / 1000.0f;
}
vfd->ascender = float(cap_height) / float(face->units_per_EM);
/* Scale down to better match old height calculation and to work with 1em line height. */
vfd->scale = 0.68f / float(cap_height);
/* Load the first 256 glyphs. */