Enable the ability to run setting scripts that are executed after the scene has been loaded

This commit is contained in:
Alexander Bock
2015-02-17 20:10:50 +01:00
parent 3651c64af4
commit a0fc77a893
8 changed files with 51 additions and 24 deletions
+3 -3
View File
@@ -86,7 +86,7 @@ public:
void encode();
void decode();
void runSettingsScripts();
private:
OpenSpaceEngine(std::string programName);
@@ -95,8 +95,9 @@ private:
void clearAllWindows();
bool gatherCommandlineArguments();
bool loadSpiceKernels();
void runStartupScripts();
void loadFonts();
void runScripts(const ghoul::Dictionary& scripts);
void runStartupScripts();
void configureLogging();
static OpenSpaceEngine* _engine;
@@ -111,7 +112,6 @@ private:
double _dt;
SyncBuffer* _syncBuffer;
};
#define OsEng (openspace::OpenSpaceEngine::ref())
+1
View File
@@ -47,6 +47,7 @@ namespace configurationmanager {
const std::string keyConfigScene = "Scene";
const std::string keyEnableGui = "EnableGUI";
const std::string keyStartupScript = "StartupScripts";
const std::string keySettingsScript = "SettingsScripts";
const std::string keySpiceTimeKernel = "SpiceKernel.Time";
const std::string keySpiceLeapsecondKernel = "SpiceKernel.LeapSecond";
const std::string keyLogLevel = "Logging.LogLevel";