mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use the new way of updating and syncing camera

Browse Source
This commit is contained in:
Kalle Bladin
2016-08-08 17:13:32 -04:00
parent d91dd3dbb7
commit 7ecc8d397f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/engine/openspaceengine.cpp
View File

@@ -737,9 +737,8 @@ void OpenSpaceEngine::preSynchronization() {
FileSys.triggerFilesystemEvents();
if (_isMaster) {
double dt = _windowWrapper->averageDeltaTime();
//_interactionHandler->update(dt);
// Update the mouse velocities for interaction handler
_interactionHandler->preSynchronization(dt);
_interactionHandler->postSynchronizationPreDraw();
Time::ref().advanceTime(dt);
Time::ref().preSynchronization();
@@ -763,14 +762,18 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
}
Time::ref().postSynchronizationPreDraw();
_scriptEngine->postSynchronizationPreDraw();
_renderEngine->postSynchronizationPreDraw();
// Sync the camera to match the previous frame
_renderEngine->camera()->postSynchronizationPreDraw();
//_renderEngine->camera()->preSynchronization();
//_renderEngine->camera()->postSynchronizationPreDraw();
_scriptEngine->postSynchronizationPreDraw();
_renderEngine->postSynchronizationPreDraw();
// Step the camera using the current mouse velocities which are synced
_interactionHandler->postSynchronizationPreDraw();
// Update the synched variables in the camera class
_renderEngine->camera()->preSynchronization();
_renderEngine->camera()->postSynchronizationPreDraw();
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
if (_isMaster && _gui->isEnabled() && _windowWrapper->isRegularRendering()) {