OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-05 21:53:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3697 Fix zoom issues with ortographic views

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-20 13:49:19 +01:00
parent d51f66179a
commit 9145e6011d
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp
View File

@ -169,6 +169,27 @@ void caf::TrackBallBasedNavigation::zoomAlongRay(cvf::Ray* ray, int delta)
m_viewer->updateParallelProjectionHeightFromMoveZoom(m_pointOfInterest);
m_viewer->updateParallelProjectionCameraPosFromPointOfInterestMove(m_pointOfInterest);
// Ceeviz Workaround for #3697:
// Ceeviz may create a singular projection*view matrix internally. In which case we need to revert.
cvf::Mat4d projectionMatrix = m_viewer->mainCamera()->projectionMatrix();
cvf::Mat4d viewMatrix = m_viewer->mainCamera()->viewMatrix();
cvf::Mat4d multMatrix = projectionMatrix * viewMatrix;
double determinant = std::fabs(multMatrix.determinant());
if (determinant < 1.0e-15)
{
m_viewer->mainCamera()->setFromLookAt(pos, vrp, up);
m_viewer->updateParallelProjectionHeightFromMoveZoom(m_pointOfInterest);
m_viewer->updateParallelProjectionCameraPosFromPointOfInterestMove(m_pointOfInterest);
#ifndef NDEBUG
projectionMatrix = m_viewer->mainCamera()->projectionMatrix();
viewMatrix = m_viewer->mainCamera()->viewMatrix();
multMatrix = projectionMatrix * viewMatrix;
determinant = std::fabs(multMatrix.determinant());
CVF_ASSERT(determinant > 1.0e-15);
#endif
}
m_viewer->navigationPolicyUpdate();
}
}