mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -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

4
src/engine/openspaceengine.cpp
View File

@@ -242,7 +242,7 @@ bool OpenSpaceEngine::initialize() {
_scriptEngine.addLibrary(Time::luaLibrary());
_scriptEngine.addLibrary(interaction::InteractionHandler::luaLibrary());
_scriptEngine.addLibrary(LuaConsole::luaLibrary());
_scriptEngine.addLibrary(GUI::luaLibrary());
_scriptEngine.addLibrary(gui::GUI::luaLibrary());
// TODO: Maybe move all scenegraph and renderengine stuff to initializeGL
scriptEngine().initialize();
@@ -479,7 +479,7 @@ LuaConsole& OpenSpaceEngine::console() {
return _console;
}
GUI& OpenSpaceEngine::gui() {
gui::GUI& OpenSpaceEngine::gui() {
return _gui;
}