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

V2 llrender merge, sans freetype and LLTexture

Browse Source
This commit is contained in:
Shyotl
2011-02-24 18:08:17 -06:00
parent d7b1d22063
commit 58edba5129
20 changed files with 717 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llrender/llfontregistry.h
View File

@@ -71,7 +71,10 @@ private:
class LLFontRegistry
{
public:
LLFontRegistry(const string_vec_t& xui_paths);
// create_gl_textures - set to false for test apps with no OpenGL window,
// such as llui_libtest
LLFontRegistry(const string_vec_t& xui_paths,
bool create_gl_textures);
~LLFontRegistry();
// Load standard font info from XML file(s).
@@ -95,7 +98,7 @@ public:
void dump();
const string_vec_t& getUltimateFallbackList() const { return mUltimateFallbackList; }
const string_vec_t& getUltimateFallbackList() const;
private:
LLFontGL *createFont(const LLFontDescriptor& desc);
@@ -109,6 +112,7 @@ private:
string_vec_t mUltimateFallbackList;
string_vec_t mXUIPaths;
bool mCreateGLTextures;
};
#endif // LL_LLFONTREGISTRY_H