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

0033384: Modeling Algorithms - Now proximity depends on the shapes order

Browse Source
This commit is contained in:
jfa 2022-11-11 13:48:15 +03:00
parent 858dd02fed
commit bc7c542728
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
View File

@ -555,43 +555,11 @@ void BRepExtrema_ProximityValueTool::Perform(Standard_Real& theTolerance)
if (aProximityDist1 < 0.) if (aProximityDist1 < 0.)
return; return;
// max(min) dist from the 2nd shape to t he 1st one myDistance = aProximityDist1;
BVH_Vec3d aP2_1, aP2_2; myPnt1.SetCoord(aP1_1.x(), aP1_1.y(), aP1_1.z());
ProxPnt_Status aPointStatus2_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN; myPnt2.SetCoord(aP1_2.x(), aP1_2.y(), aP1_2.z());
ProxPnt_Status aPointStatus2_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN; myPntStatus1 = aPointStatus1_1;
myPntStatus2 = aPointStatus1_2;
Standard_Real aProximityDist2 = computeProximityDist(mySet2,
myNbSamples2,
myAddVertices2,
myAddStatus2,
mySet1,
myShapeList2,
myShapeList1,
aP2_2,
aP2_1,
aPointStatus2_2,
aPointStatus2_1);
if (aProximityDist2 < 0.)
return;
// min dist of the two max(min) dists
if (aProximityDist1 < aProximityDist2)
{
myDistance = aProximityDist1;
myPnt1.SetCoord(aP1_1.x(), aP1_1.y(), aP1_1.z());
myPnt2.SetCoord(aP1_2.x(), aP1_2.y(), aP1_2.z());
myPntStatus1 = aPointStatus1_1;
myPntStatus2 = aPointStatus1_2;
}
else
{
myDistance = aProximityDist2;
myPnt1.SetCoord(aP2_1.x(), aP2_1.y(), aP2_1.z());
myPnt2.SetCoord(aP2_2.x(), aP2_2.y(), aP2_2.z());
myPntStatus1 = aPointStatus2_1;
myPntStatus2 = aPointStatus2_2;
}
myIsDone = Standard_True; myIsDone = Standard_True;
theTolerance = myDistance; theTolerance = myDistance;
@ -615,4 +583,4 @@ NCollection_CellFilter_Action BRepExtrema_VertexInspector::Inspect(const Standar
myIsNeedAdd = Standard_False; myIsNeedAdd = Standard_False;
return CellFilter_Keep; return CellFilter_Keep;
} }