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

0025687: Visualization, XCAF - eliminate visual artifacts at the edges of faces

Browse Source 
AIS_ColoredShape::Compute() - improve logic to split input shape into Closed and Open volumes
with back-face culling enabled when possible.

Change last argument of method StdPrs_ShadedShape::Add() from boolean to enumeration StdPrs_Volume
which controls parsing of Closed/Open volumes within input shape.
Make method StdPrs_ShadedShape::ExploreSolids() public.

Extend Draw Harness command vaspects with option -setvisibility to hide subshape (using AIS_ColoredShape).
Add new test cases bugs/bis/bug25687_1 and bugs/bis/bug25687_2.

the logic of bindSubShapes method clarified

Conflicts:

	src/AIS/AIS_ColoredShape.cxx

AIS_ColoredShape::dispatchColors considers the colors of displayed shapes in connection with specific priority

the color of specific shape can be exported from several ways: the color of this shape, the color of a compound containing this shape. The highest priority has the color of shape than the one of the compound. The color with highest priority will be displayed.

This patch accounts for the highest priority of the shape color.

For example: w - wire has GREEN color; e - edge has RED color; "w" contains "e"; all edges of "w" will be displayed in GREEN color except "e" edge, it will be displayed in RED color

Added sample generating model of Intel i7-4790 CPU on which the problem can be reproduced
This commit is contained in:
ibs
2015-02-26 12:50:32 +03:00
committed by bugmaster
parent a1096551c9
commit 5bffb88282
12 changed files with 730 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ViewerTest/ViewerTest.cxx
View File

@@ -1377,6 +1377,9 @@ static int VSetInteriorStyle (Draw_Interpretor& theDI,
//! Auxiliary structure for VAspects
struct ViewerTest_AspectsChangeSet
{
Standard_Integer ToSetVisibility;
Standard_Integer Visibility;
Standard_Integer ToSetColor;
Quantity_Color Color;
@@ -1394,7 +1397,9 @@ struct ViewerTest_AspectsChangeSet
//! Empty constructor
ViewerTest_AspectsChangeSet()
: ToSetColor (0),
: ToSetVisibility (0),
Visibility (1),
ToSetColor (0),
Color (DEFAULT_COLOR),
ToSetLineWidth (0),
LineWidth (1.0),
@@ -1406,7 +1411,8 @@ struct ViewerTest_AspectsChangeSet
//! @return true if no changes have been requested
Standard_Boolean IsEmpty() const
{
return ToSetLineWidth == 0
return ToSetVisibility == 0
&& ToSetLineWidth == 0
&& ToSetTransparency == 0
&& ToSetColor == 0
&& ToSetMaterial == 0;
@@ -1416,6 +1422,11 @@ struct ViewerTest_AspectsChangeSet
Standard_Boolean Validate (const Standard_Boolean theIsSubPart) const
{
Standard_Boolean isOk = Standard_True;
if (Visibility != 0 && Visibility != 1)
{
std::cout << "Error: the visibility should be equal to 0 or 1 (0 - invisible; 1 - visible) (specified " << Visibility << ")\n";
isOk = Standard_False;
}
if (LineWidth <= 0.0
|| LineWidth > 10.0)
{
@@ -1640,6 +1651,18 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
aChangeSet->Transparency = 0.0;
}
}
else if (anArg == "-setvis"
|| anArg == "-setvisibility")
{
if (++anArgIter >= theArgNb)
{
std::cout << "Error: wrong syntax at " << anArg << "\n";
return 1;
}
aChangeSet->ToSetVisibility = 1;
aChangeSet->Visibility = Draw::Atoi (theArgVec[anArgIter]);
}
else if (anArg == "-setalpha")
{
if (++anArgIter >= theArgNb)
@@ -1782,6 +1805,8 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
}
else if (anArg == "-unset")
{
aChangeSet->ToSetVisibility = 1;
aChangeSet->Visibility = 1;
aChangeSet->ToSetLineWidth = -1;
aChangeSet->LineWidth = 1.0;
aChangeSet->ToSetTransparency = -1;
@@ -1819,7 +1844,7 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
Handle(AIS_InteractiveObject) aPrs = aPrsIter.Current();
Handle(AIS_ColoredShape) aColoredPrs;
Standard_Boolean toDisplay = Standard_False;
if (aChanges.Length() > 1)
if (aChanges.Length() > 1 || aChangeSet->ToSetVisibility == 1)
{
Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast (aPrs);
if (aShapePrs.IsNull())
@@ -1844,7 +1869,12 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
{
NCollection_Sequence<ViewerTest_AspectsChangeSet>::Iterator aChangesIter (aChanges);
aChangeSet = &aChangesIter.ChangeValue();
if (aChangeSet->ToSetMaterial == 1)
if (aChangeSet->ToSetVisibility == 1)
{
Handle(AIS_ColoredDrawer) aColDrawer = aColoredPrs->CustomAspects (aColoredPrs->Shape());
aColDrawer->SetHidden (aChangeSet->Visibility == 0);
}
else if (aChangeSet->ToSetMaterial == 1)
{
aCtx->SetMaterial (aPrs, aChangeSet->Material, Standard_False);
}
@@ -1884,6 +1914,11 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
aSubShapeIter.More(); aSubShapeIter.Next())
{
const TopoDS_Shape& aSubShape = aSubShapeIter.Value();
if (aChangeSet->ToSetVisibility == 1)
{
Handle(AIS_ColoredDrawer) aCurColDrawer = aColoredPrs->CustomAspects (aSubShape);
aCurColDrawer->SetHidden (aChangeSet->Visibility == 0);
}
if (aChangeSet->ToSetColor == 1)
{
aColoredPrs->SetCustomColor (aSubShape, aChangeSet->Color);
@@ -4625,6 +4660,7 @@ void ViewerTest::Commands(Draw_Interpretor& theCommands)
theCommands.Add("vaspects",
"vaspects [-noupdate|-update] [name1 [name2 [...]]]"
"\n\t\t: [-setvisibility 0|1]"
"\n\t\t: [-setcolor ColorName] [-setcolor R G B] [-unsetcolor]"
"\n\t\t: [-setmaterial MatName] [-unsetmaterial]"
"\n\t\t: [-settransparency Transp] [-unsettransparency]"