From e49db2806656ae4892f39d3e3cbf765283a53b21 Mon Sep 17 00:00:00 2001 From: hosali Date: Mon, 22 Apr 2024 11:00:48 +0000 Subject: [PATCH] 0033647: Visualization - A problem with viewer background corner aspects Initialize and setup the gradient background shader in background drawing call --- src/OpenGl/OpenGl_View.cxx | 7 +++++++ src/ViewerTest/ViewerTest_ViewerCommands.cxx | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/OpenGl/OpenGl_View.cxx b/src/OpenGl/OpenGl_View.cxx index 7907795567..25c846240b 100644 --- a/src/OpenGl/OpenGl_View.cxx +++ b/src/OpenGl/OpenGl_View.cxx @@ -1103,6 +1103,13 @@ void OpenGl_View::drawBackground (const Handle(OpenGl_Workspace)& theWorkspace, if (myBackgrounds[Graphic3d_TOB_GRADIENT]->GradientFillMethod() >= Aspect_GradientFillMethod_Corner1 && myBackgrounds[Graphic3d_TOB_GRADIENT]->GradientFillMethod() <= Aspect_GradientFillMethod_Corner4) { + // Set colored quad shader program + Quantity_Color aColor1, aColor2; + GradientBackground().Colors(aColor1, aColor2); + myColoredQuadParams->Aspect()->SetShaderProgram(aCtx->ShaderManager()->GetColoredQuadProgram()); + myColoredQuadParams->Aspect()->ShaderProgram()->PushVariableVec3 ("uColor1", aColor1.Rgb()); + myColoredQuadParams->Aspect()->ShaderProgram()->PushVariableVec3 ("uColor2", aColor2.Rgb()); + const OpenGl_Aspects* anOldAspectFace = theWorkspace->SetAspects (myColoredQuadParams); myBackgrounds[Graphic3d_TOB_GRADIENT]->Render (theWorkspace, theProjection); diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index d700adce80..39d09cd8ba 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -211,8 +211,8 @@ static struct } } -} ViewerTest_DefaultBackground = { Quantity_NOC_BLACK, Quantity_NOC_BLACK, Quantity_NOC_BLACK, Aspect_GradientFillMethod_None }; - + } ViewerTest_DefaultBackground = { Quantity_NOC_BLACK, Quantity_NOC_BLACK, Quantity_NOC_BLACK, Aspect_GradientFillMethod_None }; + //============================================================================== // EVENT GLOBAL VARIABLES //============================================================================== @@ -795,7 +795,6 @@ TCollection_AsciiString ViewerTest::ViewerInit (const ViewerTest_VinitParams& th #endif VT_GetWindow()->Map(); - // Set the handle of created view in the event manager ViewerTest::ResetEventManager();