mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-14 15:40:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/downloadmanager

Browse Source 
Conflicts:
	src/engine/openspaceengine.cpp
This commit is contained in:
Alexander Bock
2015-06-10 19:04:27 +02:00
parent bf58c8ab75 3fee6e8baf
commit 8d2d9a65b7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/engine/openspaceengine.cpp
View File

@@ -360,11 +360,11 @@ bool OpenSpaceEngine::initialize() {
// Load a light and a monospaced font
loadFonts();
//ghoul::filesystem::File f("d:/foo.txt");
//DownloadEngine::downloadFile("http://curl.haxx.se/libcurl/c/example.html", f);
LINFO("Initializing GUI");
_gui->initialize();
LINFO("Finished initializing");
return true;
}
@@ -572,8 +572,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;
}