mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 14:58:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts

Browse Source 
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
This commit is contained in:
Emma Broman
2021-07-09 15:43:17 +02:00
parent 771aa46fcd 5da4f104e8
commit 16173d7afe
92 changed files with 1015 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/openspace/scripting/scriptengine.h
View File

@@ -31,9 +31,10 @@
#include <openspace/scripting/lualibrary.h>
#include <ghoul/lua/luastate.h>
#include <ghoul/misc/boolean.h>
#include <filesystem>
#include <mutex>
#include <queue>
#include <optional>
#include <queue>
#include <functional>
namespace openspace { class SyncBuffer; }
@@ -82,7 +83,7 @@ public:
bool hasLibrary(const std::string& name);
bool runScript(const std::string& script, ScriptCallback callback = ScriptCallback());
bool runScriptFile(const std::string& filename);
bool runScriptFile(const std::filesystem::path& filename);
bool writeLog(const std::string& script);