mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Initial work on integrating fontrendering into ghoul

Browse Source
This commit is contained in:
Alexander Bock
2015-11-02 21:40:45 -05:00
parent dfd177a9ae
commit bbb622f555
6 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/engine/openspaceengine.cpp
View File

@@ -57,6 +57,7 @@
#include <ghoul/lua/ghoul_lua.h>
#include <ghoul/lua/lua_helper.h>
#include <ghoul/systemcapabilities/systemcapabilities.h>
#include <ghoul/font/fontrenderer.h>
// std
#include <iostream>
@@ -405,6 +406,7 @@ bool OpenSpaceEngine::initialize() {
// Load a light and a monospaced font
loadFonts();
loadFonts2();
LINFO("Initializing GUI");
_gui->initialize();
@@ -577,6 +579,36 @@ void OpenSpaceEngine::loadFonts() {
}
}
void OpenSpaceEngine::loadFonts2() {
ghoul::Dictionary fonts;
configurationManager()->getValue(ConfigurationManager::KeyFonts, fonts);
_fontManager = new ghoul::fontrendering::FontManager;
for (const std::string& key : fonts.keys()) {
std::string font;
fonts.getValue(key, font);
font = absPath(font);
if(!FileSys.fileExists(font)) {
LERROR("Could not find font '" << font << "'");
continue;
}
LINFO("Registering font '" << font << "' with key '" << key << "'");
bool success = _fontManager->registerFont(key, font);
if (!success)
LERROR("Error registering font '" << font << "' with key '" << key << "'");
}
bool initSuccess = ghoul::fontrendering::FontRenderer::initialize();
if (!initSuccess)
LERROR("Error initializing default font renderer");
ghoul::fontrendering::FontRenderer::defaultRenderer()->setWindowSize(glm::vec2(_windowWrapper->currentWindowSize()));
}
void OpenSpaceEngine::configureLogging() {
if (configurationManager()->hasKeyAndValue<std::string>(ConfigurationManager::KeyLogLevel)) {
std::string logLevel;
@@ -837,5 +869,10 @@ WindowWrapper& OpenSpaceEngine::windowWrapper() {
ghoul_assert(_windowWrapper, "Window Wrapper");
return *_windowWrapper;
}
ghoul::fontrendering::FontManager& OpenSpaceEngine::fontManager() {
ghoul_assert(_fontManager, "Font Manager");
return *_fontManager;
}
} // namespace openspace