Issue/372 (#606)

* Add commandline argument that applies a Lua script to the configuration
This commit is contained in:
Alexander Bock
2018-04-21 09:54:05 -04:00
committed by GitHub
parent 8a902efb26
commit 5e1f26cc6b
4 changed files with 36 additions and 5 deletions

View File

@@ -131,6 +131,8 @@ std::string findConfiguration(const std::string& filename = "openspace.cfg");
Configuration loadConfigurationFromFile(const std::string& filename);
void parseLuaState(Configuration& configuration);
} // namespace openspace
#endif // __OPENSPACE_CORE___CONFIGURATION___H__

View File

@@ -121,6 +121,9 @@ public:
void scheduleLoadSingleAsset(std::string assetPath);
void toggleShutdownMode();
// On purpose, there is no function that returns a non-const reference to
// Configuration; that guards us against anyone in the program changing the
// configuration values underneath our feet
const Configuration& configuration() const;
// Guaranteed to return a valid pointer