mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-24 13:08:49 -05:00
Testing new syncing scheme
This commit is contained in:
@@ -767,8 +767,11 @@ void OpenSpaceEngine::preSynchronization() {
|
||||
}
|
||||
|
||||
_scriptEngine->preSynchronization();
|
||||
|
||||
_interactionHandler->updateInputStates(dt);
|
||||
|
||||
_renderEngine->updateSceneGraph();
|
||||
_renderEngine->camera()->invalidateCache();
|
||||
_interactionHandler->updateCamera();
|
||||
|
||||
_parallelConnection->preSynchronization();
|
||||
}
|
||||
@@ -787,13 +790,18 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
|
||||
_renderEngine->updateFade();
|
||||
_renderEngine->updateRenderer();
|
||||
_renderEngine->updateScreenSpaceRenderables();
|
||||
_renderEngine->updateSceneGraph();
|
||||
|
||||
_renderEngine->updateShaderPrograms();
|
||||
|
||||
_renderEngine->camera()->invalidateCache();
|
||||
if (!_isMaster) {
|
||||
_renderEngine->updateSceneGraph();
|
||||
_renderEngine->camera()->invalidateCache();
|
||||
}
|
||||
|
||||
|
||||
// Step the camera using the current mouse velocities which are synced
|
||||
_interactionHandler->updateCamera();
|
||||
//_interactionHandler->updateCamera();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -785,7 +785,9 @@ void InteractionHandler::updateCamera() {
|
||||
}
|
||||
else {
|
||||
_currentInteractionMode->updateCameraStateFromMouseStates(*_camera);
|
||||
_camera->setFocusPositionVec3(focusNode()->worldPosition());
|
||||
if (focusNode() != nullptr) {
|
||||
_camera->setFocusPositionVec3(focusNode()->worldPosition());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user