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

Fixed compile errors, probably finished merge

Browse Source
This commit is contained in:
Alexander Bock
2014-09-13 11:45:49 +02:00
parent 954dbdce13
commit ce10dea96e
6 changed files with 62 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,13 +46,22 @@
// #define OPENSPACE_VIDEO_EXPORT
namespace ghoul {
namespace cmdparser {
class CommandlineParser;
class CommandlineCommand;
}
}
namespace openspace {
class ScriptEngine;
namespace scripting {
class ScriptEngine;
}
class OpenSpaceEngine {
public:
static void create(int argc, char** argv, std::vector<std::string>& sgctArguments);
static bool create(int argc, char** argv, std::vector<std::string>& sgctArguments);
static void destroy();
static OpenSpaceEngine& ref();
@@ -67,6 +76,7 @@ public:
ghoul::opencl::CLContext& clContext();
InteractionHandler& interactionHandler();
RenderEngine& renderEngine();
scripting::ScriptEngine& scriptEngine();
ShaderCreator& shaderBuilder();
// SGCT callbacks
@@ -84,14 +94,18 @@ public:
void decode();
private:
OpenSpaceEngine();
OpenSpaceEngine(std::string programName);
~OpenSpaceEngine();
bool gatherCommandlineArguments();
static OpenSpaceEngine* _engine;
ghoul::Dictionary* _configurationManager;
InteractionHandler* _interactionHandler;
RenderEngine* _renderEngine;
scripting::ScriptEngine* _scriptEngine;
ghoul::cmdparser::CommandlineParser* _commandlineParser;
#ifdef OPENSPACE_VIDEO_EXPORT
bool _doVideoExport;
#endif