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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source 
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
This commit is contained in:
Emil Axelsson
2017-08-15 11:43:18 +02:00
parent 6c36fa7bfd 52b257a62c
commit 2426545a05
360 changed files with 2348 additions and 2015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scripting/lualibrary.h
+2 -2
View File
@@ -59,7 +59,7 @@ struct LuaLibrary {
/// The list of all C-based callback functions for this library
std::vector<Function> functions;
/// A list of script files that are executed for each Lua state
std::vector<std::string> scripts;
std::vector<std::string> scripts = std::vector<std::string>();
/// This struct contains information about a function or constant that is defined in
/// a Lua script
@@ -73,7 +73,7 @@ struct LuaLibrary {
};
/// The list of documentations will be populated automatically by parsing the Lua
/// scripts
std::vector<Documentation> documentations;
std::vector<Documentation> documentations = std::vector<Documentation>();
/// Comparison function that compares two LuaLibrary%s name
bool operator<(const LuaLibrary& rhs) const;
include/openspace/scripting/scriptengine.h
+4 -4
View File
@@ -79,10 +79,10 @@ public:
bool writeLog(const std::string& script);
virtual void presync(bool isMaster);
virtual void encode(SyncBuffer* syncBuffer);
virtual void decode(SyncBuffer* syncBuffer);
virtual void postsync(bool isMaster);
virtual void presync(bool isMaster) override;
virtual void encode(SyncBuffer* syncBuffer) override;
virtual void decode(SyncBuffer* syncBuffer) override;
virtual void postsync(bool isMaster) override;
void queueScript(const std::string &script, RemoteScripting remoteScripting);