Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First shot at fixing font fallback

Browse Source
This commit is contained in:
Siana Gearz
2012-03-05 18:18:37 +01:00
parent 0a11f09918
commit b67fa864ff
4 changed files with 11 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llfont.cpp
View File

@@ -192,6 +192,8 @@ BOOL LLFont::loadFace(const std::string& filename, const F32 point_size, const F
FT_Done_Face(mFTFace);
mFTFace = NULL;
}
llinfos << "Loading font file: " << filename << llendl;
int error;

9
indra/llrender/llfontregistry.cpp
View File

@@ -384,9 +384,13 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
// This may not be the best solution, but it at least prevents a crash.
if (it != mFontMap.end() && it->second != NULL)
{
llinfos << "-- matching font exists: " << nearest_exact_desc.getName() << " size " << nearest_exact_desc.getSize() << " style " << ((S32) nearest_exact_desc.getStyle()) << llendl;
if (it->second != NULL) {
llinfos << "-- matching font exists: " << nearest_exact_desc.getName() << " size " << nearest_exact_desc.getSize() << " style " << ((S32) nearest_exact_desc.getStyle()) << llendl;
return it->second;
return it->second;
} else {
llwarns << "Failed to find font" << llendl;
}
//Haven't plugged free-type in yet.
// copying underlying Freetype font, and storing in LLFontGL with requested font descriptor
/*LLFontGL *font = new LLFontGL;
@@ -408,6 +412,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
file_names.insert(file_names.end(),
match_default_desc->getFileNames().begin(),
match_default_desc->getFileNames().end());
llinfos << "Found matching fallback fonts: " << match_default_desc->getFileNames().size() << llendl;
}
// Add ultimate fallback list - generated dynamically on linux,