mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 12:59:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/parallelconnection' into develop

Browse Source 
Conflicts:
	src/interaction/interactionhandler.cpp
This commit is contained in:
Emil Axelsson
2016-09-30 11:01:37 +02:00
parent 7698f97660 0812230554
commit 0230acb005
33 changed files with 1142 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ class RenderEngine;
class ModuleEngine;
class WindowWrapper;
class SettingsEngine;
class TimeManager;
class SyncEngine;
namespace interaction { class InteractionHandler; }
@@ -90,6 +91,7 @@ public:
WindowWrapper& windowWrapper();
ghoul::fontrendering::FontManager& fontManager();
DownloadManager& downloadManager();
TimeManager& timeManager();
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
gui::GUI& gui();
@@ -151,6 +153,7 @@ private:
std::unique_ptr<LuaConsole> _console;
std::unique_ptr<ModuleEngine> _moduleEngine;
std::unique_ptr<SettingsEngine> _settingsEngine;
std::unique_ptr<TimeManager> _timeManager;
std::unique_ptr<DownloadManager> _downloadManager;
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
std::unique_ptr<gui::GUI> _gui;