OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0024437: Visualization - silhouette edges based on OpenGL

Browse Source 
Added new flag Graphic3d_AspectFillArea3d::ToDrawSilhouette() activating silhouette (outline) rendering.

The new feature can simulate fake HLR look-n-feel,
when combined with Aspect_IS_HIDDENLINE interior style (filling object with background color),
face boundary edges (with most continuity flag set to c2 or lower).

Silhouette GLSL program is very simple - it displaces model alongside vertex normal,
so that it is applicable only to smooth surfaces and closed volumes,
and produces visual artifacts at sharp corners, especially when face boundary is disabled.

OpenGl_SetOfShaderPrograms has been modified so that to reduce
dimensions of the grid of static size based on amount of program combinations.

OpenGl_PrimitiveArray no more allocates VBO resources if primitive array
is marked to be not drawn via interior style / line type / marker type.
This commit is contained in:
asl
2019-02-28 01:36:32 +03:00
committed by apn
parent 967d2f4f30
commit 6ef0d6f156
12 changed files with 303 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ViewerTest/ViewerTest.cxx
View File

@@ -1587,6 +1587,8 @@ struct ViewerTest_AspectsChangeSet
Standard_Integer ToSetInterior;
Aspect_InteriorStyle InteriorStyle;
Standard_Integer ToSetDrawSilhouette;
Standard_Integer ToSetDrawEdges;
Standard_Integer ToSetQuadEdges;
@@ -1648,6 +1650,7 @@ struct ViewerTest_AspectsChangeSet
ShadingModel (Graphic3d_TOSM_DEFAULT),
ToSetInterior (0),
InteriorStyle (Aspect_IS_SOLID),
ToSetDrawSilhouette (0),
ToSetDrawEdges (0),
ToSetQuadEdges (0),
ToSetEdgeColor (0),
@@ -1680,6 +1683,7 @@ struct ViewerTest_AspectsChangeSet
&& ToSetHatch == 0
&& ToSetShadingModel == 0
&& ToSetInterior == 0
&& ToSetDrawSilhouette == 0
&& ToSetDrawEdges == 0
&& ToSetQuadEdges == 0
&& ToSetEdgeColor == 0
@@ -1955,6 +1959,15 @@ struct ViewerTest_AspectsChangeSet
}
}
}
if (ToSetDrawSilhouette != 0)
{
if (ToSetDrawSilhouette != -1
|| theDrawer->HasOwnShadingAspect())
{
toRecompute = theDrawer->SetupOwnShadingAspect (aDefDrawer) || toRecompute;
theDrawer->ShadingAspect()->Aspect()->SetDrawSilhouette (ToSetDrawSilhouette == 1);
}
}
if (ToSetDrawEdges != 0)
{
if (ToSetDrawEdges != -1
@@ -2886,6 +2899,22 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
aChangeSet->ToSetInterior = -1;
aChangeSet->InteriorStyle = Aspect_IS_SOLID;
}
else if (anArg == "-setdrawoutline"
|| anArg == "-setdrawsilhouette"
|| anArg == "-setoutline"
|| anArg == "-setsilhouette"
|| anArg == "-outline"
|| anArg == "-outlined"
|| anArg == "-silhouette")
{
bool toDrawOutline = true;
if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toDrawOutline))
{
++anArgIter;
}
aChangeSet->ToSetDrawSilhouette = toDrawOutline ? 1 : -1;
}
else if (anArg == "-setdrawedges"
|| anArg == "-setdrawedge"
|| anArg == "-drawedges"
@@ -2974,6 +3003,7 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
aChangeSet->ShadingModel = Graphic3d_TOSM_DEFAULT;
aChangeSet->ToSetInterior = -1;
aChangeSet->InteriorStyle = Aspect_IS_SOLID;
aChangeSet->ToSetDrawSilhouette = -1;
aChangeSet->ToSetDrawEdges = -1;
aChangeSet->ToSetQuadEdges = -1;
aChangeSet->ToSetEdgeColor = -1;
@@ -6193,6 +6223,7 @@ void ViewerTest::Commands(Draw_Interpretor& theCommands)
"\n\t\t: [-setFaceBoundaryDraw {0|1}] [-setMostContinuity {c0|c1|c2|c3|cn}"
"\n\t\t: [-setFaceBoundaryWidth LineWidth] [-setFaceBoundaryColor R G B] [-setFaceBoundaryType LineType]"
"\n\t\t: [-setDrawEdges {0|1}] [-setEdgeType LineType] [-setEdgeColor R G B] [-setQuadEdges {0|1}]"
"\n\t\t: [-setDrawSilhouette {0|1}]"
"\n\t\t: [-setAlphaMode {opaque|mask|blend|blendauto} [alphaCutOff=0.5]]"
"\n\t\t: Manage presentation properties of all, selected or named objects."
"\n\t\t: When -subshapes is specified than following properties will be"