mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-25 05:29:41 -06:00
Layers maintenance (#2917)
* Separate layers for the Moon and Earth * One asset each for each server, New York, Utah, and Sweden * Add the layers asset files for Earth and Moon * Add new layers structure for Mars and Europa * Add layers assets for Mercury and Enceladus * Add more layer assets for all servers * Add layer assets for each server on the top asset level * Rename Venus Utah cloud combo layer asset (breaking change) * Clean up layer asset descriptions * Update layer asset version name * Fix base layers error * Add configuration option to choose layers server * Add Lua functions to access configuration settings * Extend configuration Lua function * Add layer server setting in setting gui + add 'None' as a server option * Add base layers when server 'None' is used * Add tests for the new Layer Server setting
This commit is contained in:
@@ -235,4 +235,20 @@ namespace {
|
||||
openspace::setCameraFromProfile(*openspace::global::profile);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the whole configuration object as a Dictionary
|
||||
*/
|
||||
[[codegen::luawrap]] ghoul::Dictionary configuration() {
|
||||
openspace::Configuration& config = *openspace::global::configuration;
|
||||
return config.createDictionary();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current layer server from the configuration
|
||||
*/
|
||||
[[codegen::luawrap]] std::string layerServer() {
|
||||
openspace::Configuration& config = *openspace::global::configuration;
|
||||
return layerServerToString(config.layerServer);
|
||||
}
|
||||
|
||||
#include "openspaceengine_lua_codegen.cpp"
|
||||
|
||||
Reference in New Issue
Block a user