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

Do not interpolate stereo distance if there is no previous focus node

Browse Source
This commit is contained in:
Emil Axelsson
2018-03-22 17:14:04 +01:00
parent 7583586178
commit e660699ca5
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/openspace/interaction/orbitalnavigator.h
View File

@@ -97,6 +97,7 @@ private:
glm::dvec3 _previousFocusNodePosition;
glm::dquat _previousFocusNodeRotation;
double _currentCameraToSurfaceDistance;
bool _directlySetStereoDistance = false;
Interpolator<double> _rotateToFocusNodeInterpolator;
Interpolator<double> _cameraToSurfaceDistanceInterpolator;

23
src/interaction/orbitalnavigator.cpp
View File

@@ -324,10 +324,15 @@ void OrbitalNavigator::updateCameraStateFromMouseStates(Camera& camera, double d
double targetCameraToSurfaceDistance = glm::length(
cameraToSurfaceVector(camPos, centerPos, posHandle)
);
_currentCameraToSurfaceDistance = interpolateCameraToSurfaceDistance(
deltaTime,
_currentCameraToSurfaceDistance,
targetCameraToSurfaceDistance);
if (_directlySetStereoDistance) {
_currentCameraToSurfaceDistance = targetCameraToSurfaceDistance;
_directlySetStereoDistance = false;
} else {
_currentCameraToSurfaceDistance = interpolateCameraToSurfaceDistance(
deltaTime,
_currentCameraToSurfaceDistance,
targetCameraToSurfaceDistance);
}
camera.setScaling(
_stereoscopicDepthOfFocusSurface /
@@ -357,11 +362,15 @@ glm::dvec3 OrbitalNavigator::cameraToSurfaceVector(
}
void OrbitalNavigator::setFocusNode(SceneGraphNode* focusNode) {
if (!_focusNode) {
_directlySetStereoDistance = true;
}
_focusNode = focusNode;
if (_focusNode != nullptr) {
_previousFocusNodePosition = _focusNode->worldPosition();
_previousFocusNodeRotation = glm::quat_cast(_focusNode->worldRotationMatrix());
if (focusNode != nullptr) {
_previousFocusNodePosition = focusNode->worldPosition();
_previousFocusNodeRotation = glm::quat_cast(focusNode->worldRotationMatrix());
}
}