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

Feature/configuration (#605)

Browse Source 
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
This commit is contained in:
Alexander Bock
2018-04-20 18:40:21 -04:00
committed by GitHub
parent 3810209365
commit b4be63af65
30 changed files with 1026 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scripting/scriptengine.cpp
View File

@@ -30,7 +30,7 @@
#include <ghoul/lua/lua_helper.h>
#include <ghoul/misc/exception.h>
#include <openspace/engine/configurationmanager.h>
#include <openspace/engine/configuration.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/network/parallelpeer.h>
#include <openspace/util/syncbuffer.h>
@@ -587,16 +587,8 @@ bool ScriptEngine::writeLog(const std::string& script) {
// Check that logging is enabled and initialize if necessary
if (!_logFileExists) {
// If a ScriptLogFile was specified, generate it now
const bool hasFile = OsEng.configurationManager().hasKey(
ConfigurationManager::KeyScriptLog
);
if (hasFile) {
OsEng.configurationManager().getValue(
ConfigurationManager::KeyScriptLog,
_logFilename
);
_logFilename = absPath(_logFilename);
if (!OsEng.configuration().scriptLog.empty()) {
_logFilename = absPath(OsEng.configuration().scriptLog);
_logFileExists = true;
LDEBUG(fmt::format(