OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0027735: Visualization, OpenGl_ShaderManager - fix clipping state management

Browse Source 
OpenGl_CappingAlgo::RenderCapping() now updates clipping state in Shader Manager.
OpenGl_View::render() clipping state setup has been moved to OpenGl_View::renderScene().

OpenGl_ShaderManager now converts position to homogeneous coordinates within clipping code GLSL.
This fixes capping plane rendering with clipping planes applied.

Fixed possible Clipping planes misconfiguration when FFP is used;
error-prone OpenGl_Clipping::AddWorldLazy() method has been dropped.
This commit is contained in:
kgv
2016-08-05 20:58:13 +03:00
committed by bugmaster
parent c58b1b6257
commit deb02f8655
7 changed files with 31 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/OpenGl/OpenGl_View_Redraw.cxx
View File

@@ -922,10 +922,6 @@ void OpenGl_View::render (Graphic3d_Camera::Projection theProjection,
#endif
aManager->SetShadingModel (myShadingModel);
if (!aManager->IsEmpty())
{
aManager->UpdateClippingState();
}
// Redraw 3d scene
if (theProjection == Graphic3d_Camera::Projection_MonoLeftEye)
@@ -954,17 +950,11 @@ void OpenGl_View::render (Graphic3d_Camera::Projection theProjection,
// before drawing auxiliary stuff (trihedrons, overlayer)
myWorkspace->ResetAppliedAspect();
aContext->ChangeClipping().RemoveAll (aContext);
if (!aManager->IsEmpty())
{
aManager->RevertClippingState();
// We need to disable (unbind) all shaders programs to ensure
// that all objects without specified aspect will be drawn
// correctly (such as background)
aContext->BindProgram (NULL);
}
// We need to disable (unbind) all shaders programs to ensure
// that all objects without specified aspect will be drawn
// correctly (such as background)
aContext->BindProgram (NULL);
// Render trihedron
if (!theToDrawImmediate)
@@ -1192,6 +1182,8 @@ void OpenGl_View::renderScene (Graphic3d_Camera::Projection theProjection,
// add planes at loaded view matrix state
aContext->ChangeClipping().AddView (aContext, aSlicingPlanes);
}
aContext->ShaderManager()->UpdateClippingState();
}
#ifdef _WIN32
@@ -1221,13 +1213,10 @@ void OpenGl_View::renderScene (Graphic3d_Camera::Projection theProjection,
if (!aUserPlanes.IsEmpty())
{
aContext->ChangeClipping().AddWorldLazy (aContext, aUserPlanes);
aContext->ChangeClipping().AddWorld (aContext, aUserPlanes);
}
if (!aContext->ShaderManager()->IsEmpty())
{
aContext->ShaderManager()->UpdateClippingState();
}
aContext->ShaderManager()->UpdateClippingState();
}
#if !defined(GL_ES_VERSION_2_0)
@@ -1314,6 +1303,16 @@ void OpenGl_View::renderScene (Graphic3d_Camera::Projection theProjection,
// Apply restored view matrix.
aContext->ApplyWorldViewMatrix();
aContext->ChangeClipping().RemoveAll (aContext);
if (!myClipPlanes.IsEmpty())
{
aContext->ShaderManager()->RevertClippingState();
}
if (myZClip.Back.IsOn || myZClip.Front.IsOn)
{
aContext->ShaderManager()->RevertClippingState();
}
#ifdef _WIN32
// set printing scale/tiling transformation
if (!aPrintContext.IsNull())