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:
Jonas Strandstedt
2014-02-26 10:41:16 -05:00
parent ee7d50598f
commit 61a25977cd
5 changed files with 17 additions and 18 deletions
-2
View File
@@ -1,5 +1,3 @@
config =
{
level1_string = "music1",
level1_integer = 2332,
-14
View File
@@ -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
}
+15
View File
@@ -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
}
+1 -1
View File
@@ -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;