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

0029234: BRepOffsetAPI_NormalProjection produces INTERNAL edges and vertices

Browse Source 
Make the algorithm BRepOffsetAPI_NormalProjection use section operation instead of common to get the edge-result of projection to be in face restrictions.

Correct Boolean operation algorithm to produce correctly oriented result in the case of common between face and edge.

The algorithm ShapeUpgrade_UnifySameDomain has been patched to correctly gather same domain faces in a compound.

The TCL script snowflake.tcl has been corrected to get rid of dependence on the order of edges in the result of Boolean operation.
This commit is contained in:
msv
2017-10-20 18:59:01 +03:00
parent 2c26e60bf9
commit 977ad98334
10 changed files with 115 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
View File

@@ -125,41 +125,6 @@ static Standard_Boolean IsLikeSeam(const TopoDS_Edge& anEdge,
return Standard_False;
}
static Standard_Boolean CheckSharedEdgeOri(const TopoDS_Face& theF1,
const TopoDS_Face& theF2,
const TopoDS_Edge& theE)
{
TopAbs_Orientation anEOri = theE.Orientation();
if (anEOri == TopAbs_EXTERNAL || anEOri == TopAbs_INTERNAL)
return Standard_False;
TopExp_Explorer Exp(theF1, TopAbs_EDGE);
for (;Exp.More();Exp.Next())
{
const TopoDS_Shape& aCE = Exp.Current();
if (aCE.IsSame(theE))
{
anEOri = aCE.Orientation();
break;
}
}
for (Exp.Init(theF2, TopAbs_EDGE);Exp.More();Exp.Next())
{
const TopoDS_Shape& aCE = Exp.Current();
if (aCE.IsSame(theE))
{
if (aCE.Orientation() == TopAbs::Reverse(anEOri))
return Standard_True;
else
return Standard_False;
}
}
return Standard_False;
}
//=======================================================================
//function : AddOrdinaryEdges
//purpose : auxilary
@@ -1234,7 +1199,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
// unify faces in each shell separately
TopExp_Explorer exps;
for (exps.Init(myShape, TopAbs_SHELL); exps.More(); exps.Next())
IntUnifyFaces(exps.Current(), aGMapEdgeFaces, Standard_False);
IntUnifyFaces(exps.Current(), aGMapEdgeFaces);
// gather all faces out of shells in one compound and unify them at once
BRep_Builder aBB;
@@ -1245,7 +1210,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
aBB.Add(aCmp, exps.Current());
if (nbf > 0)
IntUnifyFaces(aCmp, aGMapEdgeFaces, Standard_True);
IntUnifyFaces(aCmp, aGMapEdgeFaces);
myShape = myContext->Apply(myShape);
}
@@ -1274,8 +1239,7 @@ static void SetFixWireModes(ShapeFix_Face& theSff)
//=======================================================================
void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape,
TopTools_IndexedDataMapOfShapeListOfShape& theGMapEdgeFaces,
Standard_Boolean IsCheckSharedEdgeOri)
TopTools_IndexedDataMapOfShapeListOfShape& theGMapEdgeFaces)
{
// creating map of edge faces for the shape
TopTools_IndexedDataMapOfShapeListOfShape aMapEdgeFaces;
@@ -1356,9 +1320,6 @@ void ShapeUpgrade_UnifySameDomain::IntUnifyFaces(const TopoDS_Shape& theInpShape
if (aProcessed.Contains(anCheckedFace))
continue;
if (IsCheckSharedEdgeOri && !CheckSharedEdgeOri(aFace, anCheckedFace, edge) )
continue;
if (bCheckNormals) {
// get normal of checked face using the same parameter on edge
gp_Dir aDN2;