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

Intermediate work on making imgui into components

Browse Source
This commit is contained in:
Alexander Bock
2014-12-18 19:15:57 +01:00
parent 55a3c43db4
commit cd012548af
11 changed files with 1129 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,6 @@
namespace openspace {
class GUI;
class SyncBuffer;
class LuaConsole;
@@ -59,7 +58,7 @@ public:
scripting::ScriptEngine& scriptEngine();
LuaConsole& console();
GUI& gui();
gui::GUI& gui();
// SGCT callbacks
bool initializeGL();
@@ -97,7 +96,7 @@ private:
scripting::ScriptEngine _scriptEngine;
ghoul::cmdparser::CommandlineParser _commandlineParser;
LuaConsole _console;
GUI _gui;
gui::GUI _gui;
SyncBuffer* _syncBuffer;