mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-06 18:26:22 +03:00
0026085: Shape is not displayed in wireframe mode with activated RayTracing
This commit is contained in:
parent
5ae01c8551
commit
5682a02934
@ -596,23 +596,21 @@ 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);
|
||||||
|
|
||||||
OpenGl_FrameBuffer* anOutputFBO = NULL;
|
toRenderGL |= !myIsRaytraceDataValid; // if no ray-trace data use OpenGL
|
||||||
|
|
||||||
if (theWorkspace->ResultFBO()->IsValid())
|
if (!toRenderGL)
|
||||||
{
|
{
|
||||||
anOutputFBO = theWorkspace->ResultFBO().operator->();
|
OpenGl_FrameBuffer* anOutputFBO = NULL;
|
||||||
}
|
|
||||||
else if (theCView.ptrFBO != NULL)
|
if (theWorkspace->ResultFBO()->IsValid())
|
||||||
{
|
{
|
||||||
anOutputFBO = (OpenGl_FrameBuffer* )theCView.ptrFBO;
|
anOutputFBO = theWorkspace->ResultFBO().operator->();
|
||||||
}
|
}
|
||||||
else
|
else if (theCView.ptrFBO != NULL)
|
||||||
{
|
{
|
||||||
//toRenderGL = Standard_True; // failed to get valid FBO
|
anOutputFBO = (OpenGl_FrameBuffer* )theCView.ptrFBO;
|
||||||
}
|
}
|
||||||
|
|
||||||
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 ?
|
||||||
|
Loading…
x
Reference in New Issue
Block a user