mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 14:40:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts with master

Browse Source
This commit is contained in:
GPayne
2021-05-20 19:55:49 -06:00
parent 3f9ae245c7 b9a8ec93de
commit e374eef72d
928 changed files with 31104 additions and 35653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripting/scriptengine.cpp
View File

@@ -28,11 +28,13 @@
#include <openspace/engine/globals.h>
#include <openspace/interaction/sessionrecording.h>
#include <openspace/network/parallelpeer.h>
#include <openspace/util/json_helper.h>
#include <openspace/util/syncbuffer.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/lua/lua_helper.h>
#include <ghoul/misc/profiling.h>
#include <filesystem>
#include <fstream>
#include "scriptengine_lua.inl"
@@ -142,7 +144,7 @@ void ScriptEngine::addLibrary(LuaLibrary library) {
}
}
for (const std::string& script : library.scripts) {
for (const std::filesystem::path& script : library.scripts) {
merged.scripts.push_back(script);
}
@@ -210,7 +212,7 @@ bool ScriptEngine::runScriptFile(const std::string& filename) {
LWARNING("Filename was empty");
return false;
}
if (!FileSys.fileExists(filename)) {
if (!std::filesystem::is_regular_file(filename)) {
LERROR(fmt::format("Script with name '{}' did not exist", filename));
return false;
}
@@ -307,9 +309,9 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
lua_settable(state, TableOffset);
}
for (const std::string& script : library.scripts) {
for (const std::filesystem::path& script : library.scripts) {
// First we run the script to set its values in the current state
ghoul::lua::runScriptFile(state, script);
ghoul::lua::runScriptFile(state, script.string());
library.documentations.clear();
@@ -318,7 +320,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
lua_gettable(state, -2);
if (lua_isnil(state, -1)) {
LERROR(fmt::format(
"Module '{}' did not provide a documentation in script file '{}'",
"Module '{}' did not provide a documentation in script file {}",
library.name, script
));
}
@@ -635,7 +637,7 @@ bool ScriptEngine::writeLog(const std::string& script) {
if (!_logFileExists) {
// If a ScriptLogFile was specified, generate it now
if (!global::configuration->scriptLog.empty()) {
_logFilename = absPath(global::configuration->scriptLog);
_logFilename = absPath(global::configuration->scriptLog).string();
_logFileExists = true;
LDEBUG(fmt::format(