oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Improve TTF support for pixel-style fonts (#11848)

Browse source
This commit is contained in:
Vincent Robinson 2021-12-30 12:54:21 -08:00 • committed by GitHub
parent 14c7fae378
commit 4a16ab3585
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/client/fontengine.cpp
View file

@ -66,11 +66,13 @@ FontEngine::FontEngine(gui::IGUIEnvironment* env) :
g_settings->registerChangedCallback("font_path_bolditalic", font_setting_changed, NULL);
g_settings->registerChangedCallback("font_shadow", font_setting_changed, NULL);
g_settings->registerChangedCallback("font_shadow_alpha", font_setting_changed, NULL);
g_settings->registerChangedCallback("font_size_divisible_by", font_setting_changed, NULL);
g_settings->registerChangedCallback("fallback_font_path", font_setting_changed, NULL);
}
g_settings->registerChangedCallback("mono_font_path", font_setting_changed, NULL);
g_settings->registerChangedCallback("mono_font_size", font_setting_changed, NULL);
g_settings->registerChangedCallback("mono_font_size_divisible_by", font_setting_changed, NULL);
g_settings->registerChangedCallback("screen_dpi", font_setting_changed, NULL);
g_settings->registerChangedCallback("gui_scaling", font_setting_changed, NULL);
}
@ -252,15 +254,18 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
if (spec.italic)
setting_suffix.append("_italic");
u32 size = std::floor(RenderingEngine::getDisplayDensity() *
g_settings->getFloat("gui_scaling") * spec.size);
u32 size = std::max<u32>(spec.size * RenderingEngine::getDisplayDensity() *
g_settings->getFloat("gui_scaling"), 1);
if (size == 0) {
errorstream << "FontEngine: attempt to use font size 0" << std::endl;
errorstream << " display density: " << RenderingEngine::getDisplayDensity() << std::endl;
abort();
// Constrain the font size to a certain multiple, if necessary
u16 divisible_by = g_settings->getU16(setting_prefix + "font_size_divisible_by");
if (divisible_by > 1) {
size = std::max<u32>(
std::round((double)size / divisible_by) * divisible_by, divisible_by);
}
sanity_check(size != 0);
u16 font_shadow = 0;
u16 font_shadow_alpha = 0;
g_settings->getU16NoEx(setting_prefix + "font_shadow", font_shadow);