mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
Include strict lua file, throw error in configuration loading when overriding with unused variable
- Preventing True/true bug - Fix issue with unused variable in configuration_helper
This commit is contained in:
@@ -37,6 +37,7 @@ namespace {
|
||||
// We can't use ${SCRIPTS} here as that hasn't been defined by this point
|
||||
constexpr const char* InitialConfigHelper =
|
||||
"${BASE}/scripts/configuration_helper.lua";
|
||||
constexpr const char* StrictLuaScript = "${BASE}/scripts/strict.lua";
|
||||
|
||||
struct [[codegen::Dictionary(Configuration)]] Parameters {
|
||||
// The SGCT configuration file that determines the window and view frustum
|
||||
@@ -649,6 +650,9 @@ Configuration loadConfigurationFromFile(const std::string& filename,
|
||||
if (FileSys.fileExists(absPath(InitialConfigHelper))) {
|
||||
ghoul::lua::runScriptFile(result.state, absPath(InitialConfigHelper));
|
||||
}
|
||||
if (FileSys.fileExists(absPath(StrictLuaScript))) {
|
||||
ghoul::lua::runScriptFile(result.state, absPath(StrictLuaScript));
|
||||
}
|
||||
|
||||
// Load the configuration file into the state
|
||||
ghoul::lua::runScriptFile(result.state, filename);
|
||||
|
||||
Reference in New Issue
Block a user