OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0027836: Visualization, TKOpenGl - gradient background is lost at some camera positions

Browse Source 
OpenGl_View::ZLayerBoundingBox() now adds screen background plane for proper Z-fit.

Graphic3d_TransformPers::Compute() - projection matrix has been excluded
from the math to eliminate floating point computation error.
This commit is contained in:
kgv
2016-09-03 21:37:55 +03:00
committed by bugmaster
parent 1ae83f5727
commit 71d8ccc753
3 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Graphic3d/Graphic3d_TransformPers.hxx
View File

@@ -90,12 +90,25 @@ public:
const Standard_Integer theViewportWidth,
const Standard_Integer theViewportHeight) const;
//! Apply transformation persistence on specified matrices.
//! @param theCamera camera definition
//! @param theProjection projection matrix to modify
//! @param theWorldView world-view matrix to modify
//! @param theViewportWidth viewport width
//! @param theViewportHeight viewport height
template<class T>
void Apply (const Handle(Graphic3d_Camera)& theCamera,
NCollection_Mat4<T>& theProjection,
NCollection_Mat4<T>& theWorldView,
const Standard_Integer theViewportWidth,
const Standard_Integer theViewportHeight) const;
//! Return true if transformation persistence alters projection matrix.
bool AltersProjectionMatrix() const
{
return (Flags & Graphic3d_TMF_PanPers) != 0;
}
};
// =======================================================================
@@ -110,7 +123,8 @@ void Graphic3d_TransformPers::Apply (const Handle(Graphic3d_Camera)& theCamera,
const Standard_Integer theViewportHeight) const
{
(void )theViewportWidth;
if (!Flags)
if (Flags == Graphic3d_TMF_None
|| theViewportHeight == 0)
{
return;
}
@@ -375,19 +389,30 @@ NCollection_Mat4<T> Graphic3d_TransformPers::Compute (const Handle(Graphic3d_Cam
return NCollection_Mat4<T>();
}
NCollection_Mat4<T> aProjection (theProjection);
NCollection_Mat4<T> aWorldView (theWorldView);
NCollection_Mat4<T> anUnviewMat;
if (AltersProjectionMatrix())
{
// destructive transformation persistence which directly modifies projection matrix
if (!(theProjection * theWorldView).Inverted (anUnviewMat))
{
return NCollection_Mat4<T>();
}
if (!(theProjection * theWorldView).Inverted (anUnviewMat))
Apply (theCamera, aProjection, aWorldView, theViewportWidth, theViewportHeight);
return anUnviewMat * (aProjection * aWorldView);
}
if (!theWorldView.Inverted (anUnviewMat))
{
return NCollection_Mat4<T>();
}
NCollection_Mat4<T> aProjection (theProjection);
NCollection_Mat4<T> aWorldView (theWorldView);
// compute only world-view matrix difference to avoid floating point instability
// caused by projection matrix modifications outside of this algorithm (e.g. by Z-fit)
Apply (theCamera, aProjection, aWorldView, theViewportWidth, theViewportHeight);
return anUnviewMat * (aProjection * aWorldView);
return anUnviewMat * aWorldView;
}
#endif // _Graphic3d_TransformPers_HeaderFile