mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-14 22:10:50 -05: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

8
include/openspace/engine/openspaceengine.h
View File

@@ -44,7 +44,7 @@ namespace ghoul::fontrendering { class FontManager; }
namespace openspace {
class AssetManager;
class ConfigurationManager;
struct Configuration;
class Dashboard;
class DownloadManager;
class GUI;
@@ -121,8 +121,9 @@ public:
void scheduleLoadSingleAsset(std::string assetPath);
void toggleShutdownMode();
const Configuration& configuration() const;
// Guaranteed to return a valid pointer
ConfigurationManager& configurationManager();
LuaConsole& console();
AssetManager& assetManager();
Dashboard& dashboard();
@@ -205,8 +206,9 @@ private:
void runGlobalCustomizationScripts();
void configureLogging();
std::unique_ptr<Configuration> _configuration;
// Components
std::unique_ptr<ConfigurationManager> _configurationManager;
std::unique_ptr<Scene> _scene;
std::unique_ptr<AssetManager> _assetManager;
std::unique_ptr<Dashboard> _dashboard;