From a8909395fc0c023b7464968bbf5e1ce8a33655cf Mon Sep 17 00:00:00 2001 From: osa Date: Fri, 15 Jan 2021 12:24:17 +0300 Subject: [PATCH] #small remarks --- src/SelectMgr/SelectMgr_RectangularFrustum.cxx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/SelectMgr/SelectMgr_RectangularFrustum.cxx b/src/SelectMgr/SelectMgr_RectangularFrustum.cxx index 51fbe50582..467107923b 100644 --- a/src/SelectMgr/SelectMgr_RectangularFrustum.cxx +++ b/src/SelectMgr/SelectMgr_RectangularFrustum.cxx @@ -707,7 +707,7 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1, const gp_XYZ aTrEdges[3] = { thePnt2.XYZ() - thePnt1.XYZ(), thePnt3.XYZ() - thePnt2.XYZ(), thePnt1.XYZ() - thePnt3.XYZ() }; - if (aTriangleNormal.SquareMagnitude() < gp::Resolution()) + if (aTriangleNormal.SquareMagnitude() < gp::Resolution()) { // consider degenerated triangle as point or segment return aTrEdges[0].SquareModulus() > gp::Resolution() @@ -747,15 +747,12 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1, if (isInterior) { - thePickResult.SetSurfaceNormal(aTriangleNormal); + thePickResult.SetSurfaceNormal (aTriangleNormal); } - - gp_Pnt aPnts[3] = { thePnt1, thePnt2, thePnt3 }; - + gp_Vec aTrgNorm = aTriangleNormal.Normalized(); - gp_Pnt aProjNearPnt = projectPointOnPlane (myNearPickedPnt, aTrgNorm, thePnt1); - + gp_Pnt aProjFrustumPnt[4]; Standard_Integer aLastIdx = 0; gp_Pnt aResProjPnt; @@ -775,7 +772,7 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1, { aProjFrustumPnt[aLastIdx++] = aResProjPnt; } - + // Distance from projected myNearPickedPnt to projected fructum rectangle, // inside distance is 0, outside distance is positive gp_Pnt aNearPntOnFrustumRect; @@ -819,7 +816,7 @@ Standard_Boolean SelectMgr_RectangularFrustum::Overlaps (const gp_Pnt& thePnt1, // Combining distances gp_Pnt aResPnt = aDistToFrustumRect > aDistToTriangle ? aNearPntOnFrustumRect : aNearPntOnTriangle; - thePickResult.SetDepth (myNearPickedPnt.Distance(aResPnt) * myScale); + thePickResult.SetDepth (myNearPickedPnt.Distance (aResPnt) * myScale); thePickResult.SetPickedPoint (aResPnt); } -- 2.39.5