mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 08:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up scripts directory

Browse Source 
Made scripts runnable at startup
Added printing functions and remapped default Lua printing
This commit is contained in:
Alexander Bock
2014-08-29 13:04:20 +02:00
parent 1782857c72
commit 79174d5b6c
17 changed files with 221 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ public:
ghoul::opencl::CLContext& clContext();
InteractionHandler& interactionHandler();
RenderEngine& renderEngine();
ScriptEngine& scriptEngine();
scripting::ScriptEngine& scriptEngine();
// SGCT callbacks
bool initializeGL();
@@ -92,7 +92,7 @@ private:
ghoul::Dictionary* _configurationManager;
InteractionHandler* _interactionHandler;
RenderEngine* _renderEngine;
ScriptEngine* _scriptEngine;
scripting::ScriptEngine* _scriptEngine;
ghoul::cmdparser::CommandlineParser* _commandlineParser;
#ifdef FLARE_ONLY
Flare* _flare;