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

Clean up scene loading

Browse Source
This commit is contained in:
Emil Axelsson
2017-03-14 13:40:18 +01:00
parent 92df9caf5a
commit ca6348194e
9 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,6 @@ public:
double runTime();
void setRunTime(double t);
void loadScene(const std::string& scenePath);
// callbacks
void initialize();
@@ -98,6 +97,7 @@ public:
void externalControlCallback(const char* receivedChars, int size, int clientId);
void encode();
void decode();
void scheduleLoadScene(const std::string& scenePath);
void enableBarrier();
@@ -171,6 +171,7 @@ private:
std::unique_ptr<WindowWrapper> windowWrapper);
~OpenSpaceEngine() = default;
void loadScene(const std::string& scenePath);
void gatherCommandlineArguments();
void loadFonts();
void runPreInitializationScripts(const std::string& sceneDescription);
@@ -201,8 +202,6 @@ private:
bool _switchScene;
std::string _scenePath;
bool _isMaster;
struct {
std::vector<std::function<void()>> initialize;
std::vector<std::function<void()>> deinitialize;