Fix initialization order of image sequencer to remove an error of unknown token

This commit is contained in:
Alexander Bock
2015-05-18 19:18:35 +02:00
parent 15908e75a3
commit 6fdd172428
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -103,7 +103,6 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName)
{
SpiceManager::initialize();
Time::initialize();
ImageSequencer2::initialize();
FactoryManager::initialize();
ghoul::systemcapabilities::SystemCapabilities::initialize();
}
@@ -222,6 +221,8 @@ bool OpenSpaceEngine::create(
FileSys.createCacheManager(absPath("${" + constants::configurationmanager::keyCache + "}"));
_engine->_console->initialize();
ImageSequencer2::initialize();
// Register the provided shader directories
ghoul::opengl::ShaderObject::addIncludePath("${SHADERS}");
+2 -2
View File
@@ -46,8 +46,7 @@ namespace openspace {
ImageSequencer2* ImageSequencer2::_instance = nullptr;
ImageSequencer2::ImageSequencer2()
: _defaultCaptureImage(absPath("${OPENSPACE_DATA}/scene/common/textures/placeholder_blank.png"))
, _latestImage()
: _latestImage()
, _hasData(false)
{}
@@ -58,6 +57,7 @@ ImageSequencer2& ImageSequencer2::ref() {
void ImageSequencer2::initialize() {
assert(_instance == nullptr);
_instance = new ImageSequencer2;
_instance->_defaultCaptureImage = absPath("${OPENSPACE_DATA}/scene/common/textures/placeholder_blank.png");
}
void ImageSequencer2::deinitialize() {