OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

A fix by mzernova for OCCT bugs 33664 and 33755 (Salome issues 42465 and 42518

Browse Source
This commit is contained in:
jfa 2024-08-01 11:50:57 +01:00
parent 5b07844437
commit 1827edbc9a
1 changed files with 40 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/StdSelect/StdSelect_BRepSelectionTool.cxx
View File

@ -64,6 +64,12 @@
#define BVH_PRIMITIVE_LIMIT 800000 #define BVH_PRIMITIVE_LIMIT 800000
// The following flag can be used to enable optimization of cone/cylinder selection
// Unfortunately, this optimization is not stable and may lead to incorrect selection
// in some cases. It is disabled by default.
//#define OPTIMIZE_CONE_CYLINDER_SELECTION
//================================================== //==================================================
// function: PreBuildBVH // function: PreBuildBVH
// purpose : Pre-builds BVH tree for heavyweight // purpose : Pre-builds BVH tree for heavyweight
@ -561,29 +567,14 @@ void StdSelect_BRepSelectionTool::GetEdgeSensitive (const TopoDS_Shape& theShape
} }
} }
#ifdef OPTIMIZE_CONE_CYLINDER_SELECTION
//======================================================================= //=======================================================================
//function : getCylinderHeight //function : getCylinderCircles
//purpose : //purpose :
//======================================================================= //=======================================================================
static Standard_Real getCylinderHeight (const Handle(Poly_Triangulation)& theTriangulation, static NCollection_Sequence<gp_Circ> getCylinderCircles (const TopoDS_Face& theHollowCylinder)
const TopLoc_Location& theLoc)
{ {
Bnd_Box aBox; NCollection_Sequence<gp_Circ> aCircles;
gp_Trsf aScaleTrsf;
aScaleTrsf.SetScaleFactor (theLoc.Transformation().ScaleFactor());
theTriangulation->MinMax (aBox, aScaleTrsf);
return aBox.CornerMax().Z() - aBox.CornerMin().Z();
}
//=======================================================================
//function : isCylinderOrCone
//purpose :
//=======================================================================
static Standard_Boolean isCylinderOrCone (const TopoDS_Face& theHollowCylinder, const gp_Pnt& theLocation, gp_Dir& theDirection)
{
Standard_Integer aCirclesNb = 0;
Standard_Boolean isCylinder = Standard_False;
gp_Pnt aPos;
TopExp_Explorer anEdgeExp; TopExp_Explorer anEdgeExp;
for (anEdgeExp.Init (theHollowCylinder, TopAbs_EDGE); anEdgeExp.More(); anEdgeExp.Next()) for (anEdgeExp.Init (theHollowCylinder, TopAbs_EDGE); anEdgeExp.More(); anEdgeExp.Next())
@ -594,23 +585,13 @@ static Standard_Boolean isCylinderOrCone (const TopoDS_Face& theHollowCylinder,
if (anAdaptor.GetType() == GeomAbs_Circle if (anAdaptor.GetType() == GeomAbs_Circle
&& BRep_Tool::IsClosed (anEdge)) && BRep_Tool::IsClosed (anEdge))
{ {
aCirclesNb++; aCircles.Append (anAdaptor.Circle());
isCylinder = Standard_True;
if (aCirclesNb == 2)
{
// Reverse the direction of the cylinder, relevant if the cylinder was created as a prism
if (aPos.IsEqual (theLocation, Precision::Confusion()))
{
theDirection.Reverse();
}
return Standard_True;
}
aPos = anAdaptor.Circle().Location().XYZ();
} }
} }
return isCylinder; return aCircles;
} }
#endif /*OPTIMIZE_CONE_CYLINDER_SELECTION*/
//======================================================================= //=======================================================================
//function : GetSensitiveEntityForFace //function : GetSensitiveEntityForFace
@ -656,31 +637,35 @@ Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace (const TopoDS_
return Standard_True; return Standard_True;
} }
} }
#ifdef OPTIMIZE_CONE_CYLINDER_SELECTION
else if (Handle(Geom_ConicalSurface) aGeomCone = Handle(Geom_ConicalSurface)::DownCast (aSurf)) else if (Handle(Geom_ConicalSurface) aGeomCone = Handle(Geom_ConicalSurface)::DownCast (aSurf))
{ {
gp_Dir aDummyDir; NCollection_Sequence<gp_Circ> aCircles = getCylinderCircles (theFace);
if (isCylinderOrCone (theFace, gp_Pnt(), aDummyDir)) if (aCircles.Size() > 0)
{ {
const gp_Cone aCone = BRepAdaptor_Surface (theFace).Cone(); const gp_Cone aCone = BRepAdaptor_Surface (theFace).Cone();
const Standard_Real aRad1 = aCone.RefRadius();
const Standard_Real aHeight = getCylinderHeight (aTriangulation, aLoc);
gp_Trsf aTrsf; gp_Trsf aTrsf;
aTrsf.SetTransformation (aCone.Position(), gp::XOY()); Standard_Real aRad1;
Standard_Real aRad2; Standard_Real aRad2;
if (aRad1 == 0.0) Standard_Real aHeight;
if (aCircles.Size() == 1)
{ {
aRad2 = Tan (aCone.SemiAngle()) * aHeight; aRad1 = 0.0;
aRad2 = aCircles.First().Radius();
aHeight = aRad2 * Tan (aCone.SemiAngle());
aTrsf.SetTransformation (aCone.Position(), gp::XOY());
} }
else else
{ {
const Standard_Real aTriangleHeight = (aCone.SemiAngle() > 0.0) aRad1 = aCircles.First().Radius();
? aRad1 / Tan (aCone.SemiAngle()) aRad2 = aCircles.Last().Radius();
: aRad1 / Tan (Abs (aCone.SemiAngle())) - aHeight; aHeight = aCircles.First().Location().Distance (aCircles.Last().Location());
aRad2 = (aCone.SemiAngle() > 0.0)
? aRad1 * (aTriangleHeight + aHeight) / aTriangleHeight const gp_Pnt aPos = aCircles.First().Location();
: aRad1 * aTriangleHeight / (aTriangleHeight + aHeight); const gp_Dir aDirection (aCircles.Last().Location().XYZ() - aPos.XYZ());
aTrsf.SetTransformation (gp_Ax3(aPos, aDirection), gp::XOY());
} }
Handle(Select3D_SensitiveCylinder) aSensSCyl = new Select3D_SensitiveCylinder (theOwner, aRad1, aRad2, aHeight, aTrsf, true); Handle(Select3D_SensitiveCylinder) aSensSCyl = new Select3D_SensitiveCylinder (theOwner, aRad1, aRad2, aHeight, aTrsf, true);
@ -690,24 +675,25 @@ Standard_Boolean StdSelect_BRepSelectionTool::GetSensitiveForFace (const TopoDS_
} }
else if (Handle(Geom_CylindricalSurface) aGeomCyl = Handle(Geom_CylindricalSurface)::DownCast (aSurf)) else if (Handle(Geom_CylindricalSurface) aGeomCyl = Handle(Geom_CylindricalSurface)::DownCast (aSurf))
{ {
const gp_Cylinder aCyl = BRepAdaptor_Surface (theFace).Cylinder(); NCollection_Sequence<gp_Circ> aCircles = getCylinderCircles (theFace);
gp_Ax3 aPos = aCyl.Position(); if (aCircles.Size() == 2)
gp_Dir aDirection = aPos.Direction();
if (isCylinderOrCone (theFace, aPos.Location(), aDirection))
{ {
const gp_Cylinder aCyl = BRepAdaptor_Surface (theFace).Cylinder();
const Standard_Real aRad = aCyl.Radius(); const Standard_Real aRad = aCyl.Radius();
const Standard_Real aHeight = getCylinderHeight (aTriangulation, aLoc); const gp_Pnt aPos = aCircles.First().Location();
const gp_Dir aDirection (aCircles.Last().Location().XYZ() - aPos.XYZ());
const Standard_Real aHeight = aPos.Distance (aCircles.Last().Location());
gp_Trsf aTrsf; gp_Trsf aTrsf;
aPos.SetDirection (aDirection); aTrsf.SetTransformation (gp_Ax3 (aPos, aDirection), gp::XOY());
aTrsf.SetTransformation (aPos, gp::XOY());
Handle(Select3D_SensitiveCylinder) aSensSCyl = new Select3D_SensitiveCylinder (theOwner, aRad, aRad, aHeight, aTrsf, true); Handle(Select3D_SensitiveCylinder) aSensSCyl = new Select3D_SensitiveCylinder (theOwner, aRad, aRad, aHeight, aTrsf, true);
theSensitiveList.Append (aSensSCyl); theSensitiveList.Append (aSensSCyl);
return Standard_True; return Standard_True;
} }
} }
#endif /*OPTIMIZE_CONE_CYLINDER_SELECTION*/
else if (Handle(Geom_Plane) aGeomPlane = Handle(Geom_Plane)::DownCast (aSurf)) else if (Handle(Geom_Plane) aGeomPlane = Handle(Geom_Plane)::DownCast (aSurf))
{ {
TopTools_IndexedMapOfShape aSubfacesMap; TopTools_IndexedMapOfShape aSubfacesMap;