mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added support to Ghoul master

Browse Source
This commit is contained in:
Jonas Strandstedt
2014-03-03 15:23:04 -05:00
parent 61a25977cd
commit 87ae4639c7
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 7ee41ec880...be4408cc1c

2
scripts/ExtraConfigScript.lua
View File

@@ -1,7 +1,7 @@
musicname = "music2"
lyrics = "This is not, the greatest lyrics in the world. This is just a tribute"
configuration =
config =
{
level1_string = musicname,
level1_lyrics = lyrics,

17
src/openspaceengine.cpp
View File

@@ -36,6 +36,7 @@
#include <ghoul/filesystem/filesystem>
#include <ghoul/logging/logging>
#include <ghoul/misc/configurationmanager.h>
#include <ghoul/systemcapabilities/systemcapabilities.h>
using namespace ghoul::filesystem;
using namespace ghoul::logging;
@@ -98,9 +99,6 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
#endif
FileSys.registerPathToken("${SCRIPTS}", "${BASE_PATH}/scripts");
FileSys.registerPathToken("${OPENSPACE-DATA}", "${BASE_PATH}/openspace-data");
// OLD
//FileSys.registerPathToken("${SCRIPTS}", "${BASE_PATH}/openspace/scripts"); // FIX ME: tempoary path
_engine->_configurationManager = new ghoul::ConfigurationManager;
_engine->_configurationManager->initialize();
@@ -120,15 +118,9 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
newArgv[2] = "../config/single.xml";
#endif
// Load the configurationmanager with the default configuration
ghoul::ConfigurationManager configuration;
configuration.initialize(absPath("${SCRIPTS}/DefaultConfig.lua"));
configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfigScript.lua"), false);
// Create the renderenginge object
_engine->_renderEngine = new RenderEngine;
_engine->_interactionHandler = new InteractionHandler;
}
void OpenSpaceEngine::destroy() {
@@ -136,9 +128,10 @@ void OpenSpaceEngine::destroy() {
}
bool OpenSpaceEngine::initialize() {
//_configurationManager->initialize();
//_configurationManager->loadConfiguration("${SCRIPTS}/config.lua");
//_configurationManager->loadConfiguration("${SCRIPTS}/config2.lua");
// Load the configurationmanager with the default configuration
ghoul::ConfigurationManager configuration;
configuration.initialize(absPath("${SCRIPTS}/DefaultConfig.lua"));
configuration.loadConfiguration(absPath("${SCRIPTS}/ExtraConfigScript.lua"), false);
Time::init();
Spice::init();