mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-14 07:49:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/ips

Browse Source
This commit is contained in:
Alexander Bock
2016-06-16 13:51:34 +02:00
parent 1c75e1da3a 6f05594440
commit 3fe802ae1f
13 changed files with 123 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/openspaceengine.cpp
View File

@@ -30,6 +30,7 @@
#include <openspace/engine/downloadmanager.h>
#include <openspace/engine/logfactory.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/engine/settingsengine.h>
#include <openspace/engine/wrapper/windowwrapper.h>
#include <openspace/interaction/interactionhandler.h>
#include <openspace/interaction/keyboardcontroller.h>
@@ -109,6 +110,10 @@ namespace {
namespace openspace {
namespace properties {
class Property;
}
OpenSpaceEngine* OpenSpaceEngine::_engine = nullptr;
OpenSpaceEngine::OpenSpaceEngine(std::string programName,
@@ -123,6 +128,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
))
, _console(new LuaConsole)
, _moduleEngine(new ModuleEngine)
, _settingsEngine(new SettingsEngine)
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
, _gui(new gui::GUI)
#endif
@@ -135,6 +141,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
{
_interactionHandler->setPropertyOwner(_globalPropertyNamespace.get());
_globalPropertyNamespace->addPropertySubOwner(_interactionHandler.get());
_globalPropertyNamespace->addPropertySubOwner(_settingsEngine.get());
FactoryManager::initialize();
FactoryManager::ref().addFactory(
std::make_unique<ghoul::TemplateFactory<Renderable>>()
@@ -165,6 +172,7 @@ OpenSpaceEngine::~OpenSpaceEngine() {
_commandlineParser = nullptr;
_console = nullptr;
_moduleEngine = nullptr;
_settingsEngine = nullptr;
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
_gui = nullptr;
#endif
@@ -429,6 +437,8 @@ bool OpenSpaceEngine::initialize() {
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
LINFO("Initializing GUI");
_gui->initialize();
for (properties::Property* p : _settingsEngine->propertiesRecursive())
_gui->_globalProperty.registerProperty(p);
#endif
#ifdef OPENSPACE_MODULE_ISWA_ENABLED