improve Polyline::isPointInside

Author: CEXT-Dan

PyRxCore/PyDbEnts.cpp

@@ -2411,14 +2411,9 @@ AcDbLine* PyDbLine::impObj(const std::source_location& src /*= std::source_locat
 
 //-----------------------------------------------------------------------------------
 //PyDbPolyline
-using AcDbPolylinePointer = AcDbObjectPointer<AcDbPolyline>;
-
-static auto shallowClone(const AcDbPolyline& pline) -> AcDbPolylinePointer
+static auto shallowClone(const AcDbPolyline& pline) -> AcDbAcDbPolylineUPtr
 {
-    AcDbPolylinePointer plineClone;
-    auto _tmp = static_cast<AcDbPolyline*>(pline.clone());
-    plineClone.acquire(_tmp);
-    return std::move(plineClone);
+    return AcDbAcDbPolylineUPtr{ static_cast<AcDbPolyline*>(pline.clone()) };
 }
 
 static auto getCompositCurve(const AcDbPolyline& pline) -> std::unique_ptr<AcGeCompositeCurve3d>
@@ -2428,7 +2423,7 @@ static auto getCompositCurve(const AcDbPolyline& pline) -> std::unique_ptr<AcGeC
     return std::unique_ptr<AcGeCompositeCurve3d>(static_cast<AcGeCompositeCurve3d*>(pcurve));
 }
 
-static auto getPolyPoints(const AcGeCompositeCurve3d& cc)
+static auto getPolyPoints(const AcGeCompositeCurve3d& cc) -> AcGePoint3dArray
 {
     AcGePoint3dArray polypoints;
     AcGeVoidPointerArray curveList;
@@ -2454,8 +2449,7 @@ static auto getPolyPoints(const AcGeCompositeCurve3d& cc)
     return polypoints;
 }
 
-// Utility function to test if a point is inside a polygon (2D)
-// Uses ray casting algorithm
+// Utility function to test if a point is inside a polygon (2D), Uses ray casting algorithm
 static bool isPointInPolygon(const AcGePoint3dArray& polygon, const AcGePoint3d& testPoint)
 {
     int n = polygon.length();
@@ -2469,9 +2463,7 @@ static bool isPointInPolygon(const AcGePoint3dArray& polygon, const AcGePoint3d&
     {
         double xi = polygon[i].x, yi = polygon[i].y;
         double xj = polygon[j].x, yj = polygon[j].y;
-
-        bool intersect = ((yi > y) != (yj > y)) &&
-            (x < (xj - xi) * (y - yi) / (yj - yi + 1e-12) + xi);
+        bool intersect = ((yi > y) != (yj > y)) && (x < (xj - xi) * (y - yi) / (yj - yi + 1e-12) + xi);
         if (intersect)
             count++;
     }
@@ -2544,7 +2536,7 @@ void makePyDbPolylineWrapper()
         .def("toPoint2dList", &PyDbPolyline::toPoint2dList, DS.ARGS())
         .def("toPoint3dList", &PyDbPolyline::toPoint3dList, DS.ARGS())
         .def("toList", &PyDbPolyline::toList, DS.ARGS())
-        .def("isPointInside", &PyDbPolyline::isPointInside, DS.ARGS({"point: PyGe.Point3d"}))
+        .def("isPointInside", &PyDbPolyline::isPointInside, DS.ARGS({ "point: PyGe.Point3d" }))
         .def("className", &PyDbPolyline::className, DS.SARGS()).staticmethod("className")
         .def("desc", &PyDbPolyline::desc, DS.SARGS(15560)).staticmethod("desc")
         .def("cloneFrom", &PyDbPolyline::cloneFrom, DS.SARGS({ "otherObject: PyRx.RxObject" })).staticmethod("cloneFrom")
@@ -2957,7 +2949,7 @@ boost::python::list PyDbPolyline::toList() const
 
 bool PyDbPolyline::isPointInside(const AcGePoint3d& pnt) const
 {
-    AcDbPolylinePointer plineClone = shallowClone(*impObj());
+    auto plineClone = shallowClone(*impObj());
     plineClone->setClosed(true);
     auto cc = getCompositCurve(*plineClone);
     return isPointInPolygon(getPolyPoints(*cc), pnt);

PyRxCore/StdAfx.h

@@ -333,6 +333,8 @@ using AcDbObjectUPtr = std::unique_ptr < T, decltype([](T* ptr) noexcept
     }) > ;
 
 using AcDbEntityUPtr = AcDbObjectUPtr<AcDbEntity>;
+using AcDbAcDbPolylineUPtr = AcDbObjectUPtr<AcDbPolyline>;
+
 
 // Import Python and wxPython headers
 #include <wxPython/sip.h>