1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-07 18:30:55 +03:00

0026085: Shape is not displayed in wireframe mode with activated RayTracing

This commit is contained in:
dbp 2015-04-16 11:43:34 +03:00 committed by bugmaster
parent 5ae01c8551
commit 5682a02934

View File

@ -596,6 +596,10 @@ void OpenGl_View::RenderStructs (const Handle(OpenGl_Workspace)& theWorkspace,
toRenderGL = !initRaytraceResources (theCView, aCtx) || toRenderGL = !initRaytraceResources (theCView, aCtx) ||
!updateRaytraceGeometry (OpenGl_GUM_CHECK, theWorkspace->ActiveViewId(), aCtx); !updateRaytraceGeometry (OpenGl_GUM_CHECK, theWorkspace->ActiveViewId(), aCtx);
toRenderGL |= !myIsRaytraceDataValid; // if no ray-trace data use OpenGL
if (!toRenderGL)
{
OpenGl_FrameBuffer* anOutputFBO = NULL; OpenGl_FrameBuffer* anOutputFBO = NULL;
if (theWorkspace->ResultFBO()->IsValid()) if (theWorkspace->ResultFBO()->IsValid())
@ -606,13 +610,7 @@ void OpenGl_View::RenderStructs (const Handle(OpenGl_Workspace)& theWorkspace,
{ {
anOutputFBO = (OpenGl_FrameBuffer* )theCView.ptrFBO; anOutputFBO = (OpenGl_FrameBuffer* )theCView.ptrFBO;
} }
else
{
//toRenderGL = Standard_True; // failed to get valid FBO
}
if (!toRenderGL && myIsRaytraceDataValid)
{
const Standard_Integer aSizeX = anOutputFBO != NULL ? const Standard_Integer aSizeX = anOutputFBO != NULL ?
anOutputFBO->GetVPSizeX() : theWorkspace->Width(); anOutputFBO->GetVPSizeX() : theWorkspace->Width();
const Standard_Integer aSizeY = anOutputFBO != NULL ? const Standard_Integer aSizeY = anOutputFBO != NULL ?