OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0029768: Visualization, TKOpenGl - structure is entirely clipped by suppressed clipping

Browse Source 
OpenGl_Structure::Render(), added missing check for disabled state of the plane.
vclipplane command has been extended with new option -setOverrideGlobal.
This commit is contained in:
kgv 2018-05-14 19:25:16 +03:00 committed by abv
parent 9ce99357a4
commit 32ca771129
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenGl/OpenGl_Structure.cxx
View File

@ -605,7 +605,7 @@ void OpenGl_Structure::Render (const Handle(OpenGl_Workspace) &theWorkspace) con
for (OpenGl_ClippingIterator aPlaneIt (aCtx->Clipping()); aPlaneIt.More(); aPlaneIt.Next()) for (OpenGl_ClippingIterator aPlaneIt (aCtx->Clipping()); aPlaneIt.More(); aPlaneIt.Next())
{ {
const Handle(Graphic3d_ClipPlane)& aPlane = aPlaneIt.Value(); const Handle(Graphic3d_ClipPlane)& aPlane = aPlaneIt.Value();
if (!aPlane->IsOn()) if (aPlaneIt.IsDisabled())
{ {
continue; continue;
} }

15
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -8681,10 +8681,12 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
return 0; return 0;
} }
else if (aChangeArg == "-set" else if (aChangeArg == "-set"
|| aChangeArg == "-unset") || aChangeArg == "-unset"
|| aChangeArg == "-setoverrideglobal")
{ {
// set / unset plane command // set / unset plane command
Standard_Boolean toSet = aChangeArg == "-set"; const Standard_Boolean toSet = aChangeArg.StartsWith ("-set");
const Standard_Boolean toOverrideGlobal = aChangeArg == "-setoverrideglobal";
Standard_Integer anIt = 1; Standard_Integer anIt = 1;
for (; anIt < aNbChangeArgs; ++anIt) for (; anIt < aNbChangeArgs; ++anIt)
{ {
@ -8694,7 +8696,8 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
{ {
break; break;
} }
else if (ViewerTest_myViews.IsBound1 (anEntityName)) else if (!toOverrideGlobal
&& ViewerTest_myViews.IsBound1 (anEntityName))
{ {
Handle(V3d_View) aView = ViewerTest_myViews.Find1 (anEntityName); Handle(V3d_View) aView = ViewerTest_myViews.Find1 (anEntityName);
if (toSet) if (toSet)
@ -8718,6 +8721,10 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
{ {
aIObj->RemoveClipPlane (aClipPlane); aIObj->RemoveClipPlane (aClipPlane);
} }
if (!aIObj->ClipPlanes().IsNull())
{
aIObj->ClipPlanes()->SetOverrideGlobal (toOverrideGlobal);
}
} }
else else
{ {
@ -12387,7 +12394,7 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands)
theCommands.Add("vclipplane", theCommands.Add("vclipplane",
"vclipplane planeName [{0|1}]" "vclipplane planeName [{0|1}]"
"\n\t\t: [-equation A B C D]" "\n\t\t: [-equation A B C D]"
"\n\t\t: [-set|-unset [objects|views]]" "\n\t\t: [-set|-unset|-setOverrideGlobal [objects|views]]"
"\n\t\t: [-maxPlanes]" "\n\t\t: [-maxPlanes]"
"\n\t\t: [-capping {0|1}]" "\n\t\t: [-capping {0|1}]"
"\n\t\t: [-color R G B] [-hatch {on|off|ID}]" "\n\t\t: [-color R G B] [-hatch {on|off|ID}]"

23
tests/bugs/vis/bug29768 Normal file
View File

@ -0,0 +1,23 @@
puts "============"
puts "0029768: Visualization, TKOpenGl - structure is entirely clipped by suppressed clipping"
puts "============"
puts ""
vclear
vinit View1
vaxo
vpoint p0 0 0 0
vzbufftrihedron
box b0 0 0 0 1 1 1
box b1 3 0 0 1 1 1
vdisplay -dispMode 1 b0 b1
vsetcolor b0 RED
vsetcolor b1 GREEN
vfit
vclipplane pv equation -1 0 0 0.5 -set
vclipplane pb0 equation 0 1 0 -0.5 -set b0
vclipplane pb1 equation 0 1 0 -0.5 -setOverrideGlobal b1
if { [vreadpixel 300 200 rgb name] != "GREEN3" } { puts "Error: box b1 is fully clipped" }
vdump $imagedir/${casename}.png