mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/interactionhandler' into develop

Browse Source 
Conflicts:
	include/openspace/engine/openspaceengine.h
	include/openspace/interaction/interactionhandler.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
This commit is contained in:
Alexander Bock
2014-11-18 15:46:26 +01:00
parent 4069680662 86efb3573b
commit 6b40cb18fb
18 changed files with 2081 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/engine/openspaceengine.h
View File

@@ -52,7 +52,7 @@ public:
static bool findConfiguration(std::string& filename);
ConfigurationManager& configurationManager();
InteractionHandler& interactionHandler();
interaction::InteractionHandler& interactionHandler();
RenderEngine& renderEngine();
scripting::ScriptEngine& scriptEngine();
@@ -86,7 +86,7 @@ private:
static OpenSpaceEngine* _engine;
ConfigurationManager _configurationManager;
InteractionHandler _interactionHandler;
interaction::InteractionHandler _interactionHandler;
RenderEngine _renderEngine;
scripting::ScriptEngine _scriptEngine;
ghoul::cmdparser::CommandlineParser _commandlineParser;