diff --git a/src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx b/src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx
index cd51510d76..5607617f18 100644
--- a/src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx
@@ -43,6 +43,8 @@ BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool()
//=======================================================================
BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
const Standard_Integer theNbSamples1,
+ const BVH_Array3d& theAddVertices1,
+ const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
const Handle(BRepExtrema_TriangleSet)& theSet2,
const BRepExtrema_ShapeList& theShapeList1,
const BRepExtrema_ShapeList& theShapeList2)
@@ -55,6 +57,7 @@ BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool (const Handle(BRepE
{
LoadTriangleSets (theSet1, theSet2);
LoadShapeLists (theShapeList1, theShapeList2);
+ LoadAdditionalPointsFirstSet (theAddVertices1, theAddStatus1);
}
//=======================================================================
@@ -69,7 +72,7 @@ void BRepExtrema_ProximityDistTool::LoadTriangleSets (const Handle(BRepExtrema_T
}
//=======================================================================
-//function : LoadTriangleSets
+//function : LoadShapeLists
//purpose : Loads the given list of subshapes into the proximity tool
//=======================================================================
void BRepExtrema_ProximityDistTool::LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
@@ -78,23 +81,33 @@ void BRepExtrema_ProximityDistTool::LoadShapeLists (const BRepExtrema_ShapeList&
myShapeList1 = theShapeList1;
myShapeList2 = theShapeList2;
}
-//=======================================================================
-//function : Perform
-//purpose : Performs searching of the proximity distance
-//=======================================================================
-void BRepExtrema_ProximityDistTool::Perform()
-{
- SetBVHSet (mySet2.get());
- const BVH_Array3d& aVertices1 = mySet1->GetVertices();
- Standard_Integer aVtxSize = (Standard_Integer)aVertices1.size();
+//=======================================================================
+//function : LoadAdditionalPointsFirstSet
+//purpose : Loads given additional vertices and their statuses
+//=======================================================================
+void BRepExtrema_ProximityDistTool::LoadAdditionalPointsFirstSet (const BVH_Array3d& theAddVertices1,
+ const NCollection_Vector<ProxPnt_Status>& theAddStatus1)
+{
+ myAddVertices1 = theAddVertices1;
+ myAddStatus1 = theAddStatus1;
+}
+
+//=======================================================================
+//function : goThroughtSet1
+//purpose : Goes throught vertices from the 1st set
+//=======================================================================
+void BRepExtrema_ProximityDistTool::goThroughtSet1 (const BVH_Array3d& theVertices1,
+ const Standard_Boolean theIsAdditionalSet)
+{
+ Standard_Integer aVtxSize = (Standard_Integer)theVertices1.size();
Standard_Integer aVtxStep = Max (myNbSamples1 <= 0 ? 1 : aVtxSize / myNbSamples1, 1);
for (Standard_Integer aVtxIdx = 0; aVtxIdx < aVtxSize; aVtxIdx += aVtxStep)
{
myDistance = std::numeric_limits<Standard_Real>::max();
myMinDistance = std::numeric_limits<Standard_Real>::max();
myIsDone = Standard_False;
- SetObject (aVertices1[aVtxIdx]);
+ SetObject (theVertices1[aVtxIdx]);
ComputeDistance();
@@ -102,20 +115,31 @@ void BRepExtrema_ProximityDistTool::Perform()
if (IsDone() && myDistance > myProxDist)
{
- myPnt1 = aVertices1[aVtxIdx];
+ myPnt1 = theVertices1[aVtxIdx];
myPnt2 = myExtremaPoint;
myProxDist = myDistance;
myProxVtxIdx1 = aVtxIdx;
+ myIsProxVtx1FromAddSet = theIsAdditionalSet;
myProxPrjState = myExtPrjState;
}
}
+}
- myIsDone = myProxDist > -1.;
+//=======================================================================
+//function : Perform
+//purpose : Performs searching of the proximity distance
+//=======================================================================
+void BRepExtrema_ProximityDistTool::Perform()
+{
+ SetBVHSet (mySet2.get());
+ goThroughtSet1 (mySet1->GetVertices(), Standard_False);
+ goThroughtSet1 (myAddVertices1, Standard_True);
- if (myIsDone)
- {
- DefineStatusProxPnt();
- }
+ myIsDone = myProxDist > -1.;
+ if (myIsDone)
+ {
+ DefineStatusProxPnt();
+ }
}
static Standard_Real pointBoxSquareMaxDistance (const BVH_Vec3d& thePoint,
@@ -247,7 +271,12 @@ Standard_Real BRepExtrema_ProximityDistTool::ComputeDistance()
return myDistance;
}
-static Standard_Boolean isNodeOnBorder (const Standard_Integer theNodeIdx, const Handle (Poly_Triangulation)& theTr)
+//=======================================================================
+//function : IsNodeOnBorder
+//purpose : Returns true if the node is on the boarder
+//=======================================================================
+Standard_Boolean BRepExtrema_ProximityDistTool::IsNodeOnBorder (const Standard_Integer theNodeIdx,
+ const Handle(Poly_Triangulation)& theTr)
{
Poly_Connect aPolyConnect (theTr);
@@ -279,12 +308,49 @@ static Standard_Boolean isNodeOnBorder (const Standard_Integer theNodeIdx, const
return Standard_False;
}
+//=======================================================================
+//function : IsEdgeOnBorder
+//purpose : Returns true if the edge is on the boarder
+//=======================================================================
+Standard_Boolean BRepExtrema_ProximityDistTool::IsEdgeOnBorder (const Standard_Integer theTrgIdx,
+ const Standard_Integer theFirstEdgeNodeIdx,
+ const Standard_Integer theSecondEdgeNodeIdx,
+ const Handle(Poly_Triangulation)& theTr)
+{
+ Poly_Connect aPolyConnect (theTr);
+
+ Standard_Integer aAdjTrg[3];
+ aPolyConnect.Triangles (theTrgIdx, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
+
+ for (Standard_Integer j = 0; j < 3; j++)
+ {
+ Standard_Integer k = (j + 1) % 3;
+ if (aAdjTrg[j] == 0) //free segment of triangle
+ {
+ //are ends of free segment and it is a part of border
+ if (j == theFirstEdgeNodeIdx &&
+ k == theSecondEdgeNodeIdx)
+ {
+ return Standard_True;
+ }
+ }
+ }
+
+ return Standard_False;
+}
+
//=======================================================================
//function : defineStatusProxPnt1
//purpose : Defines the status of proximity point from 1st BVH
//=======================================================================
void BRepExtrema_ProximityDistTool::defineStatusProxPnt1()
{
+ if (myIsProxVtx1FromAddSet)
+ {
+ myPntStatus1 = myAddStatus1[myProxVtxIdx1];
+ return;
+ }
+
Standard_Integer aFaceID1 = mySet1->GetShapeIDOfVtx (myProxVtxIdx1);
if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_EDGE)
@@ -314,9 +380,9 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt1()
TopLoc_Location aLocation;
const TopoDS_Face& aF = TopoDS::Face (myShapeList1 (aFaceID1));
- Handle (Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
+ Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
- if (isNodeOnBorder (aNodeIdx, aTr))
+ if (IsNodeOnBorder (aNodeIdx, aTr))
{
myPntStatus1 = ProxPnt_Status_BORDER;
}
@@ -398,7 +464,7 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
{
TopLoc_Location aLocation;
const TopoDS_Face& aF = TopoDS::Face (myShapeList2 (aFaceID2));
- Handle (Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
+ Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
NCollection_Array1<Standard_Integer> aVtxIndicesOfTrg;
mySet2->GetVtxIndices (aTrgIdx, aVtxIndicesOfTrg);
@@ -408,7 +474,7 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
Standard_Integer aNodeNum = myProxPrjState.GetNumberOfFirstNode();
Standard_Integer aNodeIdx = mySet2->GetVtxIdxInShape (aVtxIndicesOfTrg[aNodeNum]) + 1;
- if (isNodeOnBorder (aNodeIdx, aTr))
+ if (IsNodeOnBorder (aNodeIdx, aTr))
{
myPntStatus2 = ProxPnt_Status_BORDER;
}
@@ -419,27 +485,18 @@ void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
}
else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
{
- myPntStatus2 = ProxPnt_Status_MIDDLE;
-
- Poly_Connect aPolyConnect (aTr);
Standard_Integer aTrgIdxInShape = mySet2->GetTrgIdxInShape (aTrgIdx) + 1;
- Standard_Integer aAdjTrg[3];
- aPolyConnect.Triangles (aTrgIdxInShape, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
-
- for (Standard_Integer j = 0; j < 3; j++)
+ if (IsEdgeOnBorder (aTrgIdxInShape,
+ myProxPrjState.GetNumberOfFirstNode(),
+ myProxPrjState.GetNumberOfLastNode(),
+ aTr))
{
- Standard_Integer k = (j + 1) % 3;
- if (aAdjTrg[j] == 0) //free segment of triangle
- {
- //aVtxIndicesOfTrg[j] and aVtxIndicesOfTrg[k] are ends of free segment and it is a part of border
- if (j == myProxPrjState.GetNumberOfFirstNode() &&
- k == myProxPrjState.GetNumberOfLastNode())
- {
- myPntStatus2 = ProxPnt_Status_BORDER;
- break;
- }
- }
+ myPntStatus2 = ProxPnt_Status_BORDER;
+ }
+ else
+ {
+ myPntStatus2 = ProxPnt_Status_MIDDLE;
}
} //else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
}
diff --git a/src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx b/src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx
index 3739fff1ad..da6d5de076 100644
--- a/src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx
@@ -21,6 +21,7 @@
#include <BRepExtrema_TriangleSet.hxx>
#include <BVH_Distance.hxx>
#include <BVH_Tools.hxx>
+#include <Poly_Triangulation.hxx>
//! Tool class for computation the proximity distance from first
//! primitive set to second one that is the maximal from minimum
@@ -93,6 +94,8 @@ public:
//! Creates new tool for the given element sets.
Standard_EXPORT BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
const Standard_Integer theNbSamples1,
+ const BVH_Array3d& theAddVertices1,
+ const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
const Handle(BRepExtrema_TriangleSet)& theSet2,
const BRepExtrema_ShapeList& theShapeList1,
const BRepExtrema_ShapeList& theShapeList2);
@@ -107,6 +110,10 @@ public:
Standard_EXPORT void LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
const BRepExtrema_ShapeList& theShapeList2);
+ //! Loads given additional vertices and their statuses.
+ void LoadAdditionalPointsFirstSet (const BVH_Array3d& theAddVertices1,
+ const NCollection_Vector<ProxPnt_Status>& theAddStatus1);
+
//! Performs searching of the proximity distance.
Standard_EXPORT void Perform();
@@ -121,6 +128,20 @@ public: //! @name Reject/Accept implementations
Standard_EXPORT virtual Standard_Boolean Accept (const Standard_Integer theSgmIdx,
const Standard_Real&) Standard_OVERRIDE;
+public:
+
+ //! Returns true if the node is on the boarder.
+ Standard_EXPORT static Standard_Boolean IsNodeOnBorder (const Standard_Integer theNodeIdx,
+ const Handle (Poly_Triangulation)& theTr);
+
+ //! Returns true if the edge is on the boarder.
+ Standard_EXPORT static Standard_Boolean IsEdgeOnBorder (const Standard_Integer theTrgIdx,
+ const Standard_Integer theFirstEdgeNodeIdx,
+ const Standard_Integer theSecondEdgeNodeIdx,
+ const Handle (Poly_Triangulation)& theTr);
+
+public:
+
//! Returns points on triangles sets, which provide the proximity distance.
void ProximityPoints (BVH_Vec3d& thePoint1, BVH_Vec3d& thePoint2) const
{
@@ -148,6 +169,10 @@ protected:
private:
+ //! Goes throught vertices from the 1st set.
+ void goThroughtSet1 (const BVH_Array3d& aVertices1,
+ const Standard_Boolean theIsAdditionalSet);
+
//! Defines the status of proximity point from 1st BVH.
void defineStatusProxPnt1();
@@ -183,6 +208,11 @@ private:
Standard_Integer myNbSamples1; //!< Number of samples points on the first shape
+ //! Is vertex corresponding to proximity point of 1st shape from additional set
+ Standard_Integer myIsProxVtx1FromAddSet;
+ BVH_Array3d myAddVertices1; //!< Additional vertices on the 1st shape
+ NCollection_Vector<ProxPnt_Status> myAddStatus1; //!< Status of additional vertices on the 1st shape
+
//! Vertex index from 1st BVH corresponding to proximity point of 1st shape
Standard_Integer myProxVtxIdx1;
diff --git a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
index a816be8b8f..66a2bd1d4f 100644
--- a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
@@ -1,4 +1,4 @@
-// Created on: 2022-08-08
+// Created on: 2022-08-08
// Created by: Kseniya NOSULKO
// Copyright (c) 2022 OPEN CASCADE SAS
//
@@ -14,17 +14,32 @@
// commercial license or contractual agreement.
#include <BRepExtrema_ProximityValueTool.hxx>
+#include <BRepExtrema_ProximityDistTool.hxx>
+
+#include <BRep_Tool.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <BRepGProp.hxx>
+#include <GCPnts_AbscissaPoint.hxx>
+#include <GCPnts_QuasiUniformAbscissa.hxx>
+#include <GProp_GProps.hxx>
+#include <Poly_Connect.hxx>
+#include <TopoDS.hxx>
//=======================================================================
//function : BRepExtrema_ProximityValueTool
//purpose : Creates new unitialized proximity tool
//=======================================================================
BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool()
-: myDistance (std::numeric_limits<Standard_Real>::max()),
+: myIsRefinementRequired1 (Standard_False),
+ myIsRefinementRequired2 (Standard_False),
+ myDistance (std::numeric_limits<Standard_Real>::max()),
myIsDone (Standard_False),
myNbSamples1(0),
myNbSamples2(0)
-{}
+{
+ // Should be initialized later
+ myIsInitS1 = myIsInitS2 = Standard_False;
+}
//=======================================================================
//function : BRepExtrema_ProximityValueTool
@@ -34,13 +49,15 @@ BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool (const Handle(BRe
const Handle(BRepExtrema_TriangleSet)& theSet2,
const BRepExtrema_ShapeList& theShapeList1,
const BRepExtrema_ShapeList& theShapeList2)
-: myDistance (std::numeric_limits<Standard_Real>::max()),
+: myIsRefinementRequired1 (Standard_False),
+ myIsRefinementRequired2 (Standard_False),
+ myDistance (std::numeric_limits<Standard_Real>::max()),
myIsDone (Standard_False),
- myNbSamples1(0),
- myNbSamples2(0)
+ myNbSamples1 (0),
+ myNbSamples2 (0)
{
- LoadTriangleSets (theSet1, theSet2);
LoadShapeLists (theShapeList1, theShapeList2);
+ LoadTriangleSets (theSet1, theSet2);
}
//=======================================================================
@@ -53,7 +70,94 @@ void BRepExtrema_ProximityValueTool::LoadTriangleSets (const Handle(BRepExtrema_
mySet1 = theSet1;
mySet2 = theSet2;
- myIsDone = Standard_False;
+ MarkDirty();
+}
+
+//=======================================================================
+//function : calcEdgeRefinementStep
+//purpose : Calculates the edge refinement step
+//=======================================================================
+static Standard_Real calcEdgeRefinementStep (const TopoDS_Edge& theEdge,
+ const Standard_Integer theNbNodes)
+{
+ if (theNbNodes < 2)
+ return 0;
+
+ BRepAdaptor_Curve aBAC (theEdge);
+ Standard_Real aLen = GCPnts_AbscissaPoint::Length (aBAC);
+ return aLen / (Standard_Real)(theNbNodes - 1);
+}
+
+//=======================================================================
+//function : calcFaceRefinementStep
+//purpose : Calculates the face refinement step as an approximate square
+// (Shape area / number triangles) * 2
+//=======================================================================
+static Standard_Real calcFaceRefinementStep (const TopoDS_Face& theFace,
+ const Standard_Integer theNbTrg)
+{
+ if (theNbTrg < 1)
+ return 0;
+
+ GProp_GProps props;
+ BRepGProp::SurfaceProperties (theFace, props);
+ Standard_Real aArea = props.Mass();
+ return 2 * (aArea / (Standard_Real)theNbTrg);
+}
+
+//=======================================================================
+//function : getInfoForRefinement
+//purpose : Gets shape data for further refinement
+//=======================================================================
+Standard_Boolean BRepExtrema_ProximityValueTool::getInfoForRefinement (const TopoDS_Shape& theShape,
+ TopAbs_ShapeEnum& theShapeType,
+ Standard_Integer& theNbNodes,
+ Standard_Real& theStep)
+{
+ if (theShape.ShapeType() == TopAbs_FACE)
+ {
+ theShapeType = TopAbs_FACE;
+ TopoDS_Face aF = TopoDS::Face (theShape);
+
+ TopLoc_Location aLocation;
+ Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aF, aLocation);
+
+ if (aTriangulation.IsNull())
+ {
+ return Standard_False;
+ }
+
+ theNbNodes = aTriangulation->NbNodes();
+ Standard_Integer aNbTrg = aTriangulation->NbTriangles();
+ theStep = calcFaceRefinementStep (aF, aNbTrg);
+ }
+ else if (theShape.ShapeType() == TopAbs_EDGE)
+ {
+ theShapeType = TopAbs_EDGE;
+ TopoDS_Edge aE = TopoDS::Edge (theShape);
+
+ TopLoc_Location aLocation;
+ Handle(Poly_Polygon3D) aPolygon = BRep_Tool::Polygon3D (aE, aLocation);
+
+ if (aPolygon.IsNull())
+ {
+ return Standard_False;
+ }
+
+ theNbNodes = aPolygon->NbNodes();
+ theStep = calcEdgeRefinementStep (aE, theNbNodes);
+ }
+ else
+ {
+ return Standard_False;
+ }
+
+ if (theStep < Precision::Confusion())
+ {
+ return Standard_False;
+ }
+
+ return Standard_True;
}
//=======================================================================
@@ -66,7 +170,13 @@ void BRepExtrema_ProximityValueTool::LoadShapeLists (const BRepExtrema_ShapeList
myShapeList1 = theShapeList1;
myShapeList2 = theShapeList2;
- myIsDone = Standard_False;
+ myShape1 = theShapeList1 (0);
+ myIsInitS1 = getInfoForRefinement (myShape1, myShapeType1, myNbNodes1, myStep1);
+
+ myShape2 = theShapeList2 (0);
+ myIsInitS2 = getInfoForRefinement (myShape2, myShapeType2, myNbNodes2, myStep2);
+
+ MarkDirty();
}
//=======================================================================
@@ -79,7 +189,7 @@ void BRepExtrema_ProximityValueTool::SetNbSamplePoints(const Standard_Integer th
myNbSamples1 = theSamples1;
myNbSamples2 = theSamples2;
- myIsDone = Standard_False;
+ MarkDirty();
}
//=======================================================================
@@ -88,6 +198,8 @@ void BRepExtrema_ProximityValueTool::SetNbSamplePoints(const Standard_Integer th
//=======================================================================
Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
const Standard_Integer theNbSamples1,
+ const BVH_Array3d& theAddVertices1,
+ const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
const Handle(BRepExtrema_TriangleSet)& theSet2,
const BRepExtrema_ShapeList& theShapeList1,
const BRepExtrema_ShapeList& theShapeList2,
@@ -96,7 +208,8 @@ Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle
ProxPnt_Status& thePointStatus1,
ProxPnt_Status& thePointStatus2) const
{
- BRepExtrema_ProximityDistTool aProxDistTool (theSet1, theNbSamples1, theSet2, theShapeList1, theShapeList2);
+ BRepExtrema_ProximityDistTool aProxDistTool (theSet1, theNbSamples1, theAddVertices1, theAddStatus1,
+ theSet2, theShapeList1, theShapeList2);
aProxDistTool.Perform();
if (!aProxDistTool.IsDone())
@@ -108,21 +221,311 @@ Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle
return aProxDistTool.ProximityDistance();
}
+//=======================================================================
+//function : getEdgeAdditionalVertices
+//purpose : Gets additional vertices and their statuses on the edge with the input step
+//=======================================================================
+Standard_Boolean BRepExtrema_ProximityValueTool::getEdgeAdditionalVertices (
+ const TopoDS_Edge& theEdge,
+ const Standard_Real theStep,
+ BVH_Array3d& theAddVertices,
+ NCollection_Vector<ProxPnt_Status>& theAddStatuses)
+{
+ BRepAdaptor_Curve aBAC (theEdge);
+
+ if (!aBAC.Is3DCurve() || theStep < Precision::Confusion())
+ {
+ return Standard_False;
+ }
+
+ Standard_Real aLen = GCPnts_AbscissaPoint::Length (aBAC);
+ Standard_Integer aNbSamplePoints = (Standard_Integer) (aLen / theStep) + 1;
+
+ GCPnts_QuasiUniformAbscissa aGCPnts (aBAC, Max (3, aNbSamplePoints));
+
+ if (!aGCPnts.IsDone())
+ return Standard_False;
+
+ Standard_Integer aNbNodes = aGCPnts.NbPoints();
+ for (Standard_Integer aVertIdx = 2; aVertIdx < aNbNodes; ++aVertIdx) //don't add extreme points
+ {
+ Standard_Real aPar = aGCPnts.Parameter (aVertIdx);
+ gp_Pnt aP = aBAC.Value (aPar);
+
+ theAddVertices.push_back (BVH_Vec3d (aP.X(), aP.Y(), aP.Z()));
+ theAddStatuses.Append (ProxPnt_Status::ProxPnt_Status_MIDDLE);
+ }
+
+ return Standard_True;
+}
+
+//=======================================================================
+//function : doRecurTrgSplit
+//purpose : Splits the triangle into two ones recursively, halving the longest side
+// untill the area of the current triangle > input step
+//! @param theTrg points of the triangle to be splitted
+//! @param theEdgesStatus status of triangle edges - on the border or middle of the face
+//! @param theTol telerance used in search of coincidence points
+//! @param theStep minimum area of the resulting triangle
+//! @param theAddVertices vertices obtained halving sides
+//! @param theAddStatuses status of obtained vertices - on the border or middle of the face,
+//! from triangulation of which the input triangle is
+//=======================================================================
+void BRepExtrema_ProximityValueTool::doRecurTrgSplit (const gp_Pnt (&theTrg)[3],
+ const ProxPnt_Status (&theEdgesStatus)[3],
+ const Standard_Real theTol,
+ const Standard_Real theStep,
+ BVH_Array3d& theAddVertices,
+ NCollection_Vector<ProxPnt_Status>& theAddStatuses)
+{
+ gp_XYZ aTrgSide1 = theTrg[1].Coord() - theTrg[0].Coord();
+ gp_XYZ aTrgSide2 = theTrg[2].Coord() - theTrg[0].Coord();
+ Standard_Real aTrgArea = 0.5 * aTrgSide1.CrossMagnitude (aTrgSide2);
+
+ if (aTrgArea - theStep < Precision::SquareConfusion())
+ return;
+
+ Standard_Real aD[3] { theTrg[0].Distance (theTrg[1]),
+ theTrg[1].Distance (theTrg[2]),
+ theTrg[2].Distance (theTrg[0]) };
+ Standard_Integer aBisectedEdgeIdx = aD[0] > aD[1] ? (aD[0] > aD[2] ? 0 : 2) : (aD[1] > aD[2] ? 1 : 2);
+ gp_Pnt aCenterOfMaxSide (theTrg[aBisectedEdgeIdx].Coord());
+ aCenterOfMaxSide.BaryCenter (0.5, theTrg[(aBisectedEdgeIdx + 1) % 3], 0.5);
+
+ Bnd_Box aBox;
+ aBox.Add (aCenterOfMaxSide);
+ aBox.Enlarge (theTol);
+ myInspector.SetCurrent (aCenterOfMaxSide.Coord());
+ myCells.Inspect (aBox.CornerMin().XYZ(), aBox.CornerMax().XYZ(), myInspector);
+
+ if (myInspector.IsNeedAdd()) //is point aCenterOfMaxSide unique
+ {
+ BVH_Vec3d aBisectingPnt (aCenterOfMaxSide.X(), aCenterOfMaxSide.Y(), aCenterOfMaxSide.Z());
+ theAddVertices.push_back (aBisectingPnt);
+ theAddStatuses.Append (theEdgesStatus[aBisectedEdgeIdx]);
+ myInspector.Add (aCenterOfMaxSide.Coord());
+ myCells.Add (static_cast<BRepExtrema_VertexInspector::Target>(theAddVertices.size()),
+ aBox.CornerMin().XYZ(), aBox.CornerMax().XYZ());
+ }
+
+ gp_Pnt aTrg1[3] = { theTrg[0], theTrg[1], theTrg[2] };
+ gp_Pnt aTrg2[3] = { theTrg[0], theTrg[1], theTrg[2] };
+ ProxPnt_Status aEdgesStatus1[3] = { theEdgesStatus[0], theEdgesStatus[1], theEdgesStatus[2] };
+ ProxPnt_Status aEdgesStatus2[3] = { theEdgesStatus[0], theEdgesStatus[1], theEdgesStatus[2] };
+ switch (aBisectedEdgeIdx)
+ {
+ case 0:
+ aTrg1[0] = aTrg2[1] = aCenterOfMaxSide;
+ aEdgesStatus1[2] = aEdgesStatus2[1] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
+ break;
+ case 1:
+ aTrg1[1] = aTrg2[2] = aCenterOfMaxSide;
+ aEdgesStatus1[0] = aEdgesStatus2[2] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
+ break;
+ case 2:
+ aTrg1[2] = aTrg2[0] = aCenterOfMaxSide;
+ aEdgesStatus1[1] = aEdgesStatus2[0] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
+ break;
+ }
+
+ doRecurTrgSplit (aTrg1, aEdgesStatus1, theTol, theStep, theAddVertices, theAddStatuses);
+ doRecurTrgSplit (aTrg2, aEdgesStatus2, theTol, theStep, theAddVertices, theAddStatuses);
+}
+
+static Standard_Real getModelRange (const TopLoc_Location& theLocation,
+ const Handle(Poly_Triangulation)& theTr)
+{
+ Bnd_Box aBox;
+ theTr->MinMax (aBox, theLocation.Transformation());
+ Standard_Real aXm = 0.0, aYm = 0.0, aZm = 0.0, aXM = 0.0, aYM = 0.0, aZM = 0.0;
+ aBox.Get (aXm, aYm, aZm, aXM, aYM, aZM);
+ Standard_Real aRange = aXM - aXm;
+ aRange = Max (aRange, aYM - aYm);
+ aRange = Max (aRange, aZM - aZm);
+
+ return aRange;
+}
+
+static void getNodesOfTrg (const Standard_Integer theTriIdx,
+ const TopLoc_Location& theLocation,
+ const Handle (Poly_Triangulation)& theTr,
+ gp_Pnt (&theTrg)[3])
+{
+ Standard_Integer aVtxIdx1;
+ Standard_Integer aVtxIdx2;
+ Standard_Integer aVtxIdx3;
+
+ theTr->Triangle (theTriIdx).Get (aVtxIdx1, aVtxIdx2, aVtxIdx3);
+
+ gp_Pnt aVtx1 = theTr->Node (aVtxIdx1);
+ aVtx1.Transform (theLocation);
+ theTrg[0] = aVtx1;
+
+ gp_Pnt aVtx2 = theTr->Node (aVtxIdx2);
+ aVtx2.Transform (theLocation);
+ theTrg[1] = aVtx2;
+
+ gp_Pnt aVtx3 = theTr->Node (aVtxIdx3);
+ aVtx3.Transform (theLocation);
+ theTrg[2] = aVtx3;
+}
+
+// Gets status of triangle edges - on the border or middle of the face
+static void getEdgesStatus(const Standard_Integer theTriIdx,
+ const Handle(Poly_Triangulation)& theTr,
+ ProxPnt_Status (&theEdgesStatus1)[3])
+{
+ for (Standard_Integer j = 0; j < 3; j++)
+ {
+ Standard_Integer k = (j + 1) % 3;
+
+ if (BRepExtrema_ProximityDistTool::IsEdgeOnBorder (theTriIdx, j, k, theTr))
+ {
+ theEdgesStatus1[j] = ProxPnt_Status::ProxPnt_Status_BORDER;
+ }
+ else
+ {
+ theEdgesStatus1[j] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
+ }
+ }
+}
+
+//=======================================================================
+//function : getFaceAdditionalVertices
+//purpose : Gets additional vertices and their statuses on the face with the input step (triangle square)
+//=======================================================================
+Standard_Boolean BRepExtrema_ProximityValueTool::getFaceAdditionalVertices (
+ const TopoDS_Face& theFace,
+ const Standard_Real theStep,
+ BVH_Array3d& theAddVertices,
+ NCollection_Vector<ProxPnt_Status>& theAddStatuses)
+{
+ Standard_Real aTol = Precision::Confusion();
+
+ TopLoc_Location aLocation;
+ Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (theFace, aLocation);
+
+ if (aTr.IsNull())
+ {
+ return Standard_False;
+ }
+
+ myCells.Reset (Max (aTol, getModelRange (aLocation, aTr) / IntegerLast()));
+
+ for (Standard_Integer aTriIdx = 1; aTriIdx <= aTr->NbTriangles(); ++aTriIdx)
+ {
+ gp_Pnt aTrg[3];
+ ProxPnt_Status aEdgesStatus[3];
+ getNodesOfTrg (aTriIdx, aLocation, aTr, aTrg);
+ getEdgesStatus (aTriIdx, aTr, aEdgesStatus);
+ doRecurTrgSplit (aTrg, aEdgesStatus, aTol, theStep, theAddVertices, theAddStatuses);
+ }
+
+ return Standard_True;
+}
+
+//=======================================================================
+//function : getShapesVertices
+//purpose : Gets additional vertices on shapes with refining a coarser one if it's needed
+//=======================================================================
+Standard_Boolean BRepExtrema_ProximityValueTool::getShapesAdditionalVertices()
+{
+ // estimate the density of meshes of shapes to add points to a coarcer one
+ // target steps for refinement
+ Standard_Real aStep1 = myStep1;
+ Standard_Real aStep2 = myStep2;
+
+ if ((myShapeType1 == TopAbs_EDGE) && (myShapeType2 == TopAbs_EDGE))
+ {
+ if (myNbSamples1 > myNbNodes1) // 1st edge needs refinement
+ {
+ aStep1 = calcEdgeRefinementStep (TopoDS::Edge (myShape1), myNbSamples1);
+ myIsRefinementRequired1 = Standard_True;
+ }
+
+ if (myNbSamples2 > myNbNodes2) // 2nd edge needs refinement
+ {
+ aStep2 = calcEdgeRefinementStep (TopoDS::Edge (myShape2), myNbSamples2);
+ myIsRefinementRequired2 = Standard_True;
+ }
+
+ if (aStep1 / aStep2 > 2.) // 1st edge needs refinement
+ {
+ myIsRefinementRequired1 = Standard_True;
+ aStep1 = aStep2;
+ }
+ else if (aStep2 / aStep1 > 2.) // 2nd edge needs refinement
+ {
+ myIsRefinementRequired2 = Standard_True;
+ aStep2 = aStep1;
+ }
+
+ if (myIsRefinementRequired1)
+ {
+ if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape1), aStep1, myAddVertices1, myAddStatus1))
+ {
+ return Standard_False;
+ }
+ }
+
+ if (myIsRefinementRequired2)
+ {
+ if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape2), aStep2, myAddVertices2, myAddStatus2))
+ {
+ return Standard_False;
+ }
+ }
+ }
+ else if ((myShapeType1 == TopAbs_FACE) && (myShapeType2 == TopAbs_FACE))
+ {
+ if (aStep1 / aStep2 > 2) // 1st face needs refinement
+ {
+ myIsRefinementRequired1 = Standard_True;
+ aStep1 = myStep2;
+ }
+ else if (aStep2 / aStep1 > 2.) // 2nd face needs refinement
+ {
+ myIsRefinementRequired2 = Standard_True;
+ aStep2 = myStep1;
+ }
+
+ if (myIsRefinementRequired1)
+ {
+ return getFaceAdditionalVertices (TopoDS::Face (myShape1), aStep1, myAddVertices1, myAddStatus1);
+ }
+
+ if (myIsRefinementRequired2)
+ {
+ return getFaceAdditionalVertices (TopoDS::Face (myShape2), aStep2, myAddVertices2, myAddStatus2);
+ }
+ }
+
+ return Standard_True;
+}
+
//=======================================================================
//function : Perform
//purpose : Performs the computation of the proximity value
//=======================================================================
void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
{
- myIsDone = Standard_False;
+ if (!myIsInitS1 || !myIsInitS2 || (myShapeType1 != myShapeType2))
+ return;
+
+ //get vertices on shapes with refining a coarser mesh if it's needed
+ if (!getShapesAdditionalVertices())
+ return;
// max(min) dist from the 1st shape to the 2nd one
BVH_Vec3d aP1_1, aP1_2;
ProxPnt_Status aPointStatus1_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
ProxPnt_Status aPointStatus1_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
- Standard_Real aProximityDist1 = computeProximityDist (mySet1, myNbSamples1, mySet2, myShapeList1, myShapeList2,
- aP1_1, aP1_2, aPointStatus1_1, aPointStatus1_2);
+ Standard_Real aProximityDist1 = computeProximityDist (mySet1, myNbSamples1, myAddVertices1, myAddStatus1,
+ mySet2,
+ myShapeList1, myShapeList2,
+ aP1_1, aP1_2,
+ aPointStatus1_1, aPointStatus1_2);
if (aProximityDist1 < 0.)
return;
@@ -132,8 +535,11 @@ void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
ProxPnt_Status aPointStatus2_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
ProxPnt_Status aPointStatus2_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
- Standard_Real aProximityDist2 = computeProximityDist (mySet2, myNbSamples2, mySet1, myShapeList2, myShapeList1,
- aP2_2, aP2_1, aPointStatus2_2, aPointStatus2_1);
+ Standard_Real aProximityDist2 = computeProximityDist (mySet2, myNbSamples2, myAddVertices2, myAddStatus2,
+ mySet1,
+ myShapeList2, myShapeList1,
+ aP2_2, aP2_1,
+ aPointStatus2_2, aPointStatus2_1);
if (aProximityDist2 < 0.)
return;
@@ -159,3 +565,23 @@ void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
myIsDone = Standard_True;
theTolerance = myDistance;
}
+
+//=======================================================================
+//function : Inspect
+//purpose : Used for selection and storage of coinciding nodes
+//=======================================================================
+NCollection_CellFilter_Action BRepExtrema_VertexInspector::Inspect (const Standard_Integer theTarget)
+{
+ myIsNeedAdd = Standard_True;
+
+ const gp_XYZ& aPnt = myPoints.Value (theTarget - 1);
+ Standard_Real aDx, aDy, aDz;
+ aDx = myCurrent.X() - aPnt.X();
+ aDy = myCurrent.Y() - aPnt.Y();
+ aDz = myCurrent.Z() - aPnt.Z();
+
+ if ((aDx * aDx <= myTol) && (aDy * aDy <= myTol) && (aDz * aDz <= myTol))
+ myIsNeedAdd = Standard_False;
+
+ return CellFilter_Keep;
+}
\ No newline at end of file
diff --git a/src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx b/src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx
index 09610c8d92..ca65c28104 100644
--- a/src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx
@@ -1,4 +1,4 @@
-// Created on: 2022-08-08
+// Created on: 2022-08-08
// Created by: Kseniya NOSULKO
// Copyright (c) 2022 OPEN CASCADE SAS
//
@@ -18,9 +18,67 @@
#include <BRepExtrema_ProximityDistTool.hxx>
#include <BRepExtrema_TriangleSet.hxx>
+#include <NCollection_CellFilter.hxx>
+#include <Precision.hxx>
+
+typedef NCollection_Vector<gp_XYZ> VectorOfPoint;
+
+//! Class BRepExtrema_VertexInspector
+//! derived from NCollection_CellFilter_InspectorXYZ
+//! This class define the Inspector interface for CellFilter algorithm,
+//! working with gp_XYZ points in 3d space.
+//! Used in search of coincidence points with a certain tolerance.
+class BRepExtrema_VertexInspector : public NCollection_CellFilter_InspectorXYZ
+{
+public:
+ typedef Standard_Integer Target;
+
+ //! Constructor; remembers the tolerance
+ BRepExtrema_VertexInspector()
+ : myTol (Precision::SquareConfusion()),
+ myIsNeedAdd (Standard_True)
+ {}
+
+ //! Keep the points used for comparison
+ void Add (const gp_XYZ& thePnt)
+ {
+ myPoints.Append (thePnt);
+ }
+
+ //! Set tolerance for comparison of point coordinates
+ void SetTol (const Standard_Real theTol)
+ {
+ myTol = theTol;
+ }
+
+ //! Set current point to search for coincidence
+ void SetCurrent (const gp_XYZ& theCurPnt)
+ {
+ myCurrent = theCurPnt;
+ myIsNeedAdd = Standard_True;
+ }
+
+ Standard_Boolean IsNeedAdd()
+ {
+ return myIsNeedAdd;
+ }
+
+ //! Implementation of inspection method
+ Standard_EXPORT NCollection_CellFilter_Action Inspect (const Standard_Integer theTarget);
+
+private:
+ Standard_Real myTol;
+ Standard_Boolean myIsNeedAdd;
+ VectorOfPoint myPoints;
+ gp_XYZ myCurrent;
+};
+
+typedef NCollection_CellFilter<BRepExtrema_VertexInspector> BRepExtrema_CellFilter;
+typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
//! Tool class for computation of the proximity value from one BVH
//! primitive set to another, solving max(min) problem.
+//! Handles only edge/edge or face/face cases.
//! This tool is not intended to be used independently, and is integrated
//! in other classes, implementing algorithms based on shape tessellation
//! (BRepExtrema_ShapeProximity and BRepExtrema_SelfIntersection).
@@ -29,8 +87,6 @@
//! on the quality of input tessellation(s).
class BRepExtrema_ProximityValueTool
{
-public:
- typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
public:
@@ -86,9 +142,17 @@ public:
private:
+ //! Gets shape data for further refinement.
+ Standard_Boolean getInfoForRefinement (const TopoDS_Shape& theShapes,
+ TopAbs_ShapeEnum& theShapeType,
+ Standard_Integer& theNbNodes,
+ Standard_Real& theStep);
+
//! Returns the computed proximity value from first BVH to another one.
Standard_Real computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
const Standard_Integer theNbSamples1,
+ const BVH_Array3d& theAddVertices1,
+ const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
const Handle(BRepExtrema_TriangleSet)& theSet2,
const BRepExtrema_ShapeList& theShapeList1,
const BRepExtrema_ShapeList& theShapeList2,
@@ -97,6 +161,29 @@ private:
ProxPnt_Status& thePointStatus1,
ProxPnt_Status& thePointStatus2) const;
+ //! Gets additional vertices on shapes with refining a coarser one if it's needed.
+ Standard_Boolean getShapesAdditionalVertices();
+
+ //! Gets additional vertices and their statuses on the edge with the input step.
+ Standard_Boolean getEdgeAdditionalVertices (const TopoDS_Edge& theEdge,
+ const Standard_Real theStep,
+ BVH_Array3d& theAddVertices,
+ NCollection_Vector<ProxPnt_Status>& theAddStatuses);
+
+ //! Gets additional vertices and their statuses on the face with the input step (triangle square).
+ Standard_Boolean getFaceAdditionalVertices (const TopoDS_Face& theFace,
+ const Standard_Real theStep,
+ BVH_Array3d& theAddVertices,
+ NCollection_Vector<ProxPnt_Status>& theAddStatuses);
+
+ //! Splits the triangle recursively, halving the longest side
+ //! to the area of the current triangle > input step
+ void doRecurTrgSplit (const gp_Pnt (&theTrg)[3],
+ const ProxPnt_Status (&theEdgesStatus)[3],
+ const Standard_Real theTol,
+ const Standard_Real theStep,
+ BVH_Array3d& theAddVertices,
+ NCollection_Vector<ProxPnt_Status>& theAddStatuses);
private:
//! Set of all mesh primitives of the 1st shape.
@@ -109,6 +196,35 @@ private:
//! List of subshapes of the 2nd shape.
BRepExtrema_ShapeList myShapeList2;
+ //! The 1st shape.
+ TopoDS_Shape myShape1;
+ //! The 2nd shape.
+ TopoDS_Shape myShape2;
+
+ BVH_Array3d myAddVertices1; //!< Additional vertices on the 1st shape if its mesh is coarser.
+ BVH_Array3d myAddVertices2; //!< Additional vertices on the 2nd shape if its mesh is coarser.
+
+ NCollection_Vector<ProxPnt_Status> myAddStatus1; //!< Status of additional vertices on the 1st shape.
+ NCollection_Vector<ProxPnt_Status> myAddStatus2; //!< Status of additional vertices on the 2nd shape.
+
+ Standard_Boolean myIsInitS1; //!< Is the 1st shape initialized?
+ Standard_Boolean myIsInitS2; //!< Is the 2nd shape initialized?
+
+ Standard_Boolean myIsRefinementRequired1; //!< Flag about the need to refine the 1st shape.
+ Standard_Boolean myIsRefinementRequired2; //!< Flag about the need to refine the 2nd shape.
+
+ Standard_Integer myNbNodes1; //!< Number of nodes in triangulation of the 1st shape.
+ Standard_Integer myNbNodes2; //!< Number of nodes in triangulation of the 2nd shape.
+
+ Standard_Real myStep1; //!< Step for getting vertices on the 1st shape.
+ Standard_Real myStep2; //!< Step for getting vertices on the 2nd shape.
+
+ BRepExtrema_CellFilter myCells;
+ BRepExtrema_VertexInspector myInspector;
+
+ TopAbs_ShapeEnum myShapeType1; //!< 1st shape type.
+ TopAbs_ShapeEnum myShapeType2; //!< 2nd shape type.
+
Standard_Real myDistance; //!< Distance
Standard_Boolean myIsDone; //!< State of the algorithm
diff --git a/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx b/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
index 09efa4e585..034f25e66e 100644
--- a/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
+++ b/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
@@ -129,6 +129,7 @@ void BRepExtrema_ShapeProximity::Perform()
myElementSet2);
myProxValTool.LoadShapeLists (myShapeList1,
myShapeList2);
+ myProxValTool.SetNbSamplePoints (myNbSamples1, myNbSamples2);
myProxValTool.Perform (myTolerance);
myProxValTool.ProximityPoints(myProxPoint1, myProxPoint2);
diff --git a/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx b/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
index c6f6d77721..63f56a941f 100644
--- a/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
+++ b/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
@@ -37,7 +37,8 @@
//! on distance less than the given tolerance from each other.
//!
//! Second approach:
-//! Compute the proximity value between two shapes if the tolerance is not defined (Precision::Infinite()).
+//! Compute the proximity value between two shapes (handles only edge/edge or face/face cases)
+//! if the tolerance is not defined (Precision::Infinite()).
//! In this case the proximity value is a minimal thickness of a layer containing both shapes.
//!
//! For the both approaches the high performance is achieved through the use of existing
@@ -46,8 +47,6 @@
//! triangulation).
class BRepExtrema_ShapeProximity
{
-public:
- typedef typename BRepExtrema_ProximityValueTool::ProxPnt_Status ProxPnt_Status;
public:
diff --git a/tests/lowalgos/proximity/D4 b/tests/lowalgos/proximity/D4
new file mode 100644
index 0000000000..c463310b87
--- /dev/null
+++ b/tests/lowalgos/proximity/D4
@@ -0,0 +1,29 @@
+puts "============"
+puts "0033144: Modeling Algorithms - Wrong result of Shape Proximity"
+puts "==========="
+puts ""
+
+sphere s1 0 1 0 0 0 1 1
+trimu s1 s1 0 pi
+mkface fs1 s1
+incmesh fs1 1e-3
+
+plane p1 0 0 0 0 1 0
+trim p1 p1 -1 1 -1 1
+mkface f2 p1
+incmesh f2 1e-3
+
+set log [proximity fs1 f2 -value -profile]
+
+regexp {Proximity value: ([0-9+-.eE]*)} $log full val;
+
+set tol 1.e-2
+set expected 2.0
+
+regexp {Status of ProxPnt1 on ([A-Za-z0-9._-]*) : ([A-Za-z]*)} $log full val1 val2
+set status1 ${val2}
+set expected_status1 Middle
+
+regexp {Status of ProxPnt2 on ([A-Za-z0-9._-]*) : ([A-Za-z]*)} $log full val1 val2
+set status2 ${val2}
+set expected_status2 Middle
\ No newline at end of file
diff --git a/tests/lowalgos/proximity/B6 b/tests/lowalgos/proximity/E3
similarity index 55%
rename from tests/lowalgos/proximity/B6
rename to tests/lowalgos/proximity/E3
index 860919a914..a7e5858183 100644
--- a/tests/lowalgos/proximity/B6
+++ b/tests/lowalgos/proximity/E3
@@ -1,26 +1,23 @@
puts "============"
-puts "0033017: Implement an algorithm to find a proximity between a pair of shapes"
+puts "0033144: Modeling Algorithms - Wrong result of Shape Proximity"
puts "==========="
puts ""
-plane p1 0 0 0 0 0 1
-trim p1 p1 -1 1 -1 1
-mkface f1 p1
-incmesh f1 1.e-3
+restore [locate_data_file bug33144_e1.brep] e1
+restore [locate_data_file bug33144_e2.brep] e2
-circle c 0 0 1 1
-mkedge e1 c
-incmesh e1 1.e-3
+incmesh e1 1e-3
+incmesh e2 1e-3
-set log [proximity f1 e1 -value -profile]
+set log [proximity e1 e2 -value -profile]
regexp {Proximity value: ([0-9+-.eE]*)} $log full val;
set tol 1.e-3
-set expected 1.0
+set expected 0.6996
regexp {Status of ProxPnt1 on ([A-Za-z0-9._-]*) : ([A-Za-z]*)} $log full val1 val2
set status1 ${val2}
-set expected_status1 Border
+set expected_status1 Middle
regexp {Status of ProxPnt2 on ([A-Za-z0-9._-]*) : ([A-Za-z]*)} $log full val1 val2
set status2 ${val2}