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

Merge branch 'develop' into feature/remote

Browse Source
This commit is contained in:
Joakim Kilby
2015-06-12 10:47:41 +02:00
parent 1bcf11412e 3fee6e8baf
commit 61934f824b
35 changed files with 1246 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/openspaceengine.cpp
View File

@@ -157,7 +157,6 @@ bool OpenSpaceEngine::create(
LogMgr.addLog(new ConsoleLog);
LDEBUG("Initialize FileSystem");
ghoul::filesystem::FileSystem::initialize();
#ifdef __APPLE__
ghoul::filesystem::File app(argv[0]);
@@ -359,8 +358,11 @@ bool OpenSpaceEngine::initialize() {
// Load a light and a monospaced font
loadFonts();
LINFO("Initializing GUI");
_gui->initialize();
LINFO("Finished initializing");
return true;
}
@@ -487,7 +489,6 @@ void OpenSpaceEngine::runSettingsScripts() {
runScripts(scripts);
}
void OpenSpaceEngine::loadFonts() {
sgct_text::FontManager::FontPath local = sgct_text::FontManager::FontPath::FontPath_Local;
@@ -569,8 +570,11 @@ gui::GUI* OpenSpaceEngine::gui() {
}
bool OpenSpaceEngine::initializeGL() {
LINFO("Initializing Rendering Engine");
bool success = _renderEngine->initializeGL();
LINFO("Initializing OnScreen GUI GL");
_gui->initializeGL();
LINFO("Finished initializing OpenGL");
return success;
}