mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

Browse Source
This commit is contained in:
Emil Axelsson
2017-03-16 16:35:29 +01:00
parent 361f9face5 a945c2f9b0
commit b06864eefe
62 changed files with 1773 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/openspaceengine.cpp
View File

@@ -271,7 +271,7 @@ void OpenSpaceEngine::create(int argc, char** argv,
}
throw;
}
catch (const ghoul::RuntimeError& e) {
catch (const ghoul::RuntimeError&) {
LFATAL("Loading of configuration file '" << configurationFilePath << "' failed");
throw;
}
@@ -477,9 +477,9 @@ void OpenSpaceEngine::initialize() {
writeDocumentation();
if (configurationManager().hasKey(ConfigurationManager::KeyShutdownCountdown)) {
_shutdown.waitTime = configurationManager().value<double>(
_shutdown.waitTime = static_cast<float>(configurationManager().value<double>(
ConfigurationManager::KeyShutdownCountdown
);
));
}
if (!commandlineArgumentPlaceholders.sceneName.empty()) {
@@ -983,7 +983,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
if (_shutdown.timer <= 0.f) {
_windowWrapper->terminate();
}
_shutdown.timer -= _windowWrapper->averageDeltaTime();
_shutdown.timer -= static_cast<float>(_windowWrapper->averageDeltaTime());
}
_renderEngine->updateScene();