mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 21:48:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/fontrendering' of openspace.itn.liu.se:/openspace into feature/fontrendering

Browse Source
This commit is contained in:
Alexander Bock
2015-11-23 22:29:30 -05:00
parent fbc501450a 4f7ab5321f
commit 8f031e37ae
6 changed files with 265 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/openspaceengine.cpp
View File

@@ -583,7 +583,9 @@ void OpenSpaceEngine::loadFonts2() {
ghoul::Dictionary fonts;
configurationManager()->getValue(ConfigurationManager::KeyFonts, fonts);
_fontManager = new ghoul::fontrendering::FontManager;
const glm::ivec3 fontAtlasSize{1024, 1024, 1};
_fontManager = new ghoul::fontrendering::FontManager(fontAtlasSize);
for (const std::string& key : fonts.keys()) {
std::string font;
fonts.getValue(key, font);