From 7269f7a3a567f2823b0cca1d0bc716a7a0389ecc Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 8 Aug 2023 22:16:09 +0300 Subject: viewer#2023 Google Inter --- indra/llrender/llfontregistry.cpp | 50 ++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 8 deletions(-) (limited to 'indra/llrender/llfontregistry.cpp') diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index c48a389f6a..777bba3f25 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -181,16 +181,16 @@ LLFontDescriptor LLFontDescriptor::normalize() const return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles()); } -void LLFontDescriptor::addFontFile(const std::string& file_name, const std::string& char_functor) +void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); } -void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, const std::string& char_functor) +void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontCollectionFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); } LLFontRegistry::LLFontRegistry(bool create_gl_textures) @@ -289,23 +289,57 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc) { std::string font_file_name = child->getTextContents(); std::string char_functor; + EFontHinting hinting = EFontHinting::FORCE_AUTOHINT; + S32 flags = 0; if (child->hasAttribute("functor")) { child->getAttributeString("functor", char_functor); } + if (child->hasAttribute("font_hinting")) + { + std::string attr_hinting; + child->getAttributeString("font_hinting", attr_hinting); + LLStringUtil::toLower(attr_hinting); + + if (attr_hinting == "default") + { + hinting = EFontHinting::DEFAULT; + } + else if (attr_hinting == "force_auto") + { + hinting = EFontHinting::FORCE_AUTOHINT; + } + else if (attr_hinting == "no_hinting") + { + hinting = EFontHinting::NO_HINTING; + } + } + + if (child->hasAttribute("flags")) + { + std::string attr_flags; + child->getAttributeString("flags", attr_flags); + LLStringUtil::toLower(attr_flags); + + if (attr_flags == "bold") + { + flags |= LLFontGL::BOLD; + } + } + if (child->hasAttribute("load_collection")) { bool col = false; child->getAttributeBOOL("load_collection", col); if (col) { - desc.addFontCollectionFile(font_file_name, char_functor); + desc.addFontCollectionFile(font_file_name, hinting, flags, char_functor); } } - desc.addFontFile(font_file_name, char_functor); + desc.addFontFile(font_file_name, hinting, flags, char_functor); } else if (child->hasName("os")) { @@ -462,7 +496,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) // Add ultimate fallback list - generated dynamically on linux, // null elsewhere. std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files), - [](const std::string& file_name) { return LLFontFileInfo(file_name); }); + [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0); }); // Load fonts based on names. if (font_files.empty()) @@ -518,7 +552,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) fontp = new LLFontGL; } if (fontp->loadFace(font_path, point_size_scale, - LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i)) + LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i, font_file_it->mHinting, font_file_it->mFlags)) { is_font_loaded = true; if (is_first_found) -- cgit v1.3 From 343190399399a3b1d5ce64739163163e32ab1a1f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 27 Jan 2026 00:02:44 +0200 Subject: Restore DejaVuSans as a fallback, but alter size --- indra/llrender/llfontregistry.cpp | 22 ++++++++++++++-------- indra/llrender/llfontregistry.h | 15 +++++++++++---- indra/newview/skins/default/xui/en/fonts.xml | 10 ++++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) (limited to 'indra/llrender/llfontregistry.cpp') diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 777bba3f25..370b08319f 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -181,16 +181,16 @@ LLFontDescriptor LLFontDescriptor::normalize() const return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles()); } -void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) +void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, size_delta, (mCharFunctors.end() != it) ? it->second : nullptr)); } -void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) +void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, size_delta, (mCharFunctors.end() != it) ? it->second : nullptr)); } LLFontRegistry::LLFontRegistry(bool create_gl_textures) @@ -329,17 +329,23 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc) } } + F32 size_delta = 0.f; + if (child->hasAttribute("size_delta")) + { + child->getAttributeF32("size_delta", size_delta); + } + if (child->hasAttribute("load_collection")) { bool col = false; child->getAttributeBOOL("load_collection", col); if (col) { - desc.addFontCollectionFile(font_file_name, hinting, flags, char_functor); + desc.addFontCollectionFile(font_file_name, hinting, flags, size_delta, char_functor); } } - desc.addFontFile(font_file_name, hinting, flags, char_functor); + desc.addFontFile(font_file_name, hinting, flags, size_delta, char_functor); } else if (child->hasName("os")) { @@ -496,7 +502,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) // Add ultimate fallback list - generated dynamically on linux, // null elsewhere. std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files), - [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0); }); + [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0, 0.f); }); // Load fonts based on names. if (font_files.empty()) @@ -551,7 +557,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) { fontp = new LLFontGL; } - if (fontp->loadFace(font_path, point_size_scale, + if (fontp->loadFace(font_path, point_size_scale + font_file_it->mSizeDelta, LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i, font_file_it->mHinting, font_file_it->mFlags)) { is_font_loaded = true; diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h index bf190d903c..a5fa9f338a 100644 --- a/indra/llrender/llfontregistry.h +++ b/indra/llrender/llfontregistry.h @@ -43,19 +43,21 @@ enum class EFontHinting : S32 struct LLFontFileInfo { - LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, const std::function& char_functor = nullptr) + LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::function& char_functor = nullptr) : FileName(file_name) , CharFunctor(char_functor) , mHinting(hinting) , mFlags(flags) + , mSizeDelta(size_delta) { } - LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags) + LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags, F32 size_delta) : FileName(ffi.FileName) , CharFunctor(ffi.CharFunctor) , mHinting(hinting) , mFlags(flags) + , mSizeDelta(size_delta) { } @@ -63,6 +65,11 @@ struct LLFontFileInfo std::function CharFunctor; EFontHinting mHinting; S32 mFlags; + + // Not all fonts are the same size, Ex: dejavu is bigger than inter, + // so in some cases we want to adjust relative sizes to make characters + // from different files match. + F32 mSizeDelta; }; typedef std::vector font_file_info_vec_t; @@ -84,10 +91,10 @@ public: const std::string& getSize() const { return mSize; } void setSize(const std::string& size) { mSize = size; } - void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null); + void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor = LLStringUtil::null); const font_file_info_vec_t & getFontFiles() const { return mFontFiles; } void setFontFiles(const font_file_info_vec_t& font_files) { mFontFiles = font_files; } - void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null); + void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor = LLStringUtil::null); const font_file_info_vec_t& getFontCollectionFiles() const { return mFontCollectionFiles; } void setFontCollectionFiles(const font_file_info_vec_t& font_collection_files) { mFontCollectionFiles = font_collection_files; } diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index de8e640455..e85ac6c08c 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -5,6 +5,7 @@ name="default" comment="default font files (global fallbacks)"> Inter_18pt-Regular.ttf + DejaVuSans.ttf TwemojiSVG.ttf meiryo.TTC @@ -37,6 +38,7 @@ name="SansSerifBold" comment="Name of bold sans-serif font"> Inter_18pt-SemiBold.ttf + DejaVuSans-Bold.ttf arialbd.ttf @@ -49,6 +51,7 @@ name="SansSerif" comment="Name of san-serif font (Truetype file name)"> Inter_18pt-Regular.ttf + DejaVuSans.ttf arial.ttf @@ -62,6 +65,7 @@ comment="Name of bold sans-serif font" font_style="BOLD"> Inter_18pt-SemiBold.ttf + DejaVuSans-Bold.ttf Inter_18pt-Italic.ttf + DejaVuSans-Oblique.ttf Inter_18pt-BoldItalic.ttf + DejaVuSans-BoldOblique.ttf Inter_18pt-Regular.ttf + DejaVuSans.ttf arial.ttf @@ -129,6 +136,7 @@ comment="Name of Helvetica font (bold)" font_style="BOLD"> Inter_18pt-SemiBold.ttf + DejaVuSans-Bold.ttf arialbd.ttf @@ -142,6 +150,7 @@ comment="Name of Helvetica font (italic)" font_style="ITALIC"> Inter_18pt-Italic.ttf + DejaVuSans-Oblique.ttf ariali.ttf @@ -155,6 +164,7 @@ comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> Inter_18pt-BoldItalic.ttf + DejaVuSans-BoldOblique.ttf arialbi.ttf -- cgit v1.3