X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FSelect3D%2FSelect3D_SensitivePrimitiveArray.cxx;h=8c0d0d3fdcb70f27845aaf3741993c7df4e02dab;hb=03c9cc86c6674ffb2ba8fd5ce68f5d2dfc34a443;hpb=df23a355c480441fea78470bf5dfad94aacd8add diff --git a/src/Select3D/Select3D_SensitivePrimitiveArray.cxx b/src/Select3D/Select3D_SensitivePrimitiveArray.cxx index 7da9ba350e..8c0d0d3fdc 100644 --- a/src/Select3D/Select3D_SensitivePrimitiveArray.cxx +++ b/src/Select3D/Select3D_SensitivePrimitiveArray.cxx @@ -988,7 +988,7 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::overlapsElement (SelectBasics if (myToDetectNode || myToDetectElem) { - if (theIsFullInside || theMgr.Overlaps (aPoint, aPickResult)) + if (theIsFullInside || theMgr.OverlapsPoint (aPoint, aPickResult)) { if (aPickResult.Depth() <= myMinDepthNode) { @@ -1037,7 +1037,7 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::overlapsElement (SelectBasics if (myToDetectElem) { - if (theIsFullInside || theMgr.Overlaps (aPnts[0], aPnts[1], aPnts[2], Select3D_TOS_INTERIOR, aPickResult)) + if (theIsFullInside || theMgr.OverlapsTriangle (aPnts[0], aPnts[1], aPnts[2], Select3D_TOS_INTERIOR, aPickResult)) { if (aPickResult.Depth() <= myMinDepthElem) { @@ -1056,7 +1056,7 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::overlapsElement (SelectBasics { for (int aNodeIter = 0; aNodeIter < 3; ++aNodeIter) { - if (theIsFullInside || theMgr.Overlaps (aPnts[aNodeIter], aPickResult)) + if (theIsFullInside || theMgr.OverlapsPoint (aPnts[aNodeIter], aPickResult)) { if (aPickResult.Depth() <= myMinDepthNode) { @@ -1078,7 +1078,7 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::overlapsElement (SelectBasics { int aNode1 = aNodeIter == 0 ? 2 : (aNodeIter - 1); int aNode2 = aNodeIter; - if (theIsFullInside || theMgr.Overlaps (aPnts[aNode1], aPnts[aNode2], aPickResult)) + if (theIsFullInside || theMgr.OverlapsSegment (aPnts[aNode1], aPnts[aNode2], aPickResult)) { if (aPickResult.Depth() <= myMinDepthEdge) { @@ -1147,7 +1147,7 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::elementIsInside (SelectBasics { aPoint = vecToPnt (getPosVec2 (aPointIndex)); } - if (!theIsFullInside && !theMgr.Overlaps (aPoint)) + if (!theIsFullInside && !theMgr.OverlapsPoint (aPoint)) { return Standard_False; } @@ -1188,9 +1188,9 @@ Standard_Boolean Select3D_SensitivePrimitiveArray::elementIsInside (SelectBasics aPnts[2] = vecToPnt (getPosVec2 (aTriNodes[2])); } - if (!theIsFullInside && ( !theMgr.Overlaps (aPnts[0]) - || !theMgr.Overlaps (aPnts[1]) - || !theMgr.Overlaps (aPnts[2]))) + if (!theIsFullInside && ( !theMgr.OverlapsPoint (aPnts[0]) + || !theMgr.OverlapsPoint (aPnts[1]) + || !theMgr.OverlapsPoint (aPnts[2]))) { return Standard_False; }