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

Compile fixes after merge

Browse Source
This commit is contained in:
Emil Axelsson
2017-07-18 14:21:17 +02:00
parent 5ced910f79
commit 8c124955fd
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/openspaceengine.cpp
View File

@@ -570,7 +570,7 @@ void OpenSpaceEngine::loadScene(const std::string& scenePath) {
_syncEngine->removeSyncables(_renderEngine->getSyncables());
_renderEngine->setScene(nullptr);
_renderEngine->setCamera(nullptr);
_interactionHandler->setCamera(nullptr);
_navigationHandler->setCamera(nullptr);
_scene->clear();
}
@@ -610,11 +610,11 @@ void OpenSpaceEngine::loadScene(const std::string& scenePath) {
if (_scene) {
_renderEngine->setCamera(_scene->camera());
_navigationHandler->setCamera(_scene->camera());
_navigationHandler->setFocusNode(scene->camera()->parent());
_navigationHandler->setFocusNode(_scene->camera()->parent());
// Write keyboard documentation.
if (configurationManager().hasKey(ConfigurationManager::KeyKeyboardShortcuts)) {
interactionHandler().writeDocumentation(
keyBindingManager().writeDocumentation(
absPath(configurationManager().value<std::string>(
ConfigurationManager::KeyKeyboardShortcuts
))
@@ -1059,15 +1059,12 @@ void OpenSpaceEngine::preSynchronization() {
);
}
_interactionHandler->updateInputStates(dt);
_renderEngine->updateScene();
_renderEngine->updateScene();
_navigationHandler->updateCamera(dt);
Camera* camera = _renderEngine->camera();
if (camera) {
_interactionHandler->updateCamera(dt);
_navigationHandler->updateCamera(dt);
_renderEngine->camera()->invalidateCache();
}
_parallelConnection->preSynchronization();