mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/globebrowsing

Browse Source
This commit is contained in:
Kalle Bladin
2016-05-04 15:57:44 -04:00
parent 47ea06ca94 e4a8683aba
commit 04a363bab1
107 changed files with 1076 additions and 3642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/openspaceengine.h
+2 -2
View File
@@ -104,7 +104,7 @@ public:
void enableBarrier();
void disableBarrier();
void runSettingsScripts();
void runPostInitializationScripts(const std::string& sceneDescription);
private:
OpenSpaceEngine(std::string programName, std::unique_ptr<WindowWrapper> windowWrapper);
@@ -115,7 +115,7 @@ private:
bool loadSpiceKernels();
void loadFonts();
void runScripts(const ghoul::Dictionary& scripts);
void runStartupScripts();
void runPreInitializationScripts(const std::string& sceneDescription);
void configureLogging();
// Components