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

Merge pull request #2426 from OpenSpace/issue/2425

Browse Source 
Fix bug that channels in cluster don't set the field of view to the same value after animating
This commit is contained in:
Ylva Selling
2023-02-02 16:17:06 -05:00
committed by GitHub
parent 0615eab81d a73edcc0af
commit d7eec159fc
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/skybrowser/include/targetbrowserpair.h
View File

@@ -111,6 +111,7 @@ private:
skybrowser::Animation<glm::dvec3> _targetAnimation =
skybrowser::Animation(glm::dvec3(0.0), glm::dvec3(0.0), 0.0);
bool _targetIsAnimating = false;
bool _fovIsAnimating = false;
// Dragging
glm::dvec3 _startTargetPosition = glm::dvec3(0.0);

7
modules/skybrowser/src/targetbrowserpair.cpp
View File

@@ -283,11 +283,18 @@ void TargetBrowserPair::incrementallyAnimateToCoordinate() {
aimTargetGalactic(_targetNode->identifier(), _targetAnimation.newValue());
_fovAnimation.start();
_targetIsAnimating = false;
_fovIsAnimating = true;
}
// After the target has animated to its position, animate the field of view
if (_fovAnimation.isAnimating()) {
_browser->setVerticalFov(_fovAnimation.newValue());
_targetRenderable->setVerticalFov(_browser->verticalFov());
}
else if (!_fovAnimation.isAnimating() && _fovIsAnimating) {
// Set the finished field of view
setVerticalFov(_fovAnimation.newValue());
_fovIsAnimating = false;
}
}
void TargetBrowserPair::startFading(float goal, float fadeTime) {