Merge globebrowsing, resolve conflicts

Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
This commit is contained in:
Erik Broberg
2016-09-07 17:37:27 -04:00
28 changed files with 693 additions and 492 deletions

View File

@@ -432,6 +432,9 @@ bool OpenSpaceEngine::initialize() {
_settingsEngine->initialize();
_settingsEngine->setModules(_moduleEngine->modules());
// Load a light and a monospaced font
loadFonts();
// Initialize the Scene
Scene* sceneGraph = new Scene;
sceneGraph->initialize();
@@ -453,8 +456,6 @@ bool OpenSpaceEngine::initialize() {
// Run start up scripts
runPreInitializationScripts(scenePath);
// Load a light and a monospaced font
loadFonts();
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
LINFO("Initializing GUI");