OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
Code Activity

#small remarks

Browse Source
This commit is contained in:
osa
2021-01-15 12:24:17 +03:00
parent 20d15a1520
commit a8909395fc
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/SelectMgr/SelectMgr_RectangularFrustum.cxx
View File

@@ -707,7 +707,7 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1,
const gp_XYZ aTrEdges[3] = { thePnt2.XYZ() - thePnt1.XYZ(), const gp_XYZ aTrEdges[3] = { thePnt2.XYZ() - thePnt1.XYZ(),
thePnt3.XYZ() - thePnt2.XYZ(), thePnt3.XYZ() - thePnt2.XYZ(),
thePnt1.XYZ() - thePnt3.XYZ() }; thePnt1.XYZ() - thePnt3.XYZ() };
if (aTriangleNormal.SquareMagnitude() < gp::Resolution()) if (aTriangleNormal.SquareMagnitude() < gp::Resolution())
{ {
// consider degenerated triangle as point or segment // consider degenerated triangle as point or segment
return aTrEdges[0].SquareModulus() > gp::Resolution() return aTrEdges[0].SquareModulus() > gp::Resolution()
@@ -747,13 +747,10 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1,
if (isInterior) if (isInterior)
{ {
thePickResult.SetSurfaceNormal(aTriangleNormal); thePickResult.SetSurfaceNormal (aTriangleNormal);
} }
gp_Pnt aPnts[3] = { thePnt1, thePnt2, thePnt3 };
gp_Vec aTrgNorm = aTriangleNormal.Normalized(); gp_Vec aTrgNorm = aTriangleNormal.Normalized();
gp_Pnt aProjNearPnt = projectPointOnPlane (myNearPickedPnt, aTrgNorm, thePnt1); gp_Pnt aProjNearPnt = projectPointOnPlane (myNearPickedPnt, aTrgNorm, thePnt1);
gp_Pnt aProjFrustumPnt[4]; gp_Pnt aProjFrustumPnt[4];
@@ -819,7 +816,7 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1,
// Combining distances // Combining distances
gp_Pnt aResPnt = aDistToFrustumRect > aDistToTriangle ? aNearPntOnFrustumRect : aNearPntOnTriangle; gp_Pnt aResPnt = aDistToFrustumRect > aDistToTriangle ? aNearPntOnFrustumRect : aNearPntOnTriangle;
thePickResult.SetDepth (myNearPickedPnt.Distance(aResPnt) * myScale); thePickResult.SetDepth (myNearPickedPnt.Distance (aResPnt) * myScale);
thePickResult.SetPickedPoint (aResPnt); thePickResult.SetPickedPoint (aResPnt);
} }