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

Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack

Browse Source
This commit is contained in:
Alexander Bock
2015-07-06 15:55:42 +02:00
parent 21225b1cb5
commit 678362eee2
5 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/openspaceengine.cpp
View File

@@ -37,6 +37,7 @@
#include <openspace/interaction/luaconsole.h>
#include <openspace/interaction/mousecontroller.h>
#include <openspace/network/networkengine.h>
#include <openspace/properties/propertyowner.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scripting/scriptengine.h>
#include <openspace/scene/scene.h>
@@ -110,11 +111,14 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName)
, _console(new LuaConsole)
, _moduleEngine(new ModuleEngine)
, _gui(new gui::GUI)
, _parallelConnection(new network::ParallelConnection)
, _globalPropertyNamespace(new properties::PropertyOwner)
, _isMaster(false)
, _runTime(0.0)
, _syncBuffer(nullptr)
, _parallelConnection(new network::ParallelConnection)
{
_globalPropertyNamespace->setName("Global");
_interactionHandler->setPropertyOwner(_globalPropertyNamespace);
FactoryManager::initialize();
SpiceManager::initialize();
Time::initialize();
@@ -818,5 +822,10 @@ network::ParallelConnection* OpenSpaceEngine::parallelConnection() {
ghoul_assert(_parallelConnection != nullptr, "ParallelConnection is nullptr");
return _parallelConnection;
}
properties::PropertyOwner* OpenSpaceEngine::globalPropertyOwner() {
ghoul_assert(_globalPropertyNamespace, "Global Property Namespace");
return _globalPropertyNamespace;
}
} // namespace openspace