mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-02 08:49:20 -05:00
Updated openspaceengine.cpp to use updated ConfigurationManager
- Updated src/openspaceengine.cpp to utilize both lua configuration file and lua configuration script - Changed scripts/DefaultConfig.lua to be a lua configuration - Renamned scripts/ExtraConfigScript.lua to be a lua configuration script
This commit is contained in:
+1
-1
Submodule ext/ghoul updated: 7cb0200c68...7ee41ec880
@@ -1,5 +1,3 @@
|
||||
|
||||
config =
|
||||
{
|
||||
level1_string = "music1",
|
||||
level1_integer = 2332,
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
|
||||
|
||||
configuration =
|
||||
{
|
||||
level1_string = "music2",
|
||||
level1_lyrics = "This is not, the greatest lyrics in the world. This is just a tribute",
|
||||
level1_secrets =
|
||||
{
|
||||
secret_stuff1 = "Password",
|
||||
secret_stuff2 = "123456",
|
||||
},
|
||||
level2_double = 4.3
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
musicname = "music2"
|
||||
lyrics = "This is not, the greatest lyrics in the world. This is just a tribute"
|
||||
|
||||
configuration =
|
||||
{
|
||||
level1_string = musicname,
|
||||
level1_lyrics = lyrics,
|
||||
level1_secrets =
|
||||
{
|
||||
secret_stuff1 = "Password",
|
||||
secret_stuff2 = "123456",
|
||||
},
|
||||
level2_double = 4.3
|
||||
|
||||
}
|
||||
@@ -123,7 +123,7 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
|
||||
// Load the configurationmanager with the default configuration
|
||||
ghoul::ConfigurationManager configuration;
|
||||
configuration.initialize(absPath("${SCRIPTS}/DefaultConfig.lua"));
|
||||
configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfig.lua"));
|
||||
configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfigScript.lua"), false);
|
||||
|
||||
// Create the renderenginge object
|
||||
_engine->_renderEngine = new RenderEngine;
|
||||
|
||||
Reference in New Issue
Block a user