From 222c6a2df50e4dee7139ff7bf27b7fac56a36c5d Mon Sep 17 00:00:00 2001 From: Ian Bassi Date: Fri, 2 Oct 2026 17:33:41 -0300 Subject: [PATCH] Improve performance by migrating to Clipper2 2.0.1 (#15969) Co-authored-by: Rodrigo Faselli <162915171+RF47@users.noreply.github.com> --- deps_src/CMakeLists.txt | 1 - deps_src/clipper/CMakeLists.txt | 20 - deps_src/clipper/clipper.cpp | 4213 ----------------- deps_src/clipper/clipper.hpp | 606 --- deps_src/clipper/clipper_z.cpp | 7 - deps_src/clipper/clipper_z.hpp | 18 - deps_src/clipper2/CMakeLists.txt | 7 +- .../include/clipper2/clipper.core.h | 154 +- .../include/clipper2/clipper.engine.h | 32 +- .../include/clipper2/clipper.export.h | 73 +- .../Clipper2Lib/include/clipper2/clipper.h | 102 +- .../include/clipper2/clipper.offset.h | 6 +- .../include/clipper2/clipper.triangulation.h | 30 + .../include/clipper2/clipper.version.h | 2 +- .../Clipper2Lib/src/clipper.engine.cpp | 202 +- .../Clipper2Lib/src/clipper.offset.cpp | 66 +- .../Clipper2Lib/src/clipper.rectclip.cpp | 16 +- .../Clipper2Lib/src/clipper.triangulation.cpp | 1222 +++++ .../clipper2/Clipper2Lib/src/clipper2_z.cpp | 1 + .../backends/libslic3r/geometries.hpp | 4 +- docs/HLSD/polygon-clipping.md | 131 + src/libslic3r/Algorithm/LineSplit.cpp | 11 +- src/libslic3r/Algorithm/LineSplit.hpp | 2 +- src/libslic3r/Algorithm/RegionExpansion.cpp | 149 +- src/libslic3r/Algorithm/RegionExpansion.hpp | 1 - src/libslic3r/Arachne/WallToolPaths.cpp | 19 +- src/libslic3r/Arachne/utils/ExtrusionLine.cpp | 4 +- src/libslic3r/Arachne/utils/ExtrusionLine.hpp | 4 +- src/libslic3r/Arrange.cpp | 17 +- src/libslic3r/CMakeLists.txt | 6 +- src/libslic3r/Clipper2Utils.cpp | 228 - src/libslic3r/Clipper2Utils.hpp | 22 - src/libslic3r/Clipper2ZUtils.hpp | 167 - src/libslic3r/ClipperUtils.cpp | 1439 +++--- src/libslic3r/ClipperUtils.hpp | 226 +- src/libslic3r/ClipperZUtils.cpp | 77 + src/libslic3r/ClipperZUtils.hpp | 24 +- src/libslic3r/CutSurface.cpp | 2 +- src/libslic3r/ElephantFootCompensation.cpp | 2 - src/libslic3r/Emboss.cpp | 83 +- src/libslic3r/Emboss.hpp | 2 +- src/libslic3r/Fill/FillBase.cpp | 31 +- src/libslic3r/Fill/FillRectilinear.cpp | 4 +- src/libslic3r/Fill/Lightning/TreeNode.cpp | 9 +- src/libslic3r/Format/svg.cpp | 26 +- src/libslic3r/Geometry.cpp | 1 - src/libslic3r/LayerRegion.cpp | 6 +- src/libslic3r/NSVGUtils.cpp | 18 +- src/libslic3r/PerimeterGenerator.cpp | 66 +- src/libslic3r/Polygon.cpp | 53 +- src/libslic3r/Polygon.hpp | 2 +- src/libslic3r/Print.cpp | 6 +- src/libslic3r/PrintConfig.hpp | 4 +- src/libslic3r/PrintObject.cpp | 15 +- src/libslic3r/SLA/ConcaveHull.cpp | 2 +- src/libslic3r/SLA/Pad.cpp | 20 +- src/libslic3r/SLA/SupportPointGenerator.cpp | 4 +- src/libslic3r/SVG.cpp | 10 +- src/libslic3r/SVG.hpp | 9 +- src/libslic3r/ShortestPath.cpp | 17 - src/libslic3r/ShortestPath.hpp | 6 - src/libslic3r/Support/SupportCommon.cpp | 110 +- src/libslic3r/Support/SupportMaterial.cpp | 8 +- src/libslic3r/Support/TreeModelVolumes.cpp | 24 +- src/libslic3r/Support/TreeSupport.cpp | 6 +- src/libslic3r/Support/TreeSupport3D.cpp | 16 +- src/libslic3r/Support/TreeSupportCommon.hpp | 2 - src/libslic3r/TriangleMeshSlicer.cpp | 6 +- src/libslic3r/TriangleMeshSlicer.hpp | 6 +- src/libslic3r/clipper.cpp | 13 - src/libslic3r/clipper.hpp | 26 - src/libslic3r/pchheader.hpp | 2 - tests/fff_print/test_fill.cpp | 30 +- tests/fff_print/test_gcodewriter.cpp | 5 +- tests/libslic3r/test_clipper_offset.cpp | 10 +- tests/libslic3r/test_clipper_utils.cpp | 90 +- .../test_elephant_foot_compensation.cpp | 2 +- tests/sla_print/sla_test_utils.cpp | 3 +- 78 files changed, 3028 insertions(+), 7038 deletions(-) delete mode 100644 deps_src/clipper/CMakeLists.txt delete mode 100644 deps_src/clipper/clipper.cpp delete mode 100644 deps_src/clipper/clipper.hpp delete mode 100644 deps_src/clipper/clipper_z.cpp delete mode 100644 deps_src/clipper/clipper_z.hpp create mode 100644 deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.triangulation.h create mode 100644 deps_src/clipper2/Clipper2Lib/src/clipper.triangulation.cpp create mode 100644 docs/HLSD/polygon-clipping.md delete mode 100644 src/libslic3r/Clipper2Utils.cpp delete mode 100644 src/libslic3r/Clipper2Utils.hpp delete mode 100644 src/libslic3r/Clipper2ZUtils.hpp create mode 100644 src/libslic3r/ClipperZUtils.cpp delete mode 100644 src/libslic3r/clipper.cpp delete mode 100644 src/libslic3r/clipper.hpp diff --git a/deps_src/CMakeLists.txt b/deps_src/CMakeLists.txt index a4d71c6f27..d044cedfe5 100644 --- a/deps_src/CMakeLists.txt +++ b/deps_src/CMakeLists.txt @@ -15,7 +15,6 @@ add_subdirectory(stb_dxt) # Header-only STB DXT compression library # Static libraries add_subdirectory(Shiny) add_subdirectory(admesh) -add_subdirectory(clipper) add_subdirectory(clipper2) add_subdirectory(expat) add_subdirectory(glu-libtess) diff --git a/deps_src/clipper/CMakeLists.txt b/deps_src/clipper/CMakeLists.txt deleted file mode 100644 index 074cbdf4ff..0000000000 --- a/deps_src/clipper/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.13) -project(clipper) - -add_library(clipper STATIC -# We are using ClipperLib compiled as part of the libslic3r project using Slic3r::Point as its base type. -# clipper.cpp -# clipper.hpp - clipper_z.cpp - clipper_z.hpp -) - -target_include_directories(clipper SYSTEM - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_link_libraries(clipper - PUBLIC Eigen3::Eigen - PRIVATE TBB::tbb TBB::tbbmalloc -) diff --git a/deps_src/clipper/clipper.cpp b/deps_src/clipper/clipper.cpp deleted file mode 100644 index 1f16446ac8..0000000000 --- a/deps_src/clipper/clipper.cpp +++ /dev/null @@ -1,4213 +0,0 @@ -/******************************************************************************* -* * -* Author : Angus Johnson * -* Version : 6.4.2 * -* Date : 27 February 2017 * -* Website : http://www.angusj.com * -* Copyright : Angus Johnson 2010-2017 * -* * -* License: * -* Use, modification & distribution is subject to Boost Software License Ver 1. * -* http://www.boost.org/LICENSE_1_0.txt * -* * -* Attributions: * -* The code in this library is an extension of Bala Vatti's clipping algorithm: * -* "A generic solution to polygon clipping" * -* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * -* http://portal.acm.org/citation.cfm?id=129906 * -* * -* Computer graphics and geometric modeling: implementation and algorithms * -* By Max K. Agoston * -* Springer; 1 edition (January 4, 2005) * -* http://books.google.com/books?q=vatti+clipping+agoston * -* * -* See also: * -* "Polygon Offsetting by Computing Winding Numbers" * -* Paper no. DETC2005-85513 pp. 565-575 * -* ASME 2005 International Design Engineering Technical Conferences * -* and Computers and Information in Engineering Conference (IDETC/CIE2005) * -* September 24-28, 2005 , Long Beach, California, USA * -* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * -* * -*******************************************************************************/ - -/******************************************************************************* -* * -* This is a translation of the Delphi Clipper library and the naming style * -* used has retained a Delphi flavour. * -* * -*******************************************************************************/ - -#include "clipper.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef CLIPPERLIB_NAMESPACE_PREFIX -namespace CLIPPERLIB_NAMESPACE_PREFIX { -#endif // CLIPPERLIB_NAMESPACE_PREFIX - -#ifdef CLIPPERLIB_USE_XYZ -namespace ClipperLib_Z { -#else /* CLIPPERLIB_USE_XYZ */ -namespace ClipperLib { -#endif /* CLIPPERLIB_USE_XYZ */ - -static double const pi = 3.141592653589793238; -static double const two_pi = pi *2; -static double const def_arc_tolerance = 0.25; - -enum Direction { dRightToLeft, dLeftToRight }; - -static int const Unassigned = -1; //edge not currently 'owning' a solution -static int const Skip = -2; //edge that would otherwise close a path - -#define HORIZONTAL (-1.0E+40) -#define TOLERANCE (1.0e-20) -#define NEAR_ZERO(val) (((val) > -TOLERANCE) && ((val) < TOLERANCE)) - -//------------------------------------------------------------------------------ - -inline IntPoint IntPoint2d(cInt x, cInt y) -{ - return IntPoint(x, y -#ifdef CLIPPERLIB_USE_XYZ - , 0 -#endif // CLIPPERLIB_USE_XYZ - ); -} - -// Fast rounding upwards. -inline double FRound(double a) -{ - // Why does Java Math.round(0.49999999999999994) return 1? - // https://stackoverflow.com/questions/9902968/why-does-math-round0-49999999999999994-return-1 - return a == 0.49999999999999994 ? 0 : floor(a + 0.5); -} - -template -inline IType Round(double val) -{ - double v = FRound(val); -#if defined(CLIPPERLIB_INT32) && ! defined(NDEBUG) - static_assert(sizeof(IType) == 4 || sizeof(IType) == 8, "IType must be int32 or int64"); - static constexpr const double hi = 65536. * 16383. * (sizeof(IType) == 4 ? 1 : 65536. * 65536.); - if (v > hi || -v > hi) - throw clipperException("Coordinate outside allowed range"); -#endif - return static_cast(v); -} - -// Overriding the Eigen operators because we don't want to compare Z coordinate if IntPoint is 3 dimensional. -inline bool operator==(const IntPoint &l, const IntPoint &r) { return l.x() == r.x() && l.y() == r.y(); } -inline bool operator!=(const IntPoint &l, const IntPoint &r) { return l.x() != r.x() || l.y() != r.y(); } - -//------------------------------------------------------------------------------ -// PolyTree methods ... -//------------------------------------------------------------------------------ - -int PolyTree::Total() const -{ - int result = (int)AllNodes.size(); - //with negative offsets, ignore the hidden outer polygon ... - if (result > 0 && Childs.front() != &AllNodes.front()) result--; - return result; -} - -//------------------------------------------------------------------------------ -// PolyNode methods ... -//------------------------------------------------------------------------------ - -void PolyNode::AddChild(PolyNode& child) -{ - unsigned cnt = (unsigned)Childs.size(); - Childs.emplace_back(&child); - child.Parent = this; - child.Index = cnt; -} -//------------------------------------------------------------------------------ - -// Edge delimits a hole if it has an odd number of parent loops. -bool PolyNode::IsHole() const -{ - bool result = true; - PolyNode* node = Parent; - while (node) - { - result = !result; - node = node->Parent; - } - return result; -} - -void PolyTree::RemoveOutermostPolygon() -{ - if (this->ChildCount() == 1 && this->Childs[0]->ChildCount() > 0) { - PolyNode *outerNode = this->Childs[0]; - this->Childs.reserve(outerNode->ChildCount()); - this->Childs[0] = outerNode->Childs[0]; - this->Childs[0]->Parent = outerNode->Parent; - for (int i = 1; i < outerNode->ChildCount(); ++i) - this->AddChild(*outerNode->Childs[i]); - } else - this->Clear(); -} - -//------------------------------------------------------------------------------ -// Miscellaneous global functions -//------------------------------------------------------------------------------ - -double Area(const Path &poly) -{ - int size = (int)poly.size(); - if (size < 3) return 0; - - double a = 0; - for (int i = 0, j = size -1; i < size; ++i) - { - a += ((double)poly[j].x() + poly[i].x()) * ((double)poly[j].y() - poly[i].y()); - j = i; - } - return -a * 0.5; -} -//------------------------------------------------------------------------------ - -double Area(const OutPt *op) -{ - const OutPt *startOp = op; - if (!op) return 0; - double a = 0; - do { - a += (double)(op->Prev->Pt.x() + op->Pt.x()) * (double)(op->Prev->Pt.y() - op->Pt.y()); - op = op->Next; - } while (op != startOp); - return a * 0.5; -} -//------------------------------------------------------------------------------ - -double Area(const OutRec &outRec) -{ - return Area(outRec.Pts); -} -//------------------------------------------------------------------------------ - -bool PointIsVertex(const IntPoint &Pt, OutPt *pp) -{ - OutPt *pp2 = pp; - do - { - if (pp2->Pt == Pt) return true; - pp2 = pp2->Next; - } - while (pp2 != pp); - return false; -} -//------------------------------------------------------------------------------ - -//See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos -//http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf -int PointInPolygon(const IntPoint &pt, const Path &path) -{ - //returns 0 if false, +1 if true, -1 if pt ON polygon boundary - int result = 0; - size_t cnt = path.size(); - if (cnt < 3) return 0; - IntPoint ip = path[0]; - for(size_t i = 1; i <= cnt; ++i) - { - IntPoint ipNext = (i == cnt ? path[0] : path[i]); - if (ipNext.y() == pt.y() && ((ipNext.x() == pt.x()) || (ip.y() == pt.y() && ((ipNext.x() > pt.x()) == (ip.x() < pt.x()))))) - return -1; - if ((ip.y() < pt.y()) != (ipNext.y() < pt.y())) - { - if (ip.x() >= pt.x()) - { - if (ipNext.x() > pt.x()) result = 1 - result; - else - { - auto d = CrossProductType(ip.x() - pt.x()) * CrossProductType(ipNext.y() - pt.y()) - CrossProductType(ipNext.x() - pt.x()) * CrossProductType(ip.y() - pt.y()); - if (!d) return -1; - if ((d > 0) == (ipNext.y() > ip.y())) result = 1 - result; - } - } else - { - if (ipNext.x() > pt.x()) - { - auto d = CrossProductType(ip.x() - pt.x()) * CrossProductType(ipNext.y() - pt.y()) - CrossProductType(ipNext.x() - pt.x()) * CrossProductType(ip.y() - pt.y()); - if (!d) return -1; - if ((d > 0) == (ipNext.y() > ip.y())) result = 1 - result; - } - } - } - ip = ipNext; - } - return result; -} -//------------------------------------------------------------------------------ - -// Called by Poly2ContainsPoly1() -int PointInPolygon(const IntPoint &pt, OutPt *op) -{ - //returns 0 if false, +1 if true, -1 if pt ON polygon boundary - int result = 0; - OutPt* startOp = op; - do - { - if (op->Next->Pt.y() == pt.y()) - { - if ((op->Next->Pt.x() == pt.x()) || (op->Pt.y() == pt.y() && - ((op->Next->Pt.x() > pt.x()) == (op->Pt.x() < pt.x())))) return -1; - } - if ((op->Pt.y() < pt.y()) != (op->Next->Pt.y() < pt.y())) - { - if (op->Pt.x() >= pt.x()) - { - if (op->Next->Pt.x() > pt.x()) result = 1 - result; - else - { - auto d = CrossProductType(op->Pt.x() - pt.x()) * CrossProductType(op->Next->Pt.y() - pt.y()) - CrossProductType(op->Next->Pt.x() - pt.x()) * CrossProductType(op->Pt.y() - pt.y()); - if (!d) return -1; - if ((d > 0) == (op->Next->Pt.y() > op->Pt.y())) result = 1 - result; - } - } else - { - if (op->Next->Pt.x() > pt.x()) - { - auto d = CrossProductType(op->Pt.x() - pt.x()) * CrossProductType(op->Next->Pt.y() - pt.y()) - CrossProductType(op->Next->Pt.x() - pt.x()) * CrossProductType(op->Pt.y() - pt.y()); - if (!d) return -1; - if ((d > 0) == (op->Next->Pt.y() > op->Pt.y())) result = 1 - result; - } - } - } - op = op->Next; - } while (startOp != op); - return result; -} -//------------------------------------------------------------------------------ - -// This is potentially very expensive! O(n^2)! -bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2) -{ - OutPt* op = OutPt1; - do - { - //nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon - int res = PointInPolygon(op->Pt, OutPt2); - if (res >= 0) return res > 0; - op = op->Next; - } - while (op != OutPt1); - return true; -} -//---------------------------------------------------------------------- - -#ifdef CLIPPERLIB_INT32 -inline bool SlopesEqual(const cInt dx1, const cInt dy1, const cInt dx2, const cInt dy2, bool /* UseFullInt64Range */) { - return int64_t(dy1) * int64_t(dx2) == int64_t(dx1) * int64_t(dy2); -} -#else -inline bool SlopesEqual(const cInt dx1, const cInt dy1, const cInt dx2, const cInt dy2, bool UseFullInt64Range) { - return (UseFullInt64Range) ? - // |dx1| < 2^63, |dx2| < 2^63 etc, - Int128::sign_determinant_2x2_filtered(dx1, dy1, dx2, dy2) == 0 : -// Int128::sign_determinant_2x2(dx1, dy1, dx2, dy2) == 0 : - // |dx1| < 2^31, |dx2| < 2^31 etc, - // therefore the following computation could be done with 64bit arithmetics. - dy1 * dx2 == dx1 * dy2; -} -#endif - -inline bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range) - { return SlopesEqual(e1.Top.x() - e1.Bot.x(), e1.Top.y() - e1.Bot.y(), e2.Top.x() - e2.Bot.x(), e2.Top.y() - e2.Bot.y(), UseFullInt64Range); } -inline bool SlopesEqual(const IntPoint &pt1, const IntPoint &pt2, const IntPoint &pt3, bool UseFullInt64Range) - { return SlopesEqual(pt1.x()-pt2.x(), pt1.y()-pt2.y(), pt2.x()-pt3.x(), pt2.y()-pt3.y(), UseFullInt64Range); } -inline bool SlopesEqual(const IntPoint &pt1, const IntPoint &pt2, const IntPoint &pt3, const IntPoint &pt4, bool UseFullInt64Range) - { return SlopesEqual(pt1.x()-pt2.x(), pt1.y()-pt2.y(), pt3.x()-pt4.x(), pt3.y()-pt4.y(), UseFullInt64Range); } - -//------------------------------------------------------------------------------ - -inline bool IsHorizontal(TEdge &e) -{ - return e.Dx == HORIZONTAL; -} -//------------------------------------------------------------------------------ - -inline double GetDx(const IntPoint &pt1, const IntPoint &pt2) -{ - return (pt1.y() == pt2.y()) ? - HORIZONTAL : (double)(pt2.x() - pt1.x()) / (pt2.y() - pt1.y()); -} -//--------------------------------------------------------------------------- - -inline cInt TopX(TEdge &edge, const cInt currentY) -{ - return (currentY == edge.Top.y()) ? - edge.Top.x() : - edge.Bot.x() + Round(edge.Dx *(currentY - edge.Bot.y())); -} -//------------------------------------------------------------------------------ - -void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip) -{ -#ifdef CLIPPERLIB_USE_XYZ - ip.z() = 0; -#endif - - if (Edge1.Dx == Edge2.Dx) - { - ip.y() = Edge1.Curr.y(); - ip.x() = TopX(Edge1, ip.y()); - return; - } - - int64_t y; - if (Edge1.Dx == 0) - { - ip.x() = Edge1.Bot.x(); - y = IsHorizontal(Edge2) ? - Edge2.Bot.y() : - Round(ip.x() / Edge2.Dx + Edge2.Bot.y() - (Edge2.Bot.x() / Edge2.Dx)); - - } - else if (Edge2.Dx == 0) - { - ip.x() = Edge2.Bot.x(); - y = IsHorizontal(Edge1) ? - Edge1.Bot.y() : - Round(ip.x() / Edge1.Dx + Edge1.Bot.y() - (Edge1.Bot.x() / Edge1.Dx)); - } - else - { - double b1 = double(Edge1.Bot.x()) - double(Edge1.Bot.y()) * Edge1.Dx; - double b2 = double(Edge2.Bot.x()) - double(Edge2.Bot.y()) * Edge2.Dx; - double q = (b2-b1) / (Edge1.Dx - Edge2.Dx); - y = Round(q); - ip.x() = (std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx)) ? - Round(Edge1.Dx * q + b1) : - Round(Edge2.Dx * q + b2); - } - - ip.y() = cInt(y); - if (y < Edge1.Top.y() || y < Edge2.Top.y()) - { - ip.y() = (Edge1.Top.y() > Edge2.Top.y() ? Edge1 : Edge2).Top.y(); - y = ip.y(); - ip.x() = TopX(std::fabs(Edge1.Dx) < std::fabs(Edge2.Dx) ? Edge1 : Edge2, ip.y()); - } - //finally, don't allow 'ip' to be BELOW curr.y() (ie bottom of scanbeam) ... - if (y > Edge1.Curr.y()) - { - ip.y() = Edge1.Curr.y(); - //use the more vertical edge to derive X ... - ip.x() = TopX(std::fabs(Edge1.Dx) > std::fabs(Edge2.Dx) ? Edge2 : Edge1, ip.y()); - } -} -//------------------------------------------------------------------------------ - -// Reverse a linked loop of points representing a closed polygon. -// This has a time complexity of O(n) -void ReversePolyPtLinks(OutPt *pp) -{ - if (!pp) return; - OutPt *pp1 = pp; - do { - OutPt *pp2 = pp1->Next; - pp1->Next = pp1->Prev; - pp1->Prev = pp2; - pp1 = pp2; - } while( pp1 != pp ); -} -//------------------------------------------------------------------------------ - -inline void InitEdge(TEdge* e, TEdge* eNext, TEdge* ePrev, const IntPoint& Pt) -{ - std::memset(e, 0, sizeof(TEdge)); - e->Next = eNext; - e->Prev = ePrev; - e->Curr = Pt; - e->OutIdx = Unassigned; -} -//------------------------------------------------------------------------------ - -void InitEdge2(TEdge& e, PolyType Pt) -{ - if (e.Curr.y() >= e.Next->Curr.y()) - { - e.Bot = e.Curr; - e.Top = e.Next->Curr; - } else - { - e.Top = e.Curr; - e.Bot = e.Next->Curr; - } - - cInt dy = (e.Top.y() - e.Bot.y()); - if (dy == 0) e.Dx = HORIZONTAL; - else e.Dx = (double)(e.Top.x() - e.Bot.x()) / dy; - - e.PolyTyp = Pt; -} -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPathInternal() to remove collinear and duplicate points. -inline TEdge* RemoveEdge(TEdge* e) -{ - //removes e from double_linked_list (but without removing from memory) - e->Prev->Next = e->Next; - e->Next->Prev = e->Prev; - TEdge* result = e->Next; - e->Prev = 0; //flag as removed (see ClipperBase.Clear) - return result; -} -//------------------------------------------------------------------------------ - -inline void ReverseHorizontal(TEdge &e) -{ - //swap horizontal edges' Top and Bottom x's so they follow the natural - //progression of the bounds - ie so their xbots will align with the - //adjoining lower edge. [Helpful in the ProcessHorizontal() method.] - std::swap(e.Top.x(), e.Bot.x()); -#ifdef CLIPPERLIB_USE_XYZ - std::swap(e.Top.z(), e.Bot.z()); -#endif -} -//------------------------------------------------------------------------------ - -bool GetOverlapSegment(IntPoint pt1a, IntPoint pt1b, IntPoint pt2a, - IntPoint pt2b, IntPoint &pt1, IntPoint &pt2) -{ - //precondition: segments are Collinear. - if (std::abs(pt1a.x() - pt1b.x()) > std::abs(pt1a.y() - pt1b.y())) - { - if (pt1a.x() > pt1b.x()) std::swap(pt1a, pt1b); - if (pt2a.x() > pt2b.x()) std::swap(pt2a, pt2b); - if (pt1a.x() > pt2a.x()) pt1 = pt1a; else pt1 = pt2a; - if (pt1b.x() < pt2b.x()) pt2 = pt1b; else pt2 = pt2b; - return pt1.x() < pt2.x(); - } else - { - if (pt1a.y() < pt1b.y()) std::swap(pt1a, pt1b); - if (pt2a.y() < pt2b.y()) std::swap(pt2a, pt2b); - if (pt1a.y() < pt2a.y()) pt1 = pt1a; else pt1 = pt2a; - if (pt1b.y() > pt2b.y()) pt2 = pt1b; else pt2 = pt2b; - return pt1.y() > pt2.y(); - } -} -//------------------------------------------------------------------------------ - -bool FirstIsBottomPt(const OutPt* btmPt1, const OutPt* btmPt2) -{ - OutPt *p = btmPt1->Prev; - while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Prev; - double dx1p = std::fabs(GetDx(btmPt1->Pt, p->Pt)); - p = btmPt1->Next; - while ((p->Pt == btmPt1->Pt) && (p != btmPt1)) p = p->Next; - double dx1n = std::fabs(GetDx(btmPt1->Pt, p->Pt)); - - p = btmPt2->Prev; - while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Prev; - double dx2p = std::fabs(GetDx(btmPt2->Pt, p->Pt)); - p = btmPt2->Next; - while ((p->Pt == btmPt2->Pt) && (p != btmPt2)) p = p->Next; - double dx2n = std::fabs(GetDx(btmPt2->Pt, p->Pt)); - - if (std::max(dx1p, dx1n) == std::max(dx2p, dx2n) && - std::min(dx1p, dx1n) == std::min(dx2p, dx2n)) - return Area(btmPt1) > 0; //if otherwise identical use orientation - else - return (dx1p >= dx2p && dx1p >= dx2n) || (dx1n >= dx2p && dx1n >= dx2n); -} -//------------------------------------------------------------------------------ - -// Called by GetLowermostRec() -OutPt* GetBottomPt(OutPt *pp) -{ - OutPt* dups = nullptr; - OutPt* p = pp->Next; - while (p != pp) - { - if (p->Pt.y() > pp->Pt.y()) - { - pp = p; - dups = nullptr; - } - else if (p->Pt.y() == pp->Pt.y() && p->Pt.x() <= pp->Pt.x()) - { - if (p->Pt.x() < pp->Pt.x()) - { - dups = nullptr; - pp = p; - } else - { - if (p->Next != pp && p->Prev != pp) dups = p; - } - } - p = p->Next; - } - if (dups) - { - //there appears to be at least 2 vertices at BottomPt so ... - while (dups != p) - { - if (!FirstIsBottomPt(p, dups)) pp = dups; - dups = dups->Next; - while (dups->Pt != pp->Pt) dups = dups->Next; - } - } - return pp; -} - -//------------------------------------------------------------------------------ - -bool Pt2IsBetweenPt1AndPt3(const IntPoint &pt1, - const IntPoint &pt2, const IntPoint &pt3) -{ - if ((pt1 == pt3) || (pt1 == pt2) || (pt3 == pt2)) - return false; - else if (pt1.x() != pt3.x()) - return (pt2.x() > pt1.x()) == (pt2.x() < pt3.x()); - else - return (pt2.y() > pt1.y()) == (pt2.y() < pt3.y()); -} -//------------------------------------------------------------------------------ - -bool HorzSegmentsOverlap(cInt seg1a, cInt seg1b, cInt seg2a, cInt seg2b) -{ - if (seg1a > seg1b) std::swap(seg1a, seg1b); - if (seg2a > seg2b) std::swap(seg2a, seg2b); - return (seg1a < seg2b) && (seg2a < seg1b); -} - -//------------------------------------------------------------------------------ -// ClipperBase class methods ... -//------------------------------------------------------------------------------ - -#ifdef CLIPPERLIB_INT32 -static inline void RangeTest(const IntPoint &pt) -{ -#ifndef NDEBUG - static constexpr const int32_t hi = 65536 * 16383; - if (pt.x() > hi || pt.y() > hi || -pt.x() > hi || -pt.y() > hi) - throw clipperException("Coordinate outside allowed range"); -#endif // NDEBUG -} -#else // CLIPPERLIB_INT32 -// Called from ClipperBase::AddPath() to verify the scale of the input polygon coordinates. -static inline void RangeTest(const IntPoint& Pt, bool& useFullRange) -{ - if (useFullRange) - { - if (Pt.x() > hiRange || Pt.y() > hiRange || -Pt.x() > hiRange || -Pt.y() > hiRange) - throw clipperException("Coordinate outside allowed range"); - } - else if (Pt.x() > loRange|| Pt.y() > loRange || -Pt.x() > loRange || -Pt.y() > loRange) - { - useFullRange = true; - RangeTest(Pt, useFullRange); - } -} -#endif // CLIPPERLIB_INT32 -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPath() to construct the Local Minima List. -// Find a local minimum edge on the path starting with E. -inline TEdge* FindNextLocMin(TEdge* E) -{ - for (;;) - { - while (E->Bot != E->Prev->Bot || E->Curr == E->Top) E = E->Next; - if (!IsHorizontal(*E) && !IsHorizontal(*E->Prev)) break; - while (IsHorizontal(*E->Prev)) E = E->Prev; - TEdge* E2 = E; - while (IsHorizontal(*E)) E = E->Next; - if (E->Top.y() == E->Prev->Bot.y()) continue; //ie just an intermediate horz. - if (E2->Prev->Bot.x() < E->Bot.x()) E = E2; - break; - } - return E; -} -//------------------------------------------------------------------------------ - -// Called from ClipperBase::AddPath(). -TEdge* ClipperBase::ProcessBound(TEdge* E, bool NextIsForward) -{ - TEdge *Result = E; - TEdge *Horz = 0; - - if (E->OutIdx == Skip) - { - //if edges still remain in the current bound beyond the skip edge then - //create another LocMin and call ProcessBound once more - if (NextIsForward) - { - while (E->Top.y() == E->Next->Bot.y()) E = E->Next; - //don't include top horizontals when parsing a bound a second time, - //they will be contained in the opposite bound ... - while (E != Result && IsHorizontal(*E)) E = E->Prev; - } - else - { - while (E->Top.y() == E->Prev->Bot.y()) E = E->Prev; - while (E != Result && IsHorizontal(*E)) E = E->Next; - } - - if (E == Result) - { - if (NextIsForward) Result = E->Next; - else Result = E->Prev; - } - else - { - //there are more edges in the bound beyond result starting with E - if (NextIsForward) - E = Result->Next; - else - E = Result->Prev; - LocalMinimum locMin; - locMin.Y = E->Bot.y(); - locMin.LeftBound = 0; - locMin.RightBound = E; - E->WindDelta = 0; - Result = ProcessBound(E, NextIsForward); - m_MinimaList.emplace_back(locMin); - } - return Result; - } - - TEdge *EStart; - - if (IsHorizontal(*E)) - { - //We need to be careful with open paths because this may not be a - //true local minima (ie E may be following a skip edge). - //Also, consecutive horz. edges may start heading left before going right. - if (NextIsForward) - EStart = E->Prev; - else - EStart = E->Next; - if (IsHorizontal(*EStart)) //ie an adjoining horizontal skip edge - { - if (EStart->Bot.x() != E->Bot.x() && EStart->Top.x() != E->Bot.x()) - ReverseHorizontal(*E); - } - else if (EStart->Bot.x() != E->Bot.x()) - ReverseHorizontal(*E); - } - - EStart = E; - if (NextIsForward) - { - while (Result->Top.y() == Result->Next->Bot.y() && Result->Next->OutIdx != Skip) - Result = Result->Next; - if (IsHorizontal(*Result) && Result->Next->OutIdx != Skip) - { - //nb: at the top of a bound, horizontals are added to the bound - //only when the preceding edge attaches to the horizontal's left vertex - //unless a Skip edge is encountered when that becomes the top divide - Horz = Result; - while (IsHorizontal(*Horz->Prev)) Horz = Horz->Prev; - if (Horz->Prev->Top.x() > Result->Next->Top.x()) Result = Horz->Prev; - } - while (E != Result) - { - E->NextInLML = E->Next; - if (IsHorizontal(*E) && E != EStart && - E->Bot.x() != E->Prev->Top.x()) ReverseHorizontal(*E); - E = E->Next; - } - if (IsHorizontal(*E) && E != EStart && E->Bot.x() != E->Prev->Top.x()) - ReverseHorizontal(*E); - Result = Result->Next; //move to the edge just beyond current bound - } else - { - while (Result->Top.y() == Result->Prev->Bot.y() && Result->Prev->OutIdx != Skip) - Result = Result->Prev; - if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip) - { - Horz = Result; - while (IsHorizontal(*Horz->Next)) Horz = Horz->Next; - if (Horz->Next->Top.x() == Result->Prev->Top.x() || - Horz->Next->Top.x() > Result->Prev->Top.x()) Result = Horz->Next; - } - - while (E != Result) - { - E->NextInLML = E->Prev; - if (IsHorizontal(*E) && E != EStart && E->Bot.x() != E->Next->Top.x()) - ReverseHorizontal(*E); - E = E->Prev; - } - if (IsHorizontal(*E) && E != EStart && E->Bot.x() != E->Next->Top.x()) - ReverseHorizontal(*E); - Result = Result->Prev; //move to the edge just beyond current bound - } - - return Result; -} -//------------------------------------------------------------------------------ - -bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed) -{ - // Remove duplicate end point from a closed input path. - // Remove duplicate points from the end of the input path. - int highI = (int)pg.size() -1; - if (Closed) - while (highI > 0 && (pg[highI] == pg[0])) - --highI; - while (highI > 0 && (pg[highI] == pg[highI -1])) - --highI; - if ((Closed && highI < 2) || (!Closed && highI < 1)) - return false; - - // Allocate a new edge array. - Edges edges(highI + 1); - // Fill in the edge array. - bool result = AddPathInternal(pg, highI, PolyTyp, Closed, edges.data()); - if (result) - // Success, remember the edge array. - m_edges.emplace_back(std::move(edges)); - return result; -} - -bool ClipperBase::AddPathInternal(const Path &pg, int highI, PolyType PolyTyp, bool Closed, TEdge* edges) -{ -#ifdef use_lines - if (!Closed && PolyTyp == ptClip) - throw clipperException("AddPath: Open paths must be subject."); -#else - if (!Closed) - throw clipperException("AddPath: Open paths have been disabled."); -#endif - - assert(highI >= 0 && highI < pg.size()); - - //1. Basic (first) edge initialization ... - try - { - edges[1].Curr = pg[1]; -#ifdef CLIPPERLIB_INT32 - RangeTest(pg[0]); - RangeTest(pg[highI]); -#else - RangeTest(pg[0], m_UseFullRange); - RangeTest(pg[highI], m_UseFullRange); -#endif // CLIPPERLIB_INT32 - InitEdge(&edges[0], &edges[1], &edges[highI], pg[0]); - InitEdge(&edges[highI], &edges[0], &edges[highI-1], pg[highI]); - for (int i = highI - 1; i >= 1; --i) - { -#ifdef CLIPPERLIB_INT32 - RangeTest(pg[i]); -#else - RangeTest(pg[i], m_UseFullRange); -#endif // CLIPPERLIB_INT32 - InitEdge(&edges[i], &edges[i+1], &edges[i-1], pg[i]); - } - } - catch(...) - { - throw; //range test fails - } - TEdge *eStart = &edges[0]; - - //2. Remove duplicate vertices, and (when closed) collinear edges ... - TEdge *E = eStart, *eLoopStop = eStart; - for (;;) - { - //nb: allows matching start and end points when not Closed ... - if (E->Curr == E->Next->Curr && (Closed || E->Next != eStart)) - { - if (E == E->Next) break; - if (E == eStart) eStart = E->Next; - E = RemoveEdge(E); - eLoopStop = E; - continue; - } - if (E->Prev == E->Next) - break; //only two vertices - else if (Closed && - SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) && - (!m_PreserveCollinear || - !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr))) - { - //Collinear edges are allowed for open paths but in closed paths - //the default is to merge adjacent collinear edges into a single edge. - //However, if the PreserveCollinear property is enabled, only overlapping - //collinear edges (ie spikes) will be removed from closed paths. - if (E == eStart) eStart = E->Next; - E = RemoveEdge(E); - E = E->Prev; - eLoopStop = E; - continue; - } - E = E->Next; - if ((E == eLoopStop) || (!Closed && E->Next == eStart)) break; - } - - if ((!Closed && (E == E->Next)) || (Closed && (E->Prev == E->Next))) - { - return false; - } - - if (!Closed) - { - m_HasOpenPaths = true; - eStart->Prev->OutIdx = Skip; - } - - //3. Do second stage of edge initialization ... - // IsFlat means all vertices have the same Y coordinate. - bool IsFlat = true; - E = eStart; - do - { - InitEdge2(*E, PolyTyp); - E = E->Next; - if (IsFlat && E->Curr.y() != eStart->Curr.y()) IsFlat = false; - } - while (E != eStart); - - //4. Finally, add edge bounds to LocalMinima list ... - - //Totally flat paths must be handled differently when adding them - //to LocalMinima list to avoid endless loops etc ... - if (IsFlat) - { - if (Closed) - { - return false; - } - E->Prev->OutIdx = Skip; - LocalMinimum locMin; - locMin.Y = E->Bot.y(); - locMin.LeftBound = 0; - locMin.RightBound = E; - locMin.RightBound->Side = esRight; - locMin.RightBound->WindDelta = 0; - for (;;) - { - if (E->Bot.x() != E->Prev->Top.x()) ReverseHorizontal(*E); - if (E->Next->OutIdx == Skip) break; - E->NextInLML = E->Next; - E = E->Next; - } - m_MinimaList.emplace_back(locMin); - return true; - } - - bool leftBoundIsForward; - TEdge* EMin = 0; - - //workaround to avoid an endless loop in the while loop below when - //open paths have matching start and end points ... - if (E->Prev->Bot == E->Prev->Top) E = E->Next; - - // Find local minima and store them into a Local Minima List. - // Multiple Local Minima could be created for a single path. - for (;;) - { - E = FindNextLocMin(E); - if (E == EMin) break; - else if (!EMin) EMin = E; - - //E and E.Prev now share a local minima (left aligned if horizontal). - //Compare their slopes to find which starts which bound ... - LocalMinimum locMin; - locMin.Y = E->Bot.y(); - if (E->Dx < E->Prev->Dx) - { - locMin.LeftBound = E->Prev; - locMin.RightBound = E; - leftBoundIsForward = false; //Q.nextInLML = Q.prev - } else - { - locMin.LeftBound = E; - locMin.RightBound = E->Prev; - leftBoundIsForward = true; //Q.nextInLML = Q.next - } - - if (!Closed) locMin.LeftBound->WindDelta = 0; - else if (locMin.LeftBound->Next == locMin.RightBound) - locMin.LeftBound->WindDelta = -1; - else locMin.LeftBound->WindDelta = 1; - locMin.RightBound->WindDelta = -locMin.LeftBound->WindDelta; - - E = ProcessBound(locMin.LeftBound, leftBoundIsForward); - if (E->OutIdx == Skip) E = ProcessBound(E, leftBoundIsForward); - - TEdge* E2 = ProcessBound(locMin.RightBound, !leftBoundIsForward); - if (E2->OutIdx == Skip) E2 = ProcessBound(E2, !leftBoundIsForward); - - if (locMin.LeftBound->OutIdx == Skip) - locMin.LeftBound = 0; - else if (locMin.RightBound->OutIdx == Skip) - locMin.RightBound = 0; - m_MinimaList.emplace_back(locMin); - if (!leftBoundIsForward) E = E2; - } - return true; -} -//------------------------------------------------------------------------------ - -void ClipperBase::Clear() -{ - m_MinimaList.clear(); - m_edges.clear(); -#ifndef CLIPPERLIB_INT32 - m_UseFullRange = false; -#endif // CLIPPERLIB_INT32 - m_HasOpenPaths = false; -} -//------------------------------------------------------------------------------ - -// Initialize the Local Minima List: -// Sort the LML entries, initialize the left / right bound edges of each Local Minima. -void ClipperBase::Reset() -{ - if (m_MinimaList.empty()) return; //ie nothing to process - std::sort(m_MinimaList.begin(), m_MinimaList.end(), [](const LocalMinimum& lm1, const LocalMinimum& lm2){ return lm1.Y < lm2.Y; }); - - //reset all edges ... - for (LocalMinimum &lm : m_MinimaList) { - TEdge* e = lm.LeftBound; - if (e) - { - e->Curr = e->Bot; - e->Side = esLeft; - e->OutIdx = Unassigned; - } - - e = lm.RightBound; - if (e) - { - e->Curr = e->Bot; - e->Side = esRight; - e->OutIdx = Unassigned; - } - } -} -//------------------------------------------------------------------------------ - -// Get bounds of the edges referenced by the Local Minima List. -// Returns (0,0,0,0) for an empty rectangle. -IntRect ClipperBase::GetBounds() -{ - IntRect result; - auto lm = m_MinimaList.begin(); - if (lm == m_MinimaList.end()) - { - result.left = result.top = result.right = result.bottom = 0; - return result; - } - result.left = lm->LeftBound->Bot.x(); - result.top = lm->LeftBound->Bot.y(); - result.right = lm->LeftBound->Bot.x(); - result.bottom = lm->LeftBound->Bot.y(); - while (lm != m_MinimaList.end()) - { - result.bottom = std::max(result.bottom, lm->LeftBound->Bot.y()); - TEdge* e = lm->LeftBound; - for (;;) { - TEdge* bottomE = e; - while (e->NextInLML) - { - if (e->Bot.x() < result.left) result.left = e->Bot.x(); - if (e->Bot.x() > result.right) result.right = e->Bot.x(); - e = e->NextInLML; - } - result.left = std::min(result.left, e->Bot.x()); - result.right = std::max(result.right, e->Bot.x()); - result.left = std::min(result.left, e->Top.x()); - result.right = std::max(result.right, e->Top.x()); - result.top = std::min(result.top, e->Top.y()); - if (bottomE == lm->LeftBound) e = lm->RightBound; - else break; - } - ++lm; - } - return result; -} - -//------------------------------------------------------------------------------ -// TClipper methods ... -//------------------------------------------------------------------------------ - -Clipper::Clipper(int initOptions) : - ClipperBase(), - m_OutPtsFree(nullptr), - m_OutPtsChunkLast(m_OutPtsChunkSize), - m_ActiveEdges(nullptr), - m_SortedEdges(nullptr) -{ - m_ReverseOutput = ((initOptions & ioReverseSolution) != 0); - m_StrictSimple = ((initOptions & ioStrictlySimple) != 0); - m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0); - m_HasOpenPaths = false; -#ifdef CLIPPERLIB_USE_XYZ - m_ZFill = 0; -#endif -} -//------------------------------------------------------------------------------ - -void Clipper::Reset() -{ - ClipperBase::Reset(); - m_Scanbeam = std::priority_queue{}; - m_Maxima.clear(); - m_ActiveEdges = 0; - m_SortedEdges = 0; - for (auto lm = m_MinimaList.rbegin(); lm != m_MinimaList.rend(); ++lm) - m_Scanbeam.push(lm->Y); -} - -//------------------------------------------------------------------------------ - -bool Clipper::Execute(ClipType clipType, Paths &solution, - PolyFillType subjFillType, PolyFillType clipFillType) -{ - if (m_HasOpenPaths) - throw clipperException("Error: PolyTree struct is needed for open path clipping."); - solution.clear(); - m_SubjFillType = subjFillType; - m_ClipFillType = clipFillType; - m_ClipType = clipType; - m_UsingPolyTree = false; - bool succeeded = ExecuteInternal(); - if (succeeded) BuildResult(solution); - DisposeAllOutRecs(); - return succeeded; -} -//------------------------------------------------------------------------------ - -bool Clipper::Execute(ClipType clipType, PolyTree& polytree, - PolyFillType subjFillType, PolyFillType clipFillType) -{ - m_SubjFillType = subjFillType; - m_ClipFillType = clipFillType; - m_ClipType = clipType; - m_UsingPolyTree = true; - bool succeeded = ExecuteInternal(); - if (succeeded) BuildResult2(polytree); - DisposeAllOutRecs(); - return succeeded; -} -//------------------------------------------------------------------------------ - -bool Clipper::ExecuteInternal() -{ - bool succeeded = true; - try { - Reset(); - if (m_MinimaList.empty()) return true; - cInt botY = m_Scanbeam.top(); - do { m_Scanbeam.pop(); } while (! m_Scanbeam.empty() && botY == m_Scanbeam.top()); - do { - InsertLocalMinimaIntoAEL(botY); - ProcessHorizontals(); - m_GhostJoins.clear(); - if (m_Scanbeam.empty()) break; - cInt topY = m_Scanbeam.top(); - do { m_Scanbeam.pop(); } while (! m_Scanbeam.empty() && topY == m_Scanbeam.top()); - succeeded = ProcessIntersections(topY); - if (!succeeded) break; - ProcessEdgesAtTopOfScanbeam(topY); - botY = topY; - } while (!m_Scanbeam.empty() || !m_MinimaList.empty()); - } - catch(...) - { - succeeded = false; - } - - if (succeeded) - { - - //fix orientations ... - //FIXME Vojtech: Does it not invalidate the loop hierarchy maintained as OutRec::FirstLeft pointers? - //FIXME Vojtech: The area is calculated with floats, it may not be numerically stable! - { - for (OutRec &outRec : m_PolyOuts) - if (outRec.Pts && !outRec.IsOpen && (outRec.IsHole ^ m_ReverseOutput) == (Area(outRec) > 0)) - ReversePolyPtLinks(outRec.Pts); - } - - JoinCommonEdges(); - - //unfortunately FixupOutPolygon() must be done after JoinCommonEdges() - { - for (OutRec &outRec : m_PolyOuts) - if (outRec.Pts) { - if (outRec.IsOpen) - // Removes duplicate points. - FixupOutPolyline(outRec); - else - // Removes duplicate points and simplifies consecutive parallel edges by removing the middle vertex. - FixupOutPolygon(outRec); - } - } - // For each polygon, search for exactly duplicate non-successive points. - // If such a point is found, the loop is split into two pieces. - // Search for the duplicate points is O(n^2)! - // http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/Clipper/Properties/StrictlySimple.htm - if (m_StrictSimple) DoSimplePolygons(); - } - - m_Joins.clear(); - m_GhostJoins.clear(); - return succeeded; -} -//------------------------------------------------------------------------------ - -OutPt* Clipper::AllocateOutPt() -{ - OutPt *pt; - if (m_OutPtsFree) { - // Recycle some of the already released points. - pt = m_OutPtsFree; - m_OutPtsFree = pt->Next; - } else if (m_OutPtsChunkLast < m_OutPtsChunkSize) { - // Get a point from the last chunk. - pt = &m_OutPts.back()[m_OutPtsChunkLast ++]; - } else { - // The last chunk is full. Allocate a new one. - m_OutPts.emplace_back(); - m_OutPtsChunkLast = 1; - pt = &m_OutPts.back().front(); - } - return pt; -} - -void Clipper::DisposeAllOutRecs() -{ - m_OutPts.clear(); - m_OutPtsFree = nullptr; - m_OutPtsChunkLast = m_OutPtsChunkSize; - m_PolyOuts.clear(); -} -//------------------------------------------------------------------------------ - -void Clipper::SetWindingCount(TEdge &edge) const -{ - TEdge *e = edge.PrevInAEL; - //find the edge of the same polytype that immediately preceeds 'edge' in AEL - while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0))) e = e->PrevInAEL; - if (!e) - { - if (edge.WindDelta == 0) - { - PolyFillType pft = (edge.PolyTyp == ptSubject ? m_SubjFillType : m_ClipFillType); - edge.WindCnt = (pft == pftNegative ? -1 : 1); - } - else - edge.WindCnt = edge.WindDelta; - edge.WindCnt2 = 0; - e = m_ActiveEdges; //ie get ready to calc WindCnt2 - } - else if (edge.WindDelta == 0 && m_ClipType != ctUnion) - { - edge.WindCnt = 1; - edge.WindCnt2 = e->WindCnt2; - e = e->NextInAEL; //ie get ready to calc WindCnt2 - } - else if (IsEvenOddFillType(edge)) - { - //EvenOdd filling ... - if (edge.WindDelta == 0) - { - //are we inside a subj polygon ... - bool Inside = true; - TEdge *e2 = e->PrevInAEL; - while (e2) - { - if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0) - Inside = !Inside; - e2 = e2->PrevInAEL; - } - edge.WindCnt = (Inside ? 0 : 1); - } - else - { - edge.WindCnt = edge.WindDelta; - } - edge.WindCnt2 = e->WindCnt2; - e = e->NextInAEL; //ie get ready to calc WindCnt2 - } - else - { - //nonZero, Positive or Negative filling ... - if (e->WindCnt * e->WindDelta < 0) - { - //prev edge is 'decreasing' WindCount (WC) toward zero - //so we're outside the previous polygon ... - if (std::abs(e->WindCnt) > 1) - { - //outside prev poly but still inside another. - //when reversing direction of prev poly use the same WC - if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt; - //otherwise continue to 'decrease' WC ... - else edge.WindCnt = e->WindCnt + edge.WindDelta; - } - else - //now outside all polys of same polytype so set own WC ... - edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta); - } else - { - //prev edge is 'increasing' WindCount (WC) away from zero - //so we're inside the previous polygon ... - if (edge.WindDelta == 0) - edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1); - //if wind direction is reversing prev then use same WC - else if (e->WindDelta * edge.WindDelta < 0) edge.WindCnt = e->WindCnt; - //otherwise add to WC ... - else edge.WindCnt = e->WindCnt + edge.WindDelta; - } - edge.WindCnt2 = e->WindCnt2; - e = e->NextInAEL; //ie get ready to calc WindCnt2 - } - - //update WindCnt2 ... - if (IsEvenOddAltFillType(edge)) - { - //EvenOdd filling ... - while (e != &edge) - { - if (e->WindDelta != 0) - edge.WindCnt2 = (edge.WindCnt2 == 0 ? 1 : 0); - e = e->NextInAEL; - } - } else - { - //nonZero, Positive or Negative filling ... - while ( e != &edge ) - { - edge.WindCnt2 += e->WindDelta; - e = e->NextInAEL; - } - } -} -//------------------------------------------------------------------------------ - -bool Clipper::IsContributing(const TEdge& edge) const -{ - PolyFillType pft, pft2; - if (edge.PolyTyp == ptSubject) - { - pft = m_SubjFillType; - pft2 = m_ClipFillType; - } else - { - pft = m_ClipFillType; - pft2 = m_SubjFillType; - } - - switch(pft) - { - case pftEvenOdd: - //return false if a subj line has been flagged as inside a subj polygon - if (edge.WindDelta == 0 && edge.WindCnt != 1) return false; - break; - case pftNonZero: - if (std::abs(edge.WindCnt) != 1) return false; - break; - case pftPositive: - if (edge.WindCnt != 1) return false; - break; - default: //pftNegative - if (edge.WindCnt != -1) return false; - } - - switch(m_ClipType) - { - case ctIntersection: - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 != 0); - case pftPositive: - return (edge.WindCnt2 > 0); - default: - return (edge.WindCnt2 < 0); - } - break; - case ctUnion: - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 == 0); - case pftPositive: - return (edge.WindCnt2 <= 0); - default: - return (edge.WindCnt2 >= 0); - } - break; - case ctDifference: - if (edge.PolyTyp == ptSubject) - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 == 0); - case pftPositive: - return (edge.WindCnt2 <= 0); - default: - return (edge.WindCnt2 >= 0); - } - else - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 != 0); - case pftPositive: - return (edge.WindCnt2 > 0); - default: - return (edge.WindCnt2 < 0); - } - break; - case ctXor: - if (edge.WindDelta == 0) //XOr always contributing unless open - switch(pft2) - { - case pftEvenOdd: - case pftNonZero: - return (edge.WindCnt2 == 0); - case pftPositive: - return (edge.WindCnt2 <= 0); - default: - return (edge.WindCnt2 >= 0); - } - else - return true; - break; - default: - return true; - } -} -//------------------------------------------------------------------------------ - -// Called from Clipper::InsertLocalMinimaIntoAEL() and Clipper::IntersectEdges(). -OutPt* Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) -{ - OutPt* result; - TEdge *e, *prevE; - if (IsHorizontal(*e2) || ( e1->Dx > e2->Dx )) - { - result = AddOutPt(e1, Pt); - e2->OutIdx = e1->OutIdx; - e1->Side = esLeft; - e2->Side = esRight; - e = e1; - if (e->PrevInAEL == e2) - prevE = e2->PrevInAEL; - else - prevE = e->PrevInAEL; - } else - { - result = AddOutPt(e2, Pt); - e1->OutIdx = e2->OutIdx; - e1->Side = esRight; - e2->Side = esLeft; - e = e2; - if (e->PrevInAEL == e1) - prevE = e1->PrevInAEL; - else - prevE = e->PrevInAEL; - } - - if (prevE && prevE->OutIdx >= 0 && prevE->Top.y() < Pt.y() && e->Top.y() < Pt.y()) - { - cInt xPrev = TopX(*prevE, Pt.y()); - cInt xE = TopX(*e, Pt.y()); - if (xPrev == xE && (e->WindDelta != 0) && (prevE->WindDelta != 0) && - SlopesEqual(IntPoint2d(xPrev, Pt.y()), prevE->Top, IntPoint2d(xE, Pt.y()), e->Top, m_UseFullRange)) - { - OutPt* outPt = AddOutPt(prevE, Pt); - m_Joins.emplace_back(Join(result, outPt, e->Top)); - } - } - return result; -} -//------------------------------------------------------------------------------ - -void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) -{ - AddOutPt( e1, Pt ); - if (e2->WindDelta == 0) AddOutPt(e2, Pt); - if( e1->OutIdx == e2->OutIdx ) - { - e1->OutIdx = Unassigned; - e2->OutIdx = Unassigned; - } - else if (e1->OutIdx < e2->OutIdx) - AppendPolygon(e1, e2); - else - AppendPolygon(e2, e1); -} -//------------------------------------------------------------------------------ - -void Clipper::AddEdgeToSEL(TEdge *edge) -{ - //SEL pointers in PEdge are reused to build a list of horizontal edges. - //However, we don't need to worry about order with horizontal edge processing. - if( !m_SortedEdges ) - { - m_SortedEdges = edge; - edge->PrevInSEL = 0; - edge->NextInSEL = 0; - } - else - { - edge->NextInSEL = m_SortedEdges; - edge->PrevInSEL = 0; - m_SortedEdges->PrevInSEL = edge; - m_SortedEdges = edge; - } -} -//------------------------------------------------------------------------------ - -void Clipper::CopyAELToSEL() -{ - TEdge* e = m_ActiveEdges; - m_SortedEdges = e; - while ( e ) - { - e->PrevInSEL = e->PrevInAEL; - e->NextInSEL = e->NextInAEL; - e = e->NextInAEL; - } -} - -//------------------------------------------------------------------------------ - -// Called from Clipper::ExecuteInternal() -void Clipper::InsertLocalMinimaIntoAEL(const cInt botY) -{ - while (!m_MinimaList.empty() && m_MinimaList.back().Y == botY) - { - TEdge* lb = m_MinimaList.back().LeftBound; - TEdge* rb = m_MinimaList.back().RightBound; - m_MinimaList.pop_back(); - - OutPt *Op1 = 0; - if (!lb) - { - //nb: don't insert LB into either AEL or SEL - InsertEdgeIntoAEL(rb, 0); - SetWindingCount(*rb); - if (IsContributing(*rb)) - Op1 = AddOutPt(rb, rb->Bot); - } - else if (!rb) - { - InsertEdgeIntoAEL(lb, 0); - SetWindingCount(*lb); - if (IsContributing(*lb)) - Op1 = AddOutPt(lb, lb->Bot); - m_Scanbeam.push(lb->Top.y()); - } - else - { - InsertEdgeIntoAEL(lb, 0); - InsertEdgeIntoAEL(rb, lb); - SetWindingCount( *lb ); - rb->WindCnt = lb->WindCnt; - rb->WindCnt2 = lb->WindCnt2; - if (IsContributing(*lb)) - Op1 = AddLocalMinPoly(lb, rb, lb->Bot); - m_Scanbeam.push(lb->Top.y()); - } - - if (rb) - { - if (IsHorizontal(*rb)) - { - AddEdgeToSEL(rb); - if (rb->NextInLML) - m_Scanbeam.push(rb->NextInLML->Top.y()); - } - else m_Scanbeam.push(rb->Top.y()); - } - - if (!lb || !rb) continue; - - //if any output polygons share an edge, they'll need joining later ... - if (Op1 && IsHorizontal(*rb) && - m_GhostJoins.size() > 0 && (rb->WindDelta != 0)) - { - for (Join &jr : m_GhostJoins) - //if the horizontal Rb and a 'ghost' horizontal overlap, then convert - //the 'ghost' join to a real join ready for later ... - if (HorzSegmentsOverlap(jr.OutPt1->Pt.x(), jr.OffPt.x(), rb->Bot.x(), rb->Top.x())) - m_Joins.emplace_back(Join(jr.OutPt1, Op1, jr.OffPt)); - } - - if (lb->OutIdx >= 0 && lb->PrevInAEL && - lb->PrevInAEL->Curr.x() == lb->Bot.x() && - lb->PrevInAEL->OutIdx >= 0 && - SlopesEqual(lb->PrevInAEL->Bot, lb->PrevInAEL->Top, lb->Curr, lb->Top, m_UseFullRange) && - (lb->WindDelta != 0) && (lb->PrevInAEL->WindDelta != 0)) - { - OutPt *Op2 = AddOutPt(lb->PrevInAEL, lb->Bot); - m_Joins.emplace_back(Join(Op1, Op2, lb->Top)); - } - - if(lb->NextInAEL != rb) - { - - if (rb->OutIdx >= 0 && rb->PrevInAEL->OutIdx >= 0 && - SlopesEqual(rb->PrevInAEL->Curr, rb->PrevInAEL->Top, rb->Curr, rb->Top, m_UseFullRange) && - (rb->WindDelta != 0) && (rb->PrevInAEL->WindDelta != 0)) - { - OutPt *Op2 = AddOutPt(rb->PrevInAEL, rb->Bot); - m_Joins.emplace_back(Join(Op1, Op2, rb->Top)); - } - - TEdge* e = lb->NextInAEL; - if (e) - { - while( e != rb ) - { - //nb: For calculating winding counts etc, IntersectEdges() assumes - //that param1 will be to the Right of param2 ABOVE the intersection ... - IntersectEdges(rb , e , lb->Curr); //order important here - e = e->NextInAEL; - } - } - } - - } -} -//------------------------------------------------------------------------------ - -void Clipper::DeleteFromAEL(TEdge *e) -{ - TEdge* AelPrev = e->PrevInAEL; - TEdge* AelNext = e->NextInAEL; - if( !AelPrev && !AelNext && (e != m_ActiveEdges) ) return; //already deleted - if( AelPrev ) AelPrev->NextInAEL = AelNext; - else m_ActiveEdges = AelNext; - if( AelNext ) AelNext->PrevInAEL = AelPrev; - e->NextInAEL = 0; - e->PrevInAEL = 0; -} -//------------------------------------------------------------------------------ - -void Clipper::DeleteFromSEL(TEdge *e) -{ - TEdge* SelPrev = e->PrevInSEL; - TEdge* SelNext = e->NextInSEL; - if( !SelPrev && !SelNext && (e != m_SortedEdges) ) return; //already deleted - if( SelPrev ) SelPrev->NextInSEL = SelNext; - else m_SortedEdges = SelNext; - if( SelNext ) SelNext->PrevInSEL = SelPrev; - e->NextInSEL = 0; - e->PrevInSEL = 0; -} -//------------------------------------------------------------------------------ - -#ifdef CLIPPERLIB_USE_XYZ -void Clipper::SetZ(IntPoint& pt, TEdge& e1, TEdge& e2) -{ - if (pt.z() != 0 || !m_ZFill) return; - else if (pt == e1.Bot) pt.z() = e1.Bot.z(); - else if (pt == e1.Top) pt.z() = e1.Top.z(); - else if (pt == e2.Bot) pt.z() = e2.Bot.z(); - else if (pt == e2.Top) pt.z() = e2.Top.z(); - else m_ZFill(e1.Bot, e1.Top, e2.Bot, e2.Top, pt); -} -//------------------------------------------------------------------------------ -#endif - -void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt) -{ - bool e1Contributing = ( e1->OutIdx >= 0 ); - bool e2Contributing = ( e2->OutIdx >= 0 ); - -#ifdef CLIPPERLIB_USE_XYZ - SetZ(Pt, *e1, *e2); -#endif - -#ifdef use_lines - //if either edge is on an OPEN path ... - if (e1->WindDelta == 0 || e2->WindDelta == 0) - { - //ignore subject-subject open path intersections UNLESS they - //are both open paths, AND they are both 'contributing maximas' ... - if (e1->WindDelta == 0 && e2->WindDelta == 0) return; - - //if intersecting a subj line with a subj poly ... - else if (e1->PolyTyp == e2->PolyTyp && - e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion) - { - if (e1->WindDelta == 0) - { - if (e2Contributing) - { - AddOutPt(e1, Pt); - if (e1Contributing) e1->OutIdx = Unassigned; - } - } - else - { - if (e1Contributing) - { - AddOutPt(e2, Pt); - if (e2Contributing) e2->OutIdx = Unassigned; - } - } - } - else if (e1->PolyTyp != e2->PolyTyp) - { - //toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ... - if ((e1->WindDelta == 0) && std::abs(e2->WindCnt) == 1 && - (m_ClipType != ctUnion || e2->WindCnt2 == 0)) - { - AddOutPt(e1, Pt); - if (e1Contributing) e1->OutIdx = Unassigned; - } - else if ((e2->WindDelta == 0) && (std::abs(e1->WindCnt) == 1) && - (m_ClipType != ctUnion || e1->WindCnt2 == 0)) - { - AddOutPt(e2, Pt); - if (e2Contributing) e2->OutIdx = Unassigned; - } - } - return; - } -#endif - - //update winding counts... - //assumes that e1 will be to the Right of e2 ABOVE the intersection - if ( e1->PolyTyp == e2->PolyTyp ) - { - if ( IsEvenOddFillType( *e1) ) - { - int oldE1WindCnt = e1->WindCnt; - e1->WindCnt = e2->WindCnt; - e2->WindCnt = oldE1WindCnt; - } else - { - if (e1->WindCnt + e2->WindDelta == 0 ) e1->WindCnt = -e1->WindCnt; - else e1->WindCnt += e2->WindDelta; - if ( e2->WindCnt - e1->WindDelta == 0 ) e2->WindCnt = -e2->WindCnt; - else e2->WindCnt -= e1->WindDelta; - } - } else - { - if (!IsEvenOddFillType(*e2)) e1->WindCnt2 += e2->WindDelta; - else e1->WindCnt2 = ( e1->WindCnt2 == 0 ) ? 1 : 0; - if (!IsEvenOddFillType(*e1)) e2->WindCnt2 -= e1->WindDelta; - else e2->WindCnt2 = ( e2->WindCnt2 == 0 ) ? 1 : 0; - } - - PolyFillType e1FillType, e2FillType, e1FillType2, e2FillType2; - if (e1->PolyTyp == ptSubject) - { - e1FillType = m_SubjFillType; - e1FillType2 = m_ClipFillType; - } else - { - e1FillType = m_ClipFillType; - e1FillType2 = m_SubjFillType; - } - if (e2->PolyTyp == ptSubject) - { - e2FillType = m_SubjFillType; - e2FillType2 = m_ClipFillType; - } else - { - e2FillType = m_ClipFillType; - e2FillType2 = m_SubjFillType; - } - - cInt e1Wc, e2Wc; - switch (e1FillType) - { - case pftPositive: e1Wc = e1->WindCnt; break; - case pftNegative: e1Wc = -e1->WindCnt; break; - default: e1Wc = std::abs(e1->WindCnt); - } - switch(e2FillType) - { - case pftPositive: e2Wc = e2->WindCnt; break; - case pftNegative: e2Wc = -e2->WindCnt; break; - default: e2Wc = std::abs(e2->WindCnt); - } - - if ( e1Contributing && e2Contributing ) - { - if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) || - (e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor) ) - { - AddLocalMaxPoly(e1, e2, Pt); - } - else - { - AddOutPt(e1, Pt); - AddOutPt(e2, Pt); - std::swap(e1->Side, e2->Side); - std::swap(e1->OutIdx, e2->OutIdx); - } - } - else if ( e1Contributing ) - { - if (e2Wc == 0 || e2Wc == 1) - { - AddOutPt(e1, Pt); - std::swap(e1->Side, e2->Side); - std::swap(e1->OutIdx, e2->OutIdx); - } - } - else if ( e2Contributing ) - { - if (e1Wc == 0 || e1Wc == 1) - { - AddOutPt(e2, Pt); - std::swap(e1->Side, e2->Side); - std::swap(e1->OutIdx, e2->OutIdx); - } - } - else if ( (e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1)) - { - //neither edge is currently contributing ... - - cInt e1Wc2, e2Wc2; - switch (e1FillType2) - { - case pftPositive: e1Wc2 = e1->WindCnt2; break; - case pftNegative : e1Wc2 = -e1->WindCnt2; break; - default: e1Wc2 = std::abs(e1->WindCnt2); - } - switch (e2FillType2) - { - case pftPositive: e2Wc2 = e2->WindCnt2; break; - case pftNegative: e2Wc2 = -e2->WindCnt2; break; - default: e2Wc2 = std::abs(e2->WindCnt2); - } - - if (e1->PolyTyp != e2->PolyTyp) - { - AddLocalMinPoly(e1, e2, Pt); - } - else if (e1Wc == 1 && e2Wc == 1) - switch( m_ClipType ) { - case ctIntersection: - if (e1Wc2 > 0 && e2Wc2 > 0) - AddLocalMinPoly(e1, e2, Pt); - break; - case ctUnion: - if ( e1Wc2 <= 0 && e2Wc2 <= 0 ) - AddLocalMinPoly(e1, e2, Pt); - break; - case ctDifference: - if (((e1->PolyTyp == ptClip) && (e1Wc2 > 0) && (e2Wc2 > 0)) || - ((e1->PolyTyp == ptSubject) && (e1Wc2 <= 0) && (e2Wc2 <= 0))) - AddLocalMinPoly(e1, e2, Pt); - break; - case ctXor: - AddLocalMinPoly(e1, e2, Pt); - } - else - std::swap(e1->Side, e2->Side); - } -} -//------------------------------------------------------------------------------ - -void Clipper::SetHoleState(TEdge *e, OutRec *outrec) -{ - TEdge *e2 = e->PrevInAEL; - TEdge *eTmp = 0; - while (e2) - { - if (e2->OutIdx >= 0 && e2->WindDelta != 0) - { - if (!eTmp) eTmp = e2; - else if (eTmp->OutIdx == e2->OutIdx) eTmp = 0; - } - e2 = e2->PrevInAEL; - } - if (!eTmp) - { - outrec->FirstLeft = 0; - outrec->IsHole = false; - } - else - { - outrec->FirstLeft = &m_PolyOuts[eTmp->OutIdx]; - outrec->IsHole = !outrec->FirstLeft->IsHole; - } -} -//------------------------------------------------------------------------------ - -OutRec* GetLowermostRec(OutRec *outRec1, OutRec *outRec2) -{ - //work out which polygon fragment has the correct hole state ... - if (!outRec1->BottomPt) - outRec1->BottomPt = GetBottomPt(outRec1->Pts); - if (!outRec2->BottomPt) - outRec2->BottomPt = GetBottomPt(outRec2->Pts); - OutPt *OutPt1 = outRec1->BottomPt; - OutPt *OutPt2 = outRec2->BottomPt; - if (OutPt1->Pt.y() > OutPt2->Pt.y()) return outRec1; - else if (OutPt1->Pt.y() < OutPt2->Pt.y()) return outRec2; - else if (OutPt1->Pt.x() < OutPt2->Pt.x()) return outRec1; - else if (OutPt1->Pt.x() > OutPt2->Pt.x()) return outRec2; - else if (OutPt1->Next == OutPt1) return outRec2; - else if (OutPt2->Next == OutPt2) return outRec1; - else if (FirstIsBottomPt(OutPt1, OutPt2)) return outRec1; - else return outRec2; -} -//------------------------------------------------------------------------------ - -bool OutRec1RightOfOutRec2(OutRec* outRec1, OutRec* outRec2) -{ - do - { - outRec1 = outRec1->FirstLeft; - if (outRec1 == outRec2) return true; - } while (outRec1); - return false; -} -//------------------------------------------------------------------------------ - -OutRec* Clipper::GetOutRec(int Idx) -{ - OutRec* outrec = &m_PolyOuts[Idx]; - while (outrec != &m_PolyOuts[outrec->Idx]) - outrec = &m_PolyOuts[outrec->Idx]; - return outrec; -} -//------------------------------------------------------------------------------ - -void Clipper::AppendPolygon(TEdge *e1, TEdge *e2) -{ - //get the start and ends of both output polygons ... - OutRec *outRec1 = &m_PolyOuts[e1->OutIdx]; - OutRec *outRec2 = &m_PolyOuts[e2->OutIdx]; - - OutRec *holeStateRec; - if (OutRec1RightOfOutRec2(outRec1, outRec2)) - holeStateRec = outRec2; - else if (OutRec1RightOfOutRec2(outRec2, outRec1)) - holeStateRec = outRec1; - else - holeStateRec = GetLowermostRec(outRec1, outRec2); - - //get the start and ends of both output polygons and - //join e2 poly onto e1 poly and delete pointers to e2 ... - - OutPt* p1_lft = outRec1->Pts; - OutPt* p1_rt = p1_lft->Prev; - OutPt* p2_lft = outRec2->Pts; - OutPt* p2_rt = p2_lft->Prev; - - //join e2 poly onto e1 poly and delete pointers to e2 ... - if( e1->Side == esLeft ) - { - if( e2->Side == esLeft ) - { - //z y x a b c - ReversePolyPtLinks(p2_lft); - p2_lft->Next = p1_lft; - p1_lft->Prev = p2_lft; - p1_rt->Next = p2_rt; - p2_rt->Prev = p1_rt; - outRec1->Pts = p2_rt; - } else - { - //x y z a b c - p2_rt->Next = p1_lft; - p1_lft->Prev = p2_rt; - p2_lft->Prev = p1_rt; - p1_rt->Next = p2_lft; - outRec1->Pts = p2_lft; - } - } else - { - if( e2->Side == esRight ) - { - //a b c z y x - ReversePolyPtLinks(p2_lft); - p1_rt->Next = p2_rt; - p2_rt->Prev = p1_rt; - p2_lft->Next = p1_lft; - p1_lft->Prev = p2_lft; - } else - { - //a b c x y z - p1_rt->Next = p2_lft; - p2_lft->Prev = p1_rt; - p1_lft->Prev = p2_rt; - p2_rt->Next = p1_lft; - } - } - - outRec1->BottomPt = 0; - if (holeStateRec == outRec2) - { - if (outRec2->FirstLeft != outRec1) - outRec1->FirstLeft = outRec2->FirstLeft; - outRec1->IsHole = outRec2->IsHole; - } - outRec2->Pts = 0; - outRec2->BottomPt = 0; - outRec2->FirstLeft = outRec1; - - int OKIdx = e1->OutIdx; - int ObsoleteIdx = e2->OutIdx; - - e1->OutIdx = Unassigned; //nb: safe because we only get here via AddLocalMaxPoly - e2->OutIdx = Unassigned; - - TEdge* e = m_ActiveEdges; - while( e ) - { - if( e->OutIdx == ObsoleteIdx ) - { - e->OutIdx = OKIdx; - e->Side = e1->Side; - break; - } - e = e->NextInAEL; - } - - outRec2->Idx = outRec1->Idx; -} -//------------------------------------------------------------------------------ - -OutRec* Clipper::CreateOutRec() -{ - m_PolyOuts.emplace_back(); - OutRec &result = m_PolyOuts.back(); - result.IsHole = false; - result.IsOpen = false; - result.FirstLeft = 0; - result.Pts = 0; - result.BottomPt = 0; - result.PolyNd = 0; - result.Idx = (int)m_PolyOuts.size()-1; - return &result; -} -//------------------------------------------------------------------------------ - -OutPt* Clipper::AddOutPt(TEdge *e, const IntPoint &pt) -{ - if( e->OutIdx < 0 ) - { - OutRec *outRec = CreateOutRec(); - outRec->IsOpen = (e->WindDelta == 0); - OutPt* newOp = this->AllocateOutPt(); - outRec->Pts = newOp; - newOp->Idx = outRec->Idx; - newOp->Pt = pt; - newOp->Next = newOp; - newOp->Prev = newOp; - if (!outRec->IsOpen) - SetHoleState(e, outRec); - e->OutIdx = outRec->Idx; - return newOp; - } else - { - OutRec *outRec = &m_PolyOuts[e->OutIdx]; - //OutRec.Pts is the 'Left-most' point & OutRec.Pts.Prev is the 'Right-most' - OutPt* op = outRec->Pts; - - bool ToFront = (e->Side == esLeft); - if (ToFront && (pt == op->Pt)) return op; - else if (!ToFront && (pt == op->Prev->Pt)) return op->Prev; - - OutPt* newOp = this->AllocateOutPt(); - newOp->Idx = outRec->Idx; - newOp->Pt = pt; - newOp->Next = op; - newOp->Prev = op->Prev; - newOp->Prev->Next = newOp; - op->Prev = newOp; - if (ToFront) outRec->Pts = newOp; - return newOp; - } -} -//------------------------------------------------------------------------------ - -OutPt* Clipper::GetLastOutPt(TEdge *e) -{ - OutRec *outRec = &m_PolyOuts[e->OutIdx]; - if (e->Side == esLeft) - return outRec->Pts; - else - return outRec->Pts->Prev; -} -//------------------------------------------------------------------------------ - -void Clipper::ProcessHorizontals() -{ - TEdge* horzEdge = m_SortedEdges; - while(horzEdge) - { - DeleteFromSEL(horzEdge); - ProcessHorizontal(horzEdge); - horzEdge = m_SortedEdges; - } -} -//------------------------------------------------------------------------------ - -inline bool IsMaxima(TEdge *e, const cInt Y) -{ - return e && e->Top.y() == Y && !e->NextInLML; -} -//------------------------------------------------------------------------------ - -inline bool IsIntermediate(TEdge *e, const cInt Y) -{ - return e->Top.y() == Y && e->NextInLML; -} -//------------------------------------------------------------------------------ - -inline TEdge *GetMaximaPair(TEdge *e) -{ - if ((e->Next->Top == e->Top) && !e->Next->NextInLML) - return e->Next; - else if ((e->Prev->Top == e->Top) && !e->Prev->NextInLML) - return e->Prev; - else return 0; -} -//------------------------------------------------------------------------------ - -inline TEdge *GetMaximaPairEx(TEdge *e) -{ - //as GetMaximaPair() but returns 0 if MaxPair isn't in AEL (unless it's horizontal) - TEdge* result = GetMaximaPair(e); - if (result && (result->OutIdx == Skip || - (result->NextInAEL == result->PrevInAEL && !IsHorizontal(*result)))) return 0; - return result; -} -//------------------------------------------------------------------------------ - -void Clipper::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2) -{ - //check that one or other edge hasn't already been removed from AEL ... - if (Edge1->NextInAEL == Edge1->PrevInAEL || - Edge2->NextInAEL == Edge2->PrevInAEL) return; - - if( Edge1->NextInAEL == Edge2 ) - { - TEdge* Next = Edge2->NextInAEL; - if( Next ) Next->PrevInAEL = Edge1; - TEdge* Prev = Edge1->PrevInAEL; - if( Prev ) Prev->NextInAEL = Edge2; - Edge2->PrevInAEL = Prev; - Edge2->NextInAEL = Edge1; - Edge1->PrevInAEL = Edge2; - Edge1->NextInAEL = Next; - } - else if( Edge2->NextInAEL == Edge1 ) - { - TEdge* Next = Edge1->NextInAEL; - if( Next ) Next->PrevInAEL = Edge2; - TEdge* Prev = Edge2->PrevInAEL; - if( Prev ) Prev->NextInAEL = Edge1; - Edge1->PrevInAEL = Prev; - Edge1->NextInAEL = Edge2; - Edge2->PrevInAEL = Edge1; - Edge2->NextInAEL = Next; - } - else - { - TEdge* Next = Edge1->NextInAEL; - TEdge* Prev = Edge1->PrevInAEL; - Edge1->NextInAEL = Edge2->NextInAEL; - if( Edge1->NextInAEL ) Edge1->NextInAEL->PrevInAEL = Edge1; - Edge1->PrevInAEL = Edge2->PrevInAEL; - if( Edge1->PrevInAEL ) Edge1->PrevInAEL->NextInAEL = Edge1; - Edge2->NextInAEL = Next; - if( Edge2->NextInAEL ) Edge2->NextInAEL->PrevInAEL = Edge2; - Edge2->PrevInAEL = Prev; - if( Edge2->PrevInAEL ) Edge2->PrevInAEL->NextInAEL = Edge2; - } - - if( !Edge1->PrevInAEL ) m_ActiveEdges = Edge1; - else if( !Edge2->PrevInAEL ) m_ActiveEdges = Edge2; -} -//------------------------------------------------------------------------------ - -void Clipper::SwapPositionsInSEL(TEdge *Edge1, TEdge *Edge2) -{ - if( !( Edge1->NextInSEL ) && !( Edge1->PrevInSEL ) ) return; - if( !( Edge2->NextInSEL ) && !( Edge2->PrevInSEL ) ) return; - - if( Edge1->NextInSEL == Edge2 ) - { - TEdge* Next = Edge2->NextInSEL; - if( Next ) Next->PrevInSEL = Edge1; - TEdge* Prev = Edge1->PrevInSEL; - if( Prev ) Prev->NextInSEL = Edge2; - Edge2->PrevInSEL = Prev; - Edge2->NextInSEL = Edge1; - Edge1->PrevInSEL = Edge2; - Edge1->NextInSEL = Next; - } - else if( Edge2->NextInSEL == Edge1 ) - { - TEdge* Next = Edge1->NextInSEL; - if( Next ) Next->PrevInSEL = Edge2; - TEdge* Prev = Edge2->PrevInSEL; - if( Prev ) Prev->NextInSEL = Edge1; - Edge1->PrevInSEL = Prev; - Edge1->NextInSEL = Edge2; - Edge2->PrevInSEL = Edge1; - Edge2->NextInSEL = Next; - } - else - { - TEdge* Next = Edge1->NextInSEL; - TEdge* Prev = Edge1->PrevInSEL; - Edge1->NextInSEL = Edge2->NextInSEL; - if( Edge1->NextInSEL ) Edge1->NextInSEL->PrevInSEL = Edge1; - Edge1->PrevInSEL = Edge2->PrevInSEL; - if( Edge1->PrevInSEL ) Edge1->PrevInSEL->NextInSEL = Edge1; - Edge2->NextInSEL = Next; - if( Edge2->NextInSEL ) Edge2->NextInSEL->PrevInSEL = Edge2; - Edge2->PrevInSEL = Prev; - if( Edge2->PrevInSEL ) Edge2->PrevInSEL->NextInSEL = Edge2; - } - - if( !Edge1->PrevInSEL ) m_SortedEdges = Edge1; - else if( !Edge2->PrevInSEL ) m_SortedEdges = Edge2; -} -//------------------------------------------------------------------------------ - -inline void GetHorzDirection(TEdge& HorzEdge, Direction& Dir, cInt& Left, cInt& Right) -{ - if (HorzEdge.Bot.x() < HorzEdge.Top.x()) - { - Left = HorzEdge.Bot.x(); - Right = HorzEdge.Top.x(); - Dir = dLeftToRight; - } else - { - Left = HorzEdge.Top.x(); - Right = HorzEdge.Bot.x(); - Dir = dRightToLeft; - } -} -//------------------------------------------------------------------------ - -/******************************************************************************* -* Notes: Horizontal edges (HEs) at scanline intersections (ie at the Top or * -* Bottom of a scanbeam) are processed as if layered. The order in which HEs * -* are processed doesn't matter. HEs intersect with other HE Bot.x()s only [#] * -* (or they could intersect with Top.x()s only, ie EITHER Bot.x()s OR Top.x()s), * -* and with other non-horizontal edges [*]. Once these intersections are * -* processed, intermediate HEs then 'promote' the Edge above (NextInLML) into * -* the AEL. These 'promoted' edges may in turn intersect [%] with other HEs. * -*******************************************************************************/ - -void Clipper::ProcessHorizontal(TEdge *horzEdge) -{ - Direction dir; - cInt horzLeft, horzRight; - bool IsOpen = (horzEdge->WindDelta == 0); - - GetHorzDirection(*horzEdge, dir, horzLeft, horzRight); - - TEdge* eLastHorz = horzEdge, *eMaxPair = 0; - while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML)) - eLastHorz = eLastHorz->NextInLML; - if (!eLastHorz->NextInLML) - eMaxPair = GetMaximaPair(eLastHorz); - - cInts::const_iterator maxIt; - cInts::const_reverse_iterator maxRit; - if (!m_Maxima.empty()) - { - //get the first maxima in range (X) ... - if (dir == dLeftToRight) - { - maxIt = m_Maxima.begin(); - while (maxIt != m_Maxima.end() && *maxIt <= horzEdge->Bot.x()) ++maxIt; - if (maxIt != m_Maxima.end() && *maxIt >= eLastHorz->Top.x()) - maxIt = m_Maxima.end(); - } - else - { - maxRit = m_Maxima.rbegin(); - while (maxRit != m_Maxima.rend() && *maxRit > horzEdge->Bot.x()) ++maxRit; - if (maxRit != m_Maxima.rend() && *maxRit <= eLastHorz->Top.x()) - maxRit = m_Maxima.rend(); - } - } - - OutPt* op1 = 0; - - for (;;) //loop through consec. horizontal edges - { - - bool IsLastHorz = (horzEdge == eLastHorz); - TEdge* e = (dir == dLeftToRight) ? horzEdge->NextInAEL : horzEdge->PrevInAEL; - while(e) - { - - //this code block inserts extra coords into horizontal edges (in output - //polygons) whereever maxima touch these horizontal edges. This helps - //'simplifying' polygons (ie if the Simplify property is set). - if (!m_Maxima.empty()) - { - if (dir == dLeftToRight) - { - while (maxIt != m_Maxima.end() && *maxIt < e->Curr.x()) - { - if (horzEdge->OutIdx >= 0 && !IsOpen) - AddOutPt(horzEdge, IntPoint2d(*maxIt, horzEdge->Bot.y())); - ++maxIt; - } - } - else - { - while (maxRit != m_Maxima.rend() && *maxRit > e->Curr.x()) - { - if (horzEdge->OutIdx >= 0 && !IsOpen) - AddOutPt(horzEdge, IntPoint2d(*maxRit, horzEdge->Bot.y())); - ++maxRit; - } - } - }; - - if ((dir == dLeftToRight && e->Curr.x() > horzRight) || - (dir == dRightToLeft && e->Curr.x() < horzLeft)) break; - - //Also break if we've got to the end of an intermediate horizontal edge ... - //nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal. - if (e->Curr.x() == horzEdge->Top.x() && horzEdge->NextInLML && - e->Dx < horzEdge->NextInLML->Dx) break; - - if (horzEdge->OutIdx >= 0 && !IsOpen) //note: may be done multiple times - { -#ifdef CLIPPERLIB_USE_XYZ - if (dir == dLeftToRight) - SetZ(e->Curr, *horzEdge, *e); - else - SetZ(e->Curr, *e, *horzEdge); -#endif - op1 = AddOutPt(horzEdge, e->Curr); - TEdge* eNextHorz = m_SortedEdges; - while (eNextHorz) - { - if (eNextHorz->OutIdx >= 0 && - HorzSegmentsOverlap(horzEdge->Bot.x(), - horzEdge->Top.x(), eNextHorz->Bot.x(), eNextHorz->Top.x())) - { - OutPt* op2 = GetLastOutPt(eNextHorz); - m_Joins.emplace_back(Join(op2, op1, eNextHorz->Top)); - } - eNextHorz = eNextHorz->NextInSEL; - } - m_GhostJoins.emplace_back(Join(op1, 0, horzEdge->Bot)); - } - - //OK, so far we're still in range of the horizontal Edge but make sure - //we're at the last of consec. horizontals when matching with eMaxPair - if(e == eMaxPair && IsLastHorz) - { - if (horzEdge->OutIdx >= 0) - AddLocalMaxPoly(horzEdge, eMaxPair, horzEdge->Top); - DeleteFromAEL(horzEdge); - DeleteFromAEL(eMaxPair); - return; - } - - if(dir == dLeftToRight) - { - IntPoint Pt = IntPoint2d(e->Curr.x(), horzEdge->Curr.y()); - IntersectEdges(horzEdge, e, Pt); - } - else - { - IntPoint Pt = IntPoint2d(e->Curr.x(), horzEdge->Curr.y()); - IntersectEdges( e, horzEdge, Pt); - } - TEdge* eNext = (dir == dLeftToRight) ? e->NextInAEL : e->PrevInAEL; - SwapPositionsInAEL( horzEdge, e ); - e = eNext; - } //end while(e) - - //Break out of loop if HorzEdge.NextInLML is not also horizontal ... - if (!horzEdge->NextInLML || !IsHorizontal(*horzEdge->NextInLML)) break; - - UpdateEdgeIntoAEL(horzEdge); - if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Bot); - GetHorzDirection(*horzEdge, dir, horzLeft, horzRight); - - } //end for (;;) - - if (horzEdge->OutIdx >= 0 && !op1) - { - op1 = GetLastOutPt(horzEdge); - TEdge* eNextHorz = m_SortedEdges; - while (eNextHorz) - { - if (eNextHorz->OutIdx >= 0 && - HorzSegmentsOverlap(horzEdge->Bot.x(), - horzEdge->Top.x(), eNextHorz->Bot.x(), eNextHorz->Top.x())) - { - OutPt* op2 = GetLastOutPt(eNextHorz); - m_Joins.emplace_back(Join(op2, op1, eNextHorz->Top)); - } - eNextHorz = eNextHorz->NextInSEL; - } - m_GhostJoins.emplace_back(Join(op1, 0, horzEdge->Top)); - } - - if (horzEdge->NextInLML) - { - if(horzEdge->OutIdx >= 0) - { - op1 = AddOutPt( horzEdge, horzEdge->Top); - UpdateEdgeIntoAEL(horzEdge); - if (horzEdge->WindDelta == 0) return; - //nb: HorzEdge is no longer horizontal here - TEdge* ePrev = horzEdge->PrevInAEL; - TEdge* eNext = horzEdge->NextInAEL; - if (ePrev && ePrev->Curr.x() == horzEdge->Bot.x() && - ePrev->Curr.y() == horzEdge->Bot.y() && ePrev->WindDelta != 0 && - (ePrev->OutIdx >= 0 && ePrev->Curr.y() > ePrev->Top.y() && - SlopesEqual(*horzEdge, *ePrev, m_UseFullRange))) - { - OutPt* op2 = AddOutPt(ePrev, horzEdge->Bot); - m_Joins.emplace_back(Join(op1, op2, horzEdge->Top)); - } - else if (eNext && eNext->Curr.x() == horzEdge->Bot.x() && - eNext->Curr.y() == horzEdge->Bot.y() && eNext->WindDelta != 0 && - eNext->OutIdx >= 0 && eNext->Curr.y() > eNext->Top.y() && - SlopesEqual(*horzEdge, *eNext, m_UseFullRange)) - { - OutPt* op2 = AddOutPt(eNext, horzEdge->Bot); - m_Joins.emplace_back(Join(op1, op2, horzEdge->Top)); - } - } - else - UpdateEdgeIntoAEL(horzEdge); - } - else - { - if (horzEdge->OutIdx >= 0) AddOutPt(horzEdge, horzEdge->Top); - DeleteFromAEL(horzEdge); - } -} -//------------------------------------------------------------------------------ - -void Clipper::UpdateEdgeIntoAEL(TEdge *&e) -{ - if( !e->NextInLML ) - throw clipperException("UpdateEdgeIntoAEL: invalid call"); - - e->NextInLML->OutIdx = e->OutIdx; - TEdge* AelPrev = e->PrevInAEL; - TEdge* AelNext = e->NextInAEL; - if (AelPrev) AelPrev->NextInAEL = e->NextInLML; - else m_ActiveEdges = e->NextInLML; - if (AelNext) AelNext->PrevInAEL = e->NextInLML; - e->NextInLML->Side = e->Side; - e->NextInLML->WindDelta = e->WindDelta; - e->NextInLML->WindCnt = e->WindCnt; - e->NextInLML->WindCnt2 = e->WindCnt2; - e = e->NextInLML; - e->Curr = e->Bot; - e->PrevInAEL = AelPrev; - e->NextInAEL = AelNext; - if (!IsHorizontal(*e)) - m_Scanbeam.push(e->Top.y()); -} -//------------------------------------------------------------------------------ - -bool Clipper::ProcessIntersections(const cInt topY) -{ - if( !m_ActiveEdges ) return true; - try { - BuildIntersectList(topY); - size_t IlSize = m_IntersectList.size(); - if (IlSize == 0) return true; - if (IlSize == 1 || FixupIntersectionOrder()) { - for (IntersectNode &iNode : m_IntersectList) { - IntersectEdges( iNode.Edge1, iNode.Edge2, iNode.Pt); - SwapPositionsInAEL( iNode.Edge1 , iNode.Edge2 ); - } - m_IntersectList.clear(); - } - else return false; - } - catch(...) - { - m_SortedEdges = 0; - m_IntersectList.clear(); - throw clipperException("ProcessIntersections error"); - } - m_SortedEdges = 0; - return true; -} -//------------------------------------------------------------------------------ - -void Clipper::BuildIntersectList(const cInt topY) -{ - if ( !m_ActiveEdges ) return; - - //prepare for sorting ... - TEdge* e = m_ActiveEdges; - m_SortedEdges = e; - while( e ) - { - e->PrevInSEL = e->PrevInAEL; - e->NextInSEL = e->NextInAEL; - e->Curr.x() = TopX( *e, topY ); - e = e->NextInAEL; - } - - //bubblesort ... - bool isModified; - do - { - isModified = false; - e = m_SortedEdges; - while( e->NextInSEL ) - { - TEdge *eNext = e->NextInSEL; - IntPoint Pt; - if(e->Curr.x() > eNext->Curr.x()) - { - IntersectPoint(*e, *eNext, Pt); - - if (Pt.y() < topY) Pt = IntPoint2d(TopX(*e, topY), topY); - m_IntersectList.emplace_back(IntersectNode(e, eNext, Pt)); - SwapPositionsInSEL(e, eNext); - isModified = true; - } - else - e = eNext; - } - if( e->PrevInSEL ) e->PrevInSEL->NextInSEL = 0; - else break; - } - while ( isModified ); - m_SortedEdges = 0; //important -} -//------------------------------------------------------------------------------ - - -inline bool EdgesAdjacent(const IntersectNode &inode) -{ - return (inode.Edge1->NextInSEL == inode.Edge2) || - (inode.Edge1->PrevInSEL == inode.Edge2); -} -//------------------------------------------------------------------------------ - -bool Clipper::FixupIntersectionOrder() -{ - //pre-condition: intersections are sorted Bottom-most first. - //Now it's crucial that intersections are made only between adjacent edges, - //so to ensure this the order of intersections may need adjusting ... - CopyAELToSEL(); - std::sort(m_IntersectList.begin(), m_IntersectList.end(), [](const IntersectNode &node1, const IntersectNode &node2) { return node2.Pt.y() < node1.Pt.y(); }); - - size_t cnt = m_IntersectList.size(); - for (size_t i = 0; i < cnt; ++i) - { - if (!EdgesAdjacent(m_IntersectList[i])) - { - size_t j = i + 1; - while (j < cnt && !EdgesAdjacent(m_IntersectList[j])) j++; - if (j == cnt) return false; - std::swap(m_IntersectList[i], m_IntersectList[j]); - } - SwapPositionsInSEL(m_IntersectList[i].Edge1, m_IntersectList[i].Edge2); - } - return true; -} -//------------------------------------------------------------------------------ - -void Clipper::DoMaxima(TEdge *e) -{ - TEdge* eMaxPair = GetMaximaPairEx(e); - if (!eMaxPair) - { - if (e->OutIdx >= 0) - AddOutPt(e, e->Top); - DeleteFromAEL(e); - return; - } - - TEdge* eNext = e->NextInAEL; - while(eNext && eNext != eMaxPair) - { - IntersectEdges(e, eNext, e->Top); - SwapPositionsInAEL(e, eNext); - eNext = e->NextInAEL; - } - - if(e->OutIdx == Unassigned && eMaxPair->OutIdx == Unassigned) - { - DeleteFromAEL(e); - DeleteFromAEL(eMaxPair); - } - else if( e->OutIdx >= 0 && eMaxPair->OutIdx >= 0 ) - { - if (e->OutIdx >= 0) AddLocalMaxPoly(e, eMaxPair, e->Top); - DeleteFromAEL(e); - DeleteFromAEL(eMaxPair); - } -#ifdef use_lines - else if (e->WindDelta == 0) - { - if (e->OutIdx >= 0) - { - AddOutPt(e, e->Top); - e->OutIdx = Unassigned; - } - DeleteFromAEL(e); - - if (eMaxPair->OutIdx >= 0) - { - AddOutPt(eMaxPair, e->Top); - eMaxPair->OutIdx = Unassigned; - } - DeleteFromAEL(eMaxPair); - } -#endif - else throw clipperException("DoMaxima error"); -} -//------------------------------------------------------------------------------ - -void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY) -{ - TEdge* e = m_ActiveEdges; - while( e ) - { - //1. process maxima, treating them as if they're 'bent' horizontal edges, - // but exclude maxima with horizontal edges. nb: e can't be a horizontal. - bool IsMaximaEdge = IsMaxima(e, topY); - - if(IsMaximaEdge) - { - TEdge* eMaxPair = GetMaximaPairEx(e); - IsMaximaEdge = (!eMaxPair || !IsHorizontal(*eMaxPair)); - } - - if(IsMaximaEdge) - { - if (m_StrictSimple) m_Maxima.emplace_back(e->Top.x()); - TEdge* ePrev = e->PrevInAEL; - DoMaxima(e); - if( !ePrev ) e = m_ActiveEdges; - else e = ePrev->NextInAEL; - } - else - { - //2. promote horizontal edges, otherwise update Curr.x() and Curr.y() ... - if (IsIntermediate(e, topY) && IsHorizontal(*e->NextInLML)) - { - UpdateEdgeIntoAEL(e); - if (e->OutIdx >= 0) - AddOutPt(e, e->Bot); - AddEdgeToSEL(e); - } - else - { - e->Curr.x() = TopX( *e, topY ); - e->Curr.y() = topY; -#ifdef CLIPPERLIB_USE_XYZ - e->Curr.z() = topY == e->Top.y() ? e->Top.z() : (topY == e->Bot.y() ? e->Bot.z() : 0); -#endif - } - - //When StrictlySimple and 'e' is being touched by another edge, then - //make sure both edges have a vertex here ... - if (m_StrictSimple) - { - TEdge* ePrev = e->PrevInAEL; - if ((e->OutIdx >= 0) && (e->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) && - (ePrev->Curr.x() == e->Curr.x()) && (ePrev->WindDelta != 0)) - { - IntPoint pt = e->Curr; -#ifdef CLIPPERLIB_USE_XYZ - SetZ(pt, *ePrev, *e); -#endif - OutPt* op = AddOutPt(ePrev, pt); - OutPt* op2 = AddOutPt(e, pt); - m_Joins.emplace_back(Join(op, op2, pt)); //StrictlySimple (type-3) join - } - } - - e = e->NextInAEL; - } - } - - //3. Process horizontals at the Top of the scanbeam ... - std::sort(m_Maxima.begin(), m_Maxima.end()); - ProcessHorizontals(); - m_Maxima.clear(); - - //4. Promote intermediate vertices ... - e = m_ActiveEdges; - while(e) - { - if(IsIntermediate(e, topY)) - { - OutPt* op = 0; - if( e->OutIdx >= 0 ) - op = AddOutPt(e, e->Top); - UpdateEdgeIntoAEL(e); - - //if output polygons share an edge, they'll need joining later ... - TEdge* ePrev = e->PrevInAEL; - TEdge* eNext = e->NextInAEL; - if (ePrev && ePrev->Curr.x() == e->Bot.x() && - ePrev->Curr.y() == e->Bot.y() && op && - ePrev->OutIdx >= 0 && ePrev->Curr.y() > ePrev->Top.y() && - SlopesEqual(e->Curr, e->Top, ePrev->Curr, ePrev->Top, m_UseFullRange) && - (e->WindDelta != 0) && (ePrev->WindDelta != 0)) - { - OutPt* op2 = AddOutPt(ePrev, e->Bot); - m_Joins.emplace_back(Join(op, op2, e->Top)); - } - else if (eNext && eNext->Curr.x() == e->Bot.x() && - eNext->Curr.y() == e->Bot.y() && op && - eNext->OutIdx >= 0 && eNext->Curr.y() > eNext->Top.y() && - SlopesEqual(e->Curr, e->Top, eNext->Curr, eNext->Top, m_UseFullRange) && - (e->WindDelta != 0) && (eNext->WindDelta != 0)) - { - OutPt* op2 = AddOutPt(eNext, e->Bot); - m_Joins.emplace_back(Join(op, op2, e->Top)); - } - } - e = e->NextInAEL; - } -} -//------------------------------------------------------------------------------ - -void Clipper::FixupOutPolyline(OutRec &outrec) -{ - OutPt *pp = outrec.Pts; - OutPt *lastPP = pp->Prev; - while (pp != lastPP) - { - pp = pp->Next; - if (pp->Pt == pp->Prev->Pt) - { - if (pp == lastPP) lastPP = pp->Prev; - OutPt *tmpPP = pp->Prev; - tmpPP->Next = pp->Next; - pp->Next->Prev = tmpPP; - this->DisposeOutPt(pp); - pp = tmpPP; - } - } - - if (pp == pp->Prev) - { - this->DisposeOutPts(pp); - outrec.Pts = 0; - return; - } -} -//------------------------------------------------------------------------------ - -void Clipper::FixupOutPolygon(OutRec &outrec) -{ - //FixupOutPolygon() - removes duplicate points and simplifies consecutive - //parallel edges by removing the middle vertex. - OutPt *lastOK = nullptr; - outrec.BottomPt = nullptr; - OutPt *pp = outrec.Pts; - bool preserveCol = m_PreserveCollinear || m_StrictSimple; - - for (;;) - { - if (pp->Prev == pp || pp->Prev == pp->Next) - { - // Empty loop or a stick. Release the polygon. - this->DisposeOutPts(pp); - outrec.Pts = nullptr; - return; - } - - //test for duplicate points and collinear edges ... - if ((pp->Pt == pp->Next->Pt) || (pp->Pt == pp->Prev->Pt) || - (SlopesEqual(pp->Prev->Pt, pp->Pt, pp->Next->Pt, m_UseFullRange) && - (!preserveCol || !Pt2IsBetweenPt1AndPt3(pp->Prev->Pt, pp->Pt, pp->Next->Pt)))) - { - lastOK = nullptr; - OutPt *tmp = pp; - pp->Prev->Next = pp->Next; - pp->Next->Prev = pp->Prev; - pp = pp->Prev; - this->DisposeOutPt(tmp); - } - else if (pp == lastOK) break; - else - { - if (!lastOK) lastOK = pp; - pp = pp->Next; - } - } - outrec.Pts = pp; -} -//------------------------------------------------------------------------------ - -// Count the number of points in a closed linked loop starting with Pts. -int PointCount(OutPt *Pts) -{ - if (!Pts) return 0; - int result = 0; - OutPt* p = Pts; - do - { - result++; - p = p->Next; - } - while (p != Pts); - return result; -} -//------------------------------------------------------------------------------ - -void Clipper::BuildResult(Paths &polys) -{ - polys.reserve(m_PolyOuts.size()); - for (OutRec &outRec : m_PolyOuts) - { - assert(! outRec.IsOpen); - if (!outRec.Pts) continue; - Path pg; - OutPt* p = outRec.Pts->Prev; - int cnt = PointCount(p); - if (cnt < 2) continue; - pg.reserve(cnt); - for (int i = 0; i < cnt; ++i) - { - pg.emplace_back(p->Pt); - p = p->Prev; - } - polys.emplace_back(std::move(pg)); - } -} -//------------------------------------------------------------------------------ - -void Clipper::BuildResult2(PolyTree& polytree) -{ - polytree.Clear(); - polytree.AllNodes.reserve(m_PolyOuts.size()); - //add each output polygon/contour to polytree ... - for (OutRec &outRec : m_PolyOuts) - { - int cnt = PointCount(outRec.Pts); - if ((outRec.IsOpen && cnt < 2) || (!outRec.IsOpen && cnt < 3)) - // Ignore an invalid output loop or a polyline. - continue; - - //skip OutRecs that (a) contain outermost polygons or - //(b) already have the correct owner/child linkage ... - if (outRec.FirstLeft && - (outRec.IsHole == outRec.FirstLeft->IsHole || ! outRec.FirstLeft->Pts)) { - OutRec* orfl = outRec.FirstLeft; - while (orfl && ((orfl->IsHole == outRec.IsHole) || !orfl->Pts)) - orfl = orfl->FirstLeft; - outRec.FirstLeft = orfl; - } - - //nb: polytree takes ownership of all the PolyNodes - polytree.AllNodes.emplace_back(PolyNode()); - PolyNode* pn = &polytree.AllNodes.back(); - outRec.PolyNd = pn; - pn->Parent = 0; - pn->Index = 0; - pn->Contour.reserve(cnt); - OutPt *op = outRec.Pts->Prev; - for (int j = 0; j < cnt; j++) - { - pn->Contour.emplace_back(op->Pt); - op = op->Prev; - } - } - - //fixup PolyNode links etc ... - polytree.Childs.reserve(m_PolyOuts.size()); - for (OutRec &outRec : m_PolyOuts) - { - if (!outRec.PolyNd) continue; - if (outRec.IsOpen) - { - outRec.PolyNd->m_IsOpen = true; - polytree.AddChild(*outRec.PolyNd); - } - else if (outRec.FirstLeft && outRec.FirstLeft->PolyNd) - outRec.FirstLeft->PolyNd->AddChild(*outRec.PolyNd); - else - polytree.AddChild(*outRec.PolyNd); - } -} -//------------------------------------------------------------------------------ - -inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2) -{ - if (e2.Curr.x() == e1.Curr.x()) - { - if (e2.Top.y() > e1.Top.y()) - return e2.Top.x() < TopX(e1, e2.Top.y()); - else return e1.Top.x() > TopX(e2, e1.Top.y()); - } - else return e2.Curr.x() < e1.Curr.x(); -} -//------------------------------------------------------------------------------ - -bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2, - cInt& Left, cInt& Right) -{ - if (a1 < a2) - { - if (b1 < b2) {Left = std::max(a1,b1); Right = std::min(a2,b2);} - else {Left = std::max(a1,b2); Right = std::min(a2,b1);} - } - else - { - if (b1 < b2) {Left = std::max(a2,b1); Right = std::min(a1,b2);} - else {Left = std::max(a2,b2); Right = std::min(a1,b1);} - } - return Left < Right; -} -//------------------------------------------------------------------------------ - -// Make all points of outrec point to outrec.Idx -inline void UpdateOutPtIdxs(OutRec& outrec) -{ - OutPt* op = outrec.Pts; - do - { - op->Idx = outrec.Idx; - op = op->Prev; - } - while(op != outrec.Pts); -} -//------------------------------------------------------------------------------ - -void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge) -{ - if(!m_ActiveEdges) - { - edge->PrevInAEL = 0; - edge->NextInAEL = 0; - m_ActiveEdges = edge; - } - else if(!startEdge && E2InsertsBeforeE1(*m_ActiveEdges, *edge)) - { - edge->PrevInAEL = 0; - edge->NextInAEL = m_ActiveEdges; - m_ActiveEdges->PrevInAEL = edge; - m_ActiveEdges = edge; - } - else - { - if(!startEdge) startEdge = m_ActiveEdges; - while(startEdge->NextInAEL && - !E2InsertsBeforeE1(*startEdge->NextInAEL , *edge)) - startEdge = startEdge->NextInAEL; - edge->NextInAEL = startEdge->NextInAEL; - if(startEdge->NextInAEL) startEdge->NextInAEL->PrevInAEL = edge; - edge->PrevInAEL = startEdge; - startEdge->NextInAEL = edge; - } -} -//---------------------------------------------------------------------- - -OutPt* Clipper::DupOutPt(OutPt* outPt, bool InsertAfter) -{ - OutPt* result = this->AllocateOutPt(); - result->Pt = outPt->Pt; - result->Idx = outPt->Idx; - if (InsertAfter) - { - result->Next = outPt->Next; - result->Prev = outPt; - outPt->Next->Prev = result; - outPt->Next = result; - } - else - { - result->Prev = outPt->Prev; - result->Next = outPt; - outPt->Prev->Next = result; - outPt->Prev = result; - } - return result; -} -//------------------------------------------------------------------------------ - -bool Clipper::JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b, - const IntPoint &Pt, bool DiscardLeft) -{ - Direction Dir1 = (op1->Pt.x() > op1b->Pt.x() ? dRightToLeft : dLeftToRight); - Direction Dir2 = (op2->Pt.x() > op2b->Pt.x() ? dRightToLeft : dLeftToRight); - if (Dir1 == Dir2) return false; - - //When DiscardLeft, we want Op1b to be on the Left of Op1, otherwise we - //want Op1b to be on the Right. (And likewise with Op2 and Op2b.) - //So, to facilitate this while inserting Op1b and Op2b ... - //when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b, - //otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.) - if (Dir1 == dLeftToRight) - { - while (op1->Next->Pt.x() <= Pt.x() && - op1->Next->Pt.x() >= op1->Pt.x() && op1->Next->Pt.y() == Pt.y()) - op1 = op1->Next; - if (DiscardLeft && (op1->Pt.x() != Pt.x())) op1 = op1->Next; - op1b = this->DupOutPt(op1, !DiscardLeft); - if (op1b->Pt != Pt) - { - op1 = op1b; - op1->Pt = Pt; - op1b = this->DupOutPt(op1, !DiscardLeft); - } - } - else - { - while (op1->Next->Pt.x() >= Pt.x() && - op1->Next->Pt.x() <= op1->Pt.x() && op1->Next->Pt.y() == Pt.y()) - op1 = op1->Next; - if (!DiscardLeft && (op1->Pt.x() != Pt.x())) op1 = op1->Next; - op1b = this->DupOutPt(op1, DiscardLeft); - if (op1b->Pt != Pt) - { - op1 = op1b; - op1->Pt = Pt; - op1b = this->DupOutPt(op1, DiscardLeft); - } - } - - if (Dir2 == dLeftToRight) - { - while (op2->Next->Pt.x() <= Pt.x() && - op2->Next->Pt.x() >= op2->Pt.x() && op2->Next->Pt.y() == Pt.y()) - op2 = op2->Next; - if (DiscardLeft && (op2->Pt.x() != Pt.x())) op2 = op2->Next; - op2b = this->DupOutPt(op2, !DiscardLeft); - if (op2b->Pt != Pt) - { - op2 = op2b; - op2->Pt = Pt; - op2b = this->DupOutPt(op2, !DiscardLeft); - }; - } else - { - while (op2->Next->Pt.x() >= Pt.x() && - op2->Next->Pt.x() <= op2->Pt.x() && op2->Next->Pt.y() == Pt.y()) - op2 = op2->Next; - if (!DiscardLeft && (op2->Pt.x() != Pt.x())) op2 = op2->Next; - op2b = this->DupOutPt(op2, DiscardLeft); - if (op2b->Pt != Pt) - { - op2 = op2b; - op2->Pt = Pt; - op2b = this->DupOutPt(op2, DiscardLeft); - }; - }; - - if ((Dir1 == dLeftToRight) == DiscardLeft) - { - op1->Prev = op2; - op2->Next = op1; - op1b->Next = op2b; - op2b->Prev = op1b; - } - else - { - op1->Next = op2; - op2->Prev = op1; - op1b->Prev = op2b; - op2b->Next = op1b; - } - return true; -} -//------------------------------------------------------------------------------ - -bool Clipper::JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2) -{ - OutPt *op1 = j->OutPt1, *op1b; - OutPt *op2 = j->OutPt2, *op2b; - - //There are 3 kinds of joins for output polygons ... - //1. Horizontal joins where Join.OutPt1 & Join.OutPt2 are vertices anywhere - //along (horizontal) collinear edges (& Join.OffPt is on the same horizontal). - //2. Non-horizontal joins where Join.OutPt1 & Join.OutPt2 are at the same - //location at the Bottom of the overlapping segment (& Join.OffPt is above). - //3. StrictSimple joins where edges touch but are not collinear and where - //Join.OutPt1, Join.OutPt2 & Join.OffPt all share the same point. - bool isHorizontal = (j->OutPt1->Pt.y() == j->OffPt.y()); - - if (isHorizontal && (j->OffPt == j->OutPt1->Pt) && - (j->OffPt == j->OutPt2->Pt)) - { - //Strictly Simple join ... - if (outRec1 != outRec2) return false; - op1b = j->OutPt1->Next; - while (op1b != op1 && (op1b->Pt == j->OffPt)) - op1b = op1b->Next; - bool reverse1 = (op1b->Pt.y() > j->OffPt.y()); - op2b = j->OutPt2->Next; - while (op2b != op2 && (op2b->Pt == j->OffPt)) - op2b = op2b->Next; - bool reverse2 = (op2b->Pt.y() > j->OffPt.y()); - if (reverse1 == reverse2) return false; - if (reverse1) - { - op1b = this->DupOutPt(op1, false); - op2b = this->DupOutPt(op2, true); - op1->Prev = op2; - op2->Next = op1; - op1b->Next = op2b; - op2b->Prev = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } else - { - op1b = this->DupOutPt(op1, true); - op2b = this->DupOutPt(op2, false); - op1->Next = op2; - op2->Prev = op1; - op1b->Prev = op2b; - op2b->Next = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } - } - else if (isHorizontal) - { - //treat horizontal joins differently to non-horizontal joins since with - //them we're not yet sure where the overlapping is. OutPt1.Pt & OutPt2.Pt - //may be anywhere along the horizontal edge. - op1b = op1; - while (op1->Prev->Pt.y() == op1->Pt.y() && op1->Prev != op1b && op1->Prev != op2) - op1 = op1->Prev; - while (op1b->Next->Pt.y() == op1b->Pt.y() && op1b->Next != op1 && op1b->Next != op2) - op1b = op1b->Next; - if (op1b->Next == op1 || op1b->Next == op2) return false; //a flat 'polygon' - - op2b = op2; - while (op2->Prev->Pt.y() == op2->Pt.y() && op2->Prev != op2b && op2->Prev != op1b) - op2 = op2->Prev; - while (op2b->Next->Pt.y() == op2b->Pt.y() && op2b->Next != op2 && op2b->Next != op1) - op2b = op2b->Next; - if (op2b->Next == op2 || op2b->Next == op1) return false; //a flat 'polygon' - - cInt Left, Right; - //Op1 --> Op1b & Op2 --> Op2b are the extremites of the horizontal edges - if (!GetOverlap(op1->Pt.x(), op1b->Pt.x(), op2->Pt.x(), op2b->Pt.x(), Left, Right)) - return false; - - //DiscardLeftSide: when overlapping edges are joined, a spike will created - //which needs to be cleaned up. However, we don't want Op1 or Op2 caught up - //on the discard Side as either may still be needed for other joins ... - IntPoint Pt; - bool DiscardLeftSide; - if (op1->Pt.x() >= Left && op1->Pt.x() <= Right) - { - Pt = op1->Pt; DiscardLeftSide = (op1->Pt.x() > op1b->Pt.x()); - } - else if (op2->Pt.x() >= Left&& op2->Pt.x() <= Right) - { - Pt = op2->Pt; DiscardLeftSide = (op2->Pt.x() > op2b->Pt.x()); - } - else if (op1b->Pt.x() >= Left && op1b->Pt.x() <= Right) - { - Pt = op1b->Pt; DiscardLeftSide = op1b->Pt.x() > op1->Pt.x(); - } - else - { - Pt = op2b->Pt; DiscardLeftSide = (op2b->Pt.x() > op2->Pt.x()); - } - j->OutPt1 = op1; j->OutPt2 = op2; - return JoinHorz(op1, op1b, op2, op2b, Pt, DiscardLeftSide); - } else - { - //nb: For non-horizontal joins ... - // 1. Jr.OutPt1.Pt.y() == Jr.OutPt2.Pt.y() - // 2. Jr.OutPt1.Pt > Jr.OffPt.y() - - //make sure the polygons are correctly oriented ... - op1b = op1->Next; - while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Next; - bool Reverse1 = ((op1b->Pt.y() > op1->Pt.y()) || - !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)); - if (Reverse1) - { - op1b = op1->Prev; - while ((op1b->Pt == op1->Pt) && (op1b != op1)) op1b = op1b->Prev; - if ((op1b->Pt.y() > op1->Pt.y()) || - !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange)) return false; - }; - op2b = op2->Next; - while ((op2b->Pt == op2->Pt) && (op2b != op2))op2b = op2b->Next; - bool Reverse2 = ((op2b->Pt.y() > op2->Pt.y()) || - !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)); - if (Reverse2) - { - op2b = op2->Prev; - while ((op2b->Pt == op2->Pt) && (op2b != op2)) op2b = op2b->Prev; - if ((op2b->Pt.y() > op2->Pt.y()) || - !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange)) return false; - } - - if ((op1b == op1) || (op2b == op2) || (op1b == op2b) || - ((outRec1 == outRec2) && (Reverse1 == Reverse2))) return false; - - if (Reverse1) - { - op1b = this->DupOutPt(op1, false); - op2b = this->DupOutPt(op2, true); - op1->Prev = op2; - op2->Next = op1; - op1b->Next = op2b; - op2b->Prev = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } else - { - op1b = this->DupOutPt(op1, true); - op2b = this->DupOutPt(op2, false); - op1->Next = op2; - op2->Prev = op1; - op1b->Prev = op2b; - op2b->Next = op1b; - j->OutPt1 = op1; - j->OutPt2 = op1b; - return true; - } - } -} -//---------------------------------------------------------------------- - -inline OutRec* ParseFirstLeft(OutRec* FirstLeft) -{ - while (FirstLeft && !FirstLeft->Pts) - FirstLeft = FirstLeft->FirstLeft; - return FirstLeft; -} -//------------------------------------------------------------------------------ - -// This is potentially very expensive! O(n^3)! -void Clipper::FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec) -{ - //tests if NewOutRec contains the polygon before reassigning FirstLeft - for (OutRec &outRec : m_PolyOuts) - { - OutRec* firstLeft = ParseFirstLeft(outRec.FirstLeft); - if (outRec.Pts && firstLeft == OldOutRec && Poly2ContainsPoly1(outRec.Pts, NewOutRec->Pts)) - outRec.FirstLeft = NewOutRec; - } -} -//---------------------------------------------------------------------- - -void Clipper::FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec) -{ - //A polygon has split into two such that one is now the inner of the other. - //It's possible that these polygons now wrap around other polygons, so check - //every polygon that's also contained by OuterOutRec's FirstLeft container - //(including 0) to see if they've become inner to the new inner polygon ... - OutRec* orfl = OuterOutRec->FirstLeft; - for (OutRec &outRec : m_PolyOuts) - { - if (!outRec.Pts || &outRec == OuterOutRec || &outRec == InnerOutRec) - continue; - OutRec* firstLeft = ParseFirstLeft(outRec.FirstLeft); - if (firstLeft != orfl && firstLeft != InnerOutRec && firstLeft != OuterOutRec) - continue; - if (Poly2ContainsPoly1(outRec.Pts, InnerOutRec->Pts)) - outRec.FirstLeft = InnerOutRec; - else if (Poly2ContainsPoly1(outRec.Pts, OuterOutRec->Pts)) - outRec.FirstLeft = OuterOutRec; - else if (outRec.FirstLeft == InnerOutRec || outRec.FirstLeft == OuterOutRec) - outRec.FirstLeft = orfl; - } -} -//---------------------------------------------------------------------- -void Clipper::FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec) -{ - //reassigns FirstLeft WITHOUT testing if NewOutRec contains the polygon - for (OutRec &outRec : m_PolyOuts) - { - OutRec* firstLeft = ParseFirstLeft(outRec.FirstLeft); - if (outRec.Pts && firstLeft == OldOutRec) - outRec.FirstLeft = NewOutRec; - } -} -//---------------------------------------------------------------------- - -void Clipper::JoinCommonEdges() -{ - for (Join &join : m_Joins) - { - OutRec *outRec1 = GetOutRec(join.OutPt1->Idx); - OutRec *outRec2 = GetOutRec(join.OutPt2->Idx); - - if (!outRec1->Pts || !outRec2->Pts) continue; - if (outRec1->IsOpen || outRec2->IsOpen) continue; - - //get the polygon fragment with the correct hole state (FirstLeft) - //before calling JoinPoints() ... - OutRec *holeStateRec; - if (outRec1 == outRec2) holeStateRec = outRec1; - else if (OutRec1RightOfOutRec2(outRec1, outRec2)) holeStateRec = outRec2; - else if (OutRec1RightOfOutRec2(outRec2, outRec1)) holeStateRec = outRec1; - else holeStateRec = GetLowermostRec(outRec1, outRec2); - - if (!JoinPoints(&join, outRec1, outRec2)) continue; - - if (outRec1 == outRec2) - { - //instead of joining two polygons, we've just created a new one by - //splitting one polygon into two. - outRec1->Pts = join.OutPt1; - outRec1->BottomPt = 0; - outRec2 = CreateOutRec(); - outRec2->Pts = join.OutPt2; - - //update all OutRec2.Pts Idx's ... - UpdateOutPtIdxs(*outRec2); - - if (Poly2ContainsPoly1(outRec2->Pts, outRec1->Pts)) - { - //outRec1 contains outRec2 ... - outRec2->IsHole = !outRec1->IsHole; - outRec2->FirstLeft = outRec1; - - // For each m_PolyOuts, replace FirstLeft from outRec2 to outRec1. - if (m_UsingPolyTree) FixupFirstLefts2(outRec2, outRec1); - - if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0)) - ReversePolyPtLinks(outRec2->Pts); - - } else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts)) - { - //outRec2 contains outRec1 ... - outRec2->IsHole = outRec1->IsHole; - outRec1->IsHole = !outRec2->IsHole; - outRec2->FirstLeft = outRec1->FirstLeft; - outRec1->FirstLeft = outRec2; - - // For each m_PolyOuts, replace FirstLeft from outRec1 to outRec2. - if (m_UsingPolyTree) FixupFirstLefts2(outRec1, outRec2); - - if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0)) - ReversePolyPtLinks(outRec1->Pts); - } - else - { - //the 2 polygons are completely separate ... - outRec2->IsHole = outRec1->IsHole; - outRec2->FirstLeft = outRec1->FirstLeft; - - //fixup FirstLeft pointers that may need reassigning to OutRec2 - // For each polygon of m_PolyOuts, replace FirstLeft from outRec1 to outRec2 if the polygon is inside outRec2. - //FIXME This is potentially very expensive! O(n^3)! - if (m_UsingPolyTree) FixupFirstLefts1(outRec1, outRec2); - } - - } else - { - //joined 2 polygons together ... - - outRec2->Pts = 0; - outRec2->BottomPt = 0; - outRec2->Idx = outRec1->Idx; - - outRec1->IsHole = holeStateRec->IsHole; - if (holeStateRec == outRec2) - outRec1->FirstLeft = outRec2->FirstLeft; - outRec2->FirstLeft = outRec1; - - // For each m_PolyOuts, replace FirstLeft from outRec2 to outRec1. - if (m_UsingPolyTree) FixupFirstLefts3(outRec2, outRec1); - } - } -} - -//------------------------------------------------------------------------------ -// ClipperOffset support functions ... -//------------------------------------------------------------------------------ - -DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2) -{ - if(pt2.x() == pt1.x() && pt2.y() == pt1.y()) - return DoublePoint(0, 0); - - double Dx = double(pt2.x() - pt1.x()); - double dy = double(pt2.y() - pt1.y()); - double f = 1.0 / std::sqrt( Dx*Dx + dy*dy ); - Dx *= f; - dy *= f; - return DoublePoint(dy, -Dx); -} - -//------------------------------------------------------------------------------ -// ClipperOffset class -//------------------------------------------------------------------------------ - -void ClipperOffset::Clear() -{ - for (int i = 0; i < m_polyNodes.ChildCount(); ++i) - delete m_polyNodes.Childs[i]; - m_polyNodes.Childs.clear(); - m_lowest.x() = -1; -} -//------------------------------------------------------------------------------ - -void ClipperOffset::AddPath(const Path& path, JoinType joinType, EndType endType) -{ - int highI = (int)path.size() - 1; - if (highI < 0) return; - PolyNode* newNode = new PolyNode(); - newNode->m_jointype = joinType; - newNode->m_endtype = endType; - - //strip duplicate points from path and also get index to the lowest point ... - bool has_shortest_edge_length = ShortestEdgeLength > 0.; - double shortest_edge_length2 = has_shortest_edge_length ? ShortestEdgeLength * ShortestEdgeLength : 0.; - if (endType == etClosedLine || endType == etClosedPolygon) - for (; highI > 0; -- highI) { - bool same = false; - if (has_shortest_edge_length) { - double dx = double(path[highI].x() - path[0].x()); - double dy = double(path[highI].y() - path[0].y()); - same = dx*dx + dy*dy < shortest_edge_length2; - } else - same = path[0] == path[highI]; - if (! same) - break; - } - newNode->Contour.reserve(highI + 1); - newNode->Contour.emplace_back(path[0]); - int j = 0, k = 0; - for (int i = 1; i <= highI; i++) { - bool same = false; - if (has_shortest_edge_length) { - double dx = double(path[i].x() - newNode->Contour[j].x()); - double dy = double(path[i].y() - newNode->Contour[j].y()); - same = dx*dx + dy*dy < shortest_edge_length2; - } else - same = newNode->Contour[j] == path[i]; - if (same) - continue; - j++; - newNode->Contour.emplace_back(path[i]); - if (path[i].y() > newNode->Contour[k].y() || - (path[i].y() == newNode->Contour[k].y() && - path[i].x() < newNode->Contour[k].x())) k = j; - } - if (endType == etClosedPolygon && j < 2) - { - delete newNode; - return; - } - m_polyNodes.AddChild(*newNode); - - //if this path's lowest pt is lower than all the others then update m_lowest - if (endType != etClosedPolygon) return; - if (m_lowest.x() < 0) - m_lowest = IntPoint2d(m_polyNodes.ChildCount() - 1, k); - else - { - IntPoint ip = m_polyNodes.Childs[(int)m_lowest.x()]->Contour[(int)m_lowest.y()]; - if (newNode->Contour[k].y() > ip.y() || - (newNode->Contour[k].y() == ip.y() && - newNode->Contour[k].x() < ip.x())) - m_lowest = IntPoint2d(m_polyNodes.ChildCount() - 1, k); - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::FixOrientations() -{ - //fixup orientations of all closed paths if the orientation of the - //closed path with the lowermost vertex is wrong ... - if (m_lowest.x() >= 0 && - !Orientation(m_polyNodes.Childs[(int)m_lowest.x()]->Contour)) - { - for (int i = 0; i < m_polyNodes.ChildCount(); ++i) - { - PolyNode& node = *m_polyNodes.Childs[i]; - if (node.m_endtype == etClosedPolygon || - (node.m_endtype == etClosedLine && Orientation(node.Contour))) - ReversePath(node.Contour); - } - } else - { - for (int i = 0; i < m_polyNodes.ChildCount(); ++i) - { - PolyNode& node = *m_polyNodes.Childs[i]; - if (node.m_endtype == etClosedLine && !Orientation(node.Contour)) - ReversePath(node.Contour); - } - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::Execute(Paths& solution, double delta) -{ - solution.clear(); - FixOrientations(); - DoOffset(delta); - - //now clean up 'corners' ... - Clipper clpr; - clpr.AddPaths(m_destPolys, ptSubject, true); - if (delta > 0) - { - clpr.Execute(ctUnion, solution, pftPositive, pftPositive); - } - else - { - IntRect r = clpr.GetBounds(); - Path outer(4); - outer[0] = IntPoint2d(r.left - 10, r.bottom + 10); - outer[1] = IntPoint2d(r.right + 10, r.bottom + 10); - outer[2] = IntPoint2d(r.right + 10, r.top - 10); - outer[3] = IntPoint2d(r.left - 10, r.top - 10); - - clpr.AddPath(outer, ptSubject, true); - clpr.ReverseSolution(true); - clpr.Execute(ctUnion, solution, pftNegative, pftNegative); - if (! solution.empty()) - solution.erase(solution.begin()); - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::Execute(PolyTree& solution, double delta) -{ - solution.Clear(); - FixOrientations(); - DoOffset(delta); - - //now clean up 'corners' ... - Clipper clpr; - clpr.AddPaths(m_destPolys, ptSubject, true); - if (delta > 0) - { - clpr.Execute(ctUnion, solution, pftPositive, pftPositive); - } - else - { - IntRect r = clpr.GetBounds(); - Path outer(4); - outer[0] = IntPoint2d(r.left - 10, r.bottom + 10); - outer[1] = IntPoint2d(r.right + 10, r.bottom + 10); - outer[2] = IntPoint2d(r.right + 10, r.top - 10); - outer[3] = IntPoint2d(r.left - 10, r.top - 10); - - clpr.AddPath(outer, ptSubject, true); - clpr.ReverseSolution(true); - clpr.Execute(ctUnion, solution, pftNegative, pftNegative); - //remove the outer PolyNode rectangle ... - solution.RemoveOutermostPolygon(); - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoOffset(double delta) -{ - m_destPolys.clear(); - m_delta = delta; - - //if Zero offset, just copy any CLOSED polygons to m_p and return ... - if (NEAR_ZERO(delta)) - { - m_destPolys.reserve(m_polyNodes.ChildCount()); - for (int i = 0; i < m_polyNodes.ChildCount(); i++) - { - PolyNode& node = *m_polyNodes.Childs[i]; - if (node.m_endtype == etClosedPolygon) - m_destPolys.emplace_back(node.Contour); - } - return; - } - - //see offset_triginometry3.svg in the documentation folder ... - m_miterLim = (MiterLimit > 2) ? - 2. / (MiterLimit * MiterLimit) : - 0.5; - - double y; - if (ArcTolerance <= 0.0) y = def_arc_tolerance; - else if (ArcTolerance > std::fabs(delta) * def_arc_tolerance) - y = std::fabs(delta) * def_arc_tolerance; - else y = ArcTolerance; - //see offset_triginometry2.svg in the documentation folder ... - double steps = pi / std::acos(1 - y / std::fabs(delta)); - if (steps > std::fabs(delta) * pi) - steps = std::fabs(delta) * pi; //ie excessive precision check - m_sin = std::sin(two_pi / steps); - m_cos = std::cos(two_pi / steps); - m_StepsPerRad = steps / two_pi; - if (delta < 0.0) m_sin = -m_sin; - - m_destPolys.reserve(m_polyNodes.ChildCount() * 2); - for (int i = 0; i < m_polyNodes.ChildCount(); i++) - { - PolyNode& node = *m_polyNodes.Childs[i]; - m_srcPoly = node.Contour; - - int len = (int)m_srcPoly.size(); - if (len == 0 || (delta <= 0 && (len < 3 || node.m_endtype != etClosedPolygon))) - continue; - - m_destPoly.clear(); - if (len == 1) - { - if (node.m_jointype == jtRound) - { - double X = 1.0, Y = 0.0; - for (cInt j = 1; j <= steps; j++) - { - m_destPoly.emplace_back(IntPoint2d( - Round(m_srcPoly[0].x() + X * delta), - Round(m_srcPoly[0].y() + Y * delta))); - double X2 = X; - X = X * m_cos - m_sin * Y; - Y = X2 * m_sin + Y * m_cos; - } - } - else - { - double X = -1.0, Y = -1.0; - for (int j = 0; j < 4; ++j) - { - m_destPoly.emplace_back(IntPoint2d( - Round(m_srcPoly[0].x() + X * delta), - Round(m_srcPoly[0].y() + Y * delta))); - if (X < 0) X = 1; - else if (Y < 0) Y = 1; - else X = -1; - } - } - m_destPolys.emplace_back(m_destPoly); - continue; - } - //build m_normals ... - m_normals.clear(); - m_normals.reserve(len); - for (int j = 0; j < len - 1; ++j) - m_normals.emplace_back(GetUnitNormal(m_srcPoly[j], m_srcPoly[j + 1])); - if (node.m_endtype == etClosedLine || node.m_endtype == etClosedPolygon) - m_normals.emplace_back(GetUnitNormal(m_srcPoly[len - 1], m_srcPoly[0])); - else - m_normals.emplace_back(DoublePoint(m_normals[len - 2])); - - if (node.m_endtype == etClosedPolygon) - { - int k = len - 1; - for (int j = 0; j < len; ++j) - OffsetPoint(j, k, node.m_jointype); - m_destPolys.emplace_back(m_destPoly); - } - else if (node.m_endtype == etClosedLine) - { - int k = len - 1; - for (int j = 0; j < len; ++j) - OffsetPoint(j, k, node.m_jointype); - m_destPolys.emplace_back(m_destPoly); - m_destPoly.clear(); - //re-build m_normals ... - DoublePoint n = m_normals[len -1]; - for (int j = len - 1; j > 0; j--) - m_normals[j] = DoublePoint(-m_normals[j - 1].x(), -m_normals[j - 1].y()); - m_normals[0] = DoublePoint(-n.x(), -n.y()); - k = 0; - for (int j = len - 1; j >= 0; j--) - OffsetPoint(j, k, node.m_jointype); - m_destPolys.emplace_back(m_destPoly); - } - else - { - int k = 0; - for (int j = 1; j < len - 1; ++j) - OffsetPoint(j, k, node.m_jointype); - - IntPoint pt1; - if (node.m_endtype == etOpenButt) - { - int j = len - 1; - pt1 = IntPoint2d(Round(m_srcPoly[j].x() + m_normals[j].x() * delta), Round(m_srcPoly[j].y() + m_normals[j].y() * delta)); - m_destPoly.emplace_back(pt1); - pt1 = IntPoint2d(Round(m_srcPoly[j].x() - m_normals[j].x() * delta), Round(m_srcPoly[j].y() - m_normals[j].y() * delta)); - m_destPoly.emplace_back(pt1); - } - else - { - int j = len - 1; - k = len - 2; - m_sinA = 0; - m_normals[j] = DoublePoint(-m_normals[j].x(), -m_normals[j].y()); - if (node.m_endtype == etOpenSquare) - DoSquare(j, k); - else - DoRound(j, k); - } - - //re-build m_normals ... - for (int j = len - 1; j > 0; j--) - m_normals[j] = DoublePoint(-m_normals[j - 1].x(), -m_normals[j - 1].y()); - m_normals[0] = DoublePoint(-m_normals[1].x(), -m_normals[1].y()); - - k = len - 1; - for (int j = k - 1; j > 0; --j) OffsetPoint(j, k, node.m_jointype); - - if (node.m_endtype == etOpenButt) - { - pt1 = IntPoint2d(Round(m_srcPoly[0].x() - m_normals[0].x() * delta), Round(m_srcPoly[0].y() - m_normals[0].y() * delta)); - m_destPoly.emplace_back(pt1); - pt1 = IntPoint2d(Round(m_srcPoly[0].x() + m_normals[0].x() * delta), Round(m_srcPoly[0].y() + m_normals[0].y() * delta)); - m_destPoly.emplace_back(pt1); - } - else - { - k = 1; - m_sinA = 0; - if (node.m_endtype == etOpenSquare) - DoSquare(0, 1); - else - DoRound(0, 1); - } - m_destPolys.emplace_back(m_destPoly); - } - } -} -//------------------------------------------------------------------------------ - -void ClipperOffset::OffsetPoint(int j, int& k, JoinType jointype) -{ - //cross product ... - m_sinA = (m_normals[k].x() * m_normals[j].y() - m_normals[j].x() * m_normals[k].y()); - if (std::fabs(m_sinA * m_delta) < 1.0) - { - //dot product ... - double cosA = (m_normals[k].x() * m_normals[j].x() + m_normals[j].y() * m_normals[k].y() ); - if (cosA > 0) // angle => 0 degrees - { - m_destPoly.emplace_back(IntPoint2d(Round(m_srcPoly[j].x() + m_normals[k].x() * m_delta), - Round(m_srcPoly[j].y() + m_normals[k].y() * m_delta))); - return; - } - //else angle => 180 degrees - } - else if (m_sinA > 1.0) m_sinA = 1.0; - else if (m_sinA < -1.0) m_sinA = -1.0; - - if (m_sinA * m_delta < 0) - { - m_destPoly.emplace_back(IntPoint2d(Round(m_srcPoly[j].x() + m_normals[k].x() * m_delta), - Round(m_srcPoly[j].y() + m_normals[k].y() * m_delta))); - m_destPoly.emplace_back(m_srcPoly[j]); - m_destPoly.emplace_back(IntPoint2d(Round(m_srcPoly[j].x() + m_normals[j].x() * m_delta), - Round(m_srcPoly[j].y() + m_normals[j].y() * m_delta))); - } - else - switch (jointype) - { - case jtMiter: - { - double r = 1 + (m_normals[j].x() * m_normals[k].x() + - m_normals[j].y() * m_normals[k].y()); - if (r >= m_miterLim) DoMiter(j, k, r); else DoSquare(j, k); - break; - } - case jtSquare: DoSquare(j, k); break; - case jtRound: DoRound(j, k); break; - } - k = j; -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoSquare(int j, int k) -{ - double dx = std::tan(std::atan2(m_sinA, - m_normals[k].x() * m_normals[j].x() + m_normals[k].y() * m_normals[j].y()) / 4); - m_destPoly.emplace_back(IntPoint2d( - Round(m_srcPoly[j].x() + m_delta * (m_normals[k].x() - m_normals[k].y() * dx)), - Round(m_srcPoly[j].y() + m_delta * (m_normals[k].y() + m_normals[k].x() * dx)))); - m_destPoly.emplace_back(IntPoint2d( - Round(m_srcPoly[j].x() + m_delta * (m_normals[j].x() + m_normals[j].y() * dx)), - Round(m_srcPoly[j].y() + m_delta * (m_normals[j].y() - m_normals[j].x() * dx)))); -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoMiter(int j, int k, double r) -{ - double q = m_delta / r; - m_destPoly.emplace_back(IntPoint2d(Round(m_srcPoly[j].x() + (m_normals[k].x() + m_normals[j].x()) * q), - Round(m_srcPoly[j].y() + (m_normals[k].y() + m_normals[j].y()) * q))); -} -//------------------------------------------------------------------------------ - -void ClipperOffset::DoRound(int j, int k) -{ - double a = std::atan2(m_sinA, - m_normals[k].x() * m_normals[j].x() + m_normals[k].y() * m_normals[j].y()); - auto steps = std::max(Round(m_StepsPerRad * std::fabs(a)), 1); - - double X = m_normals[k].x(), Y = m_normals[k].y(), X2; - for (int i = 0; i < steps; ++i) - { - m_destPoly.emplace_back(IntPoint2d( - Round(m_srcPoly[j].x() + X * m_delta), - Round(m_srcPoly[j].y() + Y * m_delta))); - X2 = X; - X = X * m_cos - m_sin * Y; - Y = X2 * m_sin + Y * m_cos; - } - m_destPoly.emplace_back(IntPoint2d( - Round(m_srcPoly[j].x() + m_normals[j].x() * m_delta), - Round(m_srcPoly[j].y() + m_normals[j].y() * m_delta))); -} - -//------------------------------------------------------------------------------ -// Miscellaneous public functions -//------------------------------------------------------------------------------ - -// Called by Clipper::ExecuteInternal() -// For each polygon, search for exactly duplicate non-successive points. -// If such a point is found, the loop is split into two pieces. -// Search for the duplicate points is O(n^2)! -// http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/Clipper/Properties/StrictlySimple.htm -void Clipper::DoSimplePolygons() -{ - size_t i = 0; - while (i < m_PolyOuts.size()) - { - OutRec &outrec = m_PolyOuts[i++]; - OutPt* op = outrec.Pts; - if (!op || outrec.IsOpen) continue; - do //for each Pt in Polygon until duplicate found do ... - { - OutPt* op2 = op->Next; - while (op2 != outrec.Pts) - { - if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op) - { - //split the polygon into two ... - OutPt* op3 = op->Prev; - OutPt* op4 = op2->Prev; - op->Prev = op4; - op4->Next = op; - op2->Prev = op3; - op3->Next = op2; - - outrec.Pts = op; - OutRec* outrec2 = CreateOutRec(); - outrec2->Pts = op2; - UpdateOutPtIdxs(*outrec2); - if (Poly2ContainsPoly1(outrec2->Pts, outrec.Pts)) - { - //OutRec2 is contained by OutRec1 ... - outrec2->IsHole = !outrec.IsHole; - outrec2->FirstLeft = &outrec; - // For each m_PolyOuts, replace FirstLeft from outRec2 to outrec. - if (m_UsingPolyTree) FixupFirstLefts2(outrec2, &outrec); - } - else - if (Poly2ContainsPoly1(outrec.Pts, outrec2->Pts)) - { - //OutRec1 is contained by OutRec2 ... - outrec2->IsHole = outrec.IsHole; - outrec.IsHole = !outrec2->IsHole; - outrec2->FirstLeft = outrec.FirstLeft; - outrec.FirstLeft = outrec2; - // For each m_PolyOuts, replace FirstLeft from outrec to outrec2. - if (m_UsingPolyTree) FixupFirstLefts2(&outrec, outrec2); - } - else - { - //the 2 polygons are separate ... - outrec2->IsHole = outrec.IsHole; - outrec2->FirstLeft = outrec.FirstLeft; - // For each polygon of m_PolyOuts, replace FirstLeft from outrec to outrec2 if the polygon is inside outRec2. - //FIXME This is potentially very expensive! O(n^3)! - if (m_UsingPolyTree) FixupFirstLefts1(&outrec, outrec2); - } - op2 = op; //ie get ready for the Next iteration - } - op2 = op2->Next; - } - op = op->Next; - } - while (op != outrec.Pts); - } -} -//------------------------------------------------------------------------------ - -void ReversePath(Path& p) -{ - std::reverse(p.begin(), p.end()); -} -//------------------------------------------------------------------------------ - -void ReversePaths(Paths& p) -{ - for (Paths::size_type i = 0; i < p.size(); ++i) - ReversePath(p[i]); -} -//------------------------------------------------------------------------------ - -Paths SimplifyPolygon(const Path &in_poly, PolyFillType fillType, bool strictly_simple /* = true */) -{ - Clipper c; - c.StrictlySimple(strictly_simple); - c.AddPath(in_poly, ptSubject, true); - Paths out; - c.Execute(ctUnion, out, fillType, fillType); - return out; -} - -//------------------------------------------------------------------------------ - -inline double DistanceSqrd(const IntPoint& pt1, const IntPoint& pt2) -{ - auto Dx = double(pt1.x() - pt2.x()); - auto dy = double(pt1.y() - pt2.y()); - return (Dx*Dx + dy*dy); -} -//------------------------------------------------------------------------------ - -double DistanceFromLineSqrd( - const IntPoint& pt, const IntPoint& ln1, const IntPoint& ln2) -{ - //The equation of a line in general form (Ax + By + C = 0) - //given 2 points (x¹,y¹) & (x²,y²) is ... - //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0 - //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹ - //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²) - //see http://en.wikipedia.org/wiki/Perpendicular_distance - double A = double(ln1.y() - ln2.y()); - double B = double(ln2.x() - ln1.x()); - double C = A * ln1.x() + B * ln1.y(); - C = A * pt.x() + B * pt.y() - C; - return (C * C) / (A * A + B * B); -} -//--------------------------------------------------------------------------- - -bool SlopesNearCollinear(const IntPoint& pt1, - const IntPoint& pt2, const IntPoint& pt3, double distSqrd) -{ - //this function is more accurate when the point that's geometrically - //between the other 2 points is the one that's tested for distance. - //ie makes it more likely to pick up 'spikes' ... - if (std::abs(pt1.x() - pt2.x()) > std::abs(pt1.y() - pt2.y())) - { - if ((pt1.x() > pt2.x()) == (pt1.x() < pt3.x())) - return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd; - else if ((pt2.x() > pt1.x()) == (pt2.x() < pt3.x())) - return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd; - else - return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd; - } - else - { - if ((pt1.y() > pt2.y()) == (pt1.y() < pt3.y())) - return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd; - else if ((pt2.y() > pt1.y()) == (pt2.y() < pt3.y())) - return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd; - else - return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd; - } -} -//------------------------------------------------------------------------------ - -bool PointsAreClose(IntPoint pt1, IntPoint pt2, double distSqrd) -{ - auto Dx = double(pt1.x() - pt2.x()); - auto dy = double(pt1.y() - pt2.y()); - return ((Dx * Dx) + (dy * dy) <= distSqrd); -} -//------------------------------------------------------------------------------ - -OutPt* ExcludeOp(OutPt* op) -{ - OutPt* result = op->Prev; - result->Next = op->Next; - op->Next->Prev = result; - result->Idx = 0; - return result; -} -//------------------------------------------------------------------------------ - -// Simplify a polygon using a linked list of points. -void CleanPolygon(const Path& in_poly, Path& out_poly, double distance) -{ - //distance = proximity in units/pixels below which vertices - //will be stripped. Default ~= sqrt(2). - - size_t size = in_poly.size(); - - if (size == 0) - { - out_poly.clear(); - return; - } - - OutPts outPts(size); - for (size_t i = 0; i < size; ++i) - { - outPts[i].Pt = in_poly[i]; - outPts[i].Next = &outPts[(i + 1) % size]; - outPts[i].Next->Prev = &outPts[i]; - outPts[i].Idx = 0; - } - - double distSqrd = distance * distance; - OutPt* op = &outPts[0]; - while (op->Idx == 0 && op->Next != op->Prev) - { - if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd)) - { - op = ExcludeOp(op); - size--; - } - else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd)) - { - ExcludeOp(op->Next); - op = ExcludeOp(op); - size -= 2; - } - else if (SlopesNearCollinear(op->Prev->Pt, op->Pt, op->Next->Pt, distSqrd)) - { - op = ExcludeOp(op); - size--; - } - else - { - op->Idx = 1; - op = op->Next; - } - } - - if (size < 3) size = 0; - out_poly.resize(size); - for (size_t i = 0; i < size; ++i) - { - out_poly[i] = op->Pt; - op = op->Next; - } -} -//------------------------------------------------------------------------------ - -void CleanPolygon(Path& poly, double distance) -{ - CleanPolygon(poly, poly, distance); -} -//------------------------------------------------------------------------------ - -void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance) -{ - out_polys.resize(in_polys.size()); - for (Paths::size_type i = 0; i < in_polys.size(); ++i) - CleanPolygon(in_polys[i], out_polys[i], distance); -} -//------------------------------------------------------------------------------ - -void CleanPolygons(Paths& polys, double distance) -{ - CleanPolygons(polys, polys, distance); -} -//------------------------------------------------------------------------------ - -void Minkowski(const Path& poly, const Path& path, - Paths& solution, bool isSum, bool isClosed) -{ - int delta = (isClosed ? 1 : 0); - size_t polyCnt = poly.size(); - size_t pathCnt = path.size(); - Paths pp; - pp.reserve(pathCnt); - if (isSum) - for (size_t i = 0; i < pathCnt; ++i) - { - Path p; - p.reserve(polyCnt); - for (size_t j = 0; j < poly.size(); ++j) - p.emplace_back(IntPoint2d(path[i].x() + poly[j].x(), path[i].y() + poly[j].y())); - pp.emplace_back(p); - } - else - for (size_t i = 0; i < pathCnt; ++i) - { - Path p; - p.reserve(polyCnt); - for (size_t j = 0; j < poly.size(); ++j) - p.emplace_back(IntPoint2d(path[i].x() - poly[j].x(), path[i].y() - poly[j].y())); - pp.emplace_back(p); - } - - solution.clear(); - solution.reserve((pathCnt + delta) * (polyCnt + 1)); - for (size_t i = 0; i < pathCnt - 1 + delta; ++i) - for (size_t j = 0; j < polyCnt; ++j) - { - Path quad; - quad.reserve(4); - quad.emplace_back(pp[i % pathCnt][j % polyCnt]); - quad.emplace_back(pp[(i + 1) % pathCnt][j % polyCnt]); - quad.emplace_back(pp[(i + 1) % pathCnt][(j + 1) % polyCnt]); - quad.emplace_back(pp[i % pathCnt][(j + 1) % polyCnt]); - if (!Orientation(quad)) ReversePath(quad); - solution.emplace_back(quad); - } -} -//------------------------------------------------------------------------------ - -void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed) -{ - Minkowski(pattern, path, solution, true, pathIsClosed); - Clipper c; - c.AddPaths(solution, ptSubject, true); - c.Execute(ctUnion, solution, pftNonZero, pftNonZero); -} -//------------------------------------------------------------------------------ - -void TranslatePath(const Path& input, Path& output, const IntPoint& delta) -{ - //precondition: input != output - output.resize(input.size()); - for (size_t i = 0; i < input.size(); ++i) - output[i] = IntPoint2d(input[i].x() + delta.x(), input[i].y() + delta.y()); -} -//------------------------------------------------------------------------------ - -void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed) -{ - Clipper c; - for (size_t i = 0; i < paths.size(); ++i) - { - Paths tmp; - Minkowski(pattern, paths[i], tmp, true, pathIsClosed); - c.AddPaths(tmp, ptSubject, true); - if (pathIsClosed) - { - Path tmp2; - TranslatePath(paths[i], tmp2, pattern[0]); - c.AddPath(tmp2, ptClip, true); - } - } - c.Execute(ctUnion, solution, pftNonZero, pftNonZero); -} -//------------------------------------------------------------------------------ - -void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution) -{ - Minkowski(poly1, poly2, solution, false, true); - Clipper c; - c.AddPaths(solution, ptSubject, true); - c.Execute(ctUnion, solution, pftNonZero, pftNonZero); -} -//------------------------------------------------------------------------------ - -enum NodeType {ntAny, ntOpen, ntClosed}; - -void AddPolyNodeToPaths(const PolyNode& polynode, NodeType nodetype, Paths& paths) -{ - bool match = true; - if (nodetype == ntClosed) match = !polynode.IsOpen(); - else if (nodetype == ntOpen) return; - - if (!polynode.Contour.empty() && match) - paths.emplace_back(polynode.Contour); - for (int i = 0; i < polynode.ChildCount(); ++i) - AddPolyNodeToPaths(*polynode.Childs[i], nodetype, paths); -} - -void AddPolyNodeToPaths(PolyNode&& polynode, NodeType nodetype, Paths& paths) -{ - bool match = true; - if (nodetype == ntClosed) match = !polynode.IsOpen(); - else if (nodetype == ntOpen) return; - - if (!polynode.Contour.empty() && match) - paths.emplace_back(std::move(polynode.Contour)); - for (int i = 0; i < polynode.ChildCount(); ++i) - AddPolyNodeToPaths(std::move(*polynode.Childs[i]), nodetype, paths); -} - -//------------------------------------------------------------------------------ - -void PolyTreeToPaths(const PolyTree& polytree, Paths& paths) -{ - paths.clear(); - paths.reserve(polytree.Total()); - AddPolyNodeToPaths(polytree, ntAny, paths); -} - -void PolyTreeToPaths(PolyTree&& polytree, Paths& paths) -{ - paths.clear(); - paths.reserve(polytree.Total()); - AddPolyNodeToPaths(std::move(polytree), ntAny, paths); -} - -//------------------------------------------------------------------------------ - -void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths) -{ - paths.clear(); - paths.reserve(polytree.Total()); - AddPolyNodeToPaths(polytree, ntClosed, paths); -} -//------------------------------------------------------------------------------ - -void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths) -{ - paths.clear(); - paths.reserve(polytree.Total()); - //Open paths are top level only, so ... - for (int i = 0; i < polytree.ChildCount(); ++i) - if (polytree.Childs[i]->IsOpen()) - paths.emplace_back(polytree.Childs[i]->Contour); -} -//------------------------------------------------------------------------------ - -std::ostream& operator <<(std::ostream &s, const IntPoint &p) -{ - s << "(" << p.x() << "," << p.y() << ")"; - return s; -} -//------------------------------------------------------------------------------ - -std::ostream& operator <<(std::ostream &s, const Path &p) -{ - if (p.empty()) return s; - Path::size_type last = p.size() -1; - for (Path::size_type i = 0; i < last; i++) - s << "(" << p[i].x() << "," << p[i].y() << "), "; - s << "(" << p[last].x() << "," << p[last].y() << ")\n"; - return s; -} -//------------------------------------------------------------------------------ - -std::ostream& operator <<(std::ostream &s, const Paths &p) -{ - for (Paths::size_type i = 0; i < p.size(); i++) - s << p[i]; - s << "\n"; - return s; -} -//------------------------------------------------------------------------------ - -} //ClipperLib namespace - -#ifdef CLIPPERLIB_NAMESPACE_PREFIX -} // namespace CLIPPERLIB_NAMESPACE_PREFIX -#endif // CLIPPERLIB_NAMESPACE_PREFIX diff --git a/deps_src/clipper/clipper.hpp b/deps_src/clipper/clipper.hpp deleted file mode 100644 index 06637effce..0000000000 --- a/deps_src/clipper/clipper.hpp +++ /dev/null @@ -1,606 +0,0 @@ -/******************************************************************************* -* * -* Author : Angus Johnson * -* Version : 6.4.2 * -* Date : 27 February 2017 * -* Website : http://www.angusj.com * -* Copyright : Angus Johnson 2010-2017 * -* * -* License: * -* Use, modification & distribution is subject to Boost Software License Ver 1. * -* http://www.boost.org/LICENSE_1_0.txt * -* * -* Attributions: * -* The code in this library is an extension of Bala Vatti's clipping algorithm: * -* "A generic solution to polygon clipping" * -* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * -* http://portal.acm.org/citation.cfm?id=129906 * -* * -* Computer graphics and geometric modeling: implementation and algorithms * -* By Max K. Agoston * -* Springer; 1 edition (January 4, 2005) * -* http://books.google.com/books?q=vatti+clipping+agoston * -* * -* See also: * -* "Polygon Offsetting by Computing Winding Numbers" * -* Paper no. DETC2005-85513 pp. 565-575 * -* ASME 2005 International Design Engineering Technical Conferences * -* and Computers and Information in Engineering Conference (IDETC/CIE2005) * -* September 24-28, 2005 , Long Beach, California, USA * -* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * -* * -*******************************************************************************/ - -#ifndef clipper_hpp -#define clipper_hpp - -#include -#include - -#include - -#include - -#define CLIPPER_VERSION "6.2.6" - -//CLIPPERLIB_USE_XYZ: adds a Z member to IntPoint. Adds a minor cost to perfomance. -//#define CLIPPERLIB_USE_XYZ - -//use_lines: Enables line clipping. Adds a very minor cost to performance. -#define use_lines - -//use_deprecated: Enables temporary support for the obsolete functions -//#define use_deprecated - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef CLIPPERLIB_NAMESPACE_PREFIX - namespace CLIPPERLIB_NAMESPACE_PREFIX { -#endif // CLIPPERLIB_NAMESPACE_PREFIX - -#ifdef CLIPPERLIB_USE_XYZ - namespace ClipperLib_Z { -#else - namespace ClipperLib { -#endif - -enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }; -enum PolyType { ptSubject, ptClip }; -//By far the most widely used winding rules for polygon filling are -//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32) -//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL) -//see http://glprogramming.com/red/chapter11.html -enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }; - -// If defined, Clipper will work with 32bit signed int coordinates to reduce memory -// consumption and to speed up exact orientation predicate calculation. -// In that case, coordinates and their differences (vectors of the coordinates) have to fit int32_t. -// #define CLIPPERLIB_INT32 - -// Point coordinate type -#ifdef CLIPPERLIB_INT32 - // Coordinates and their differences (vectors of the coordinates) have to fit int32_t. - using cInt = int32_t; - using CrossProductType = int64_t; -#else - using cInt = int64_t; - using CrossProductType = double; - // Maximum cInt value to allow a cross product calculation using 32bit expressions. - static constexpr cInt const loRange = 0x3FFFFFFF; // 0x3FFFFFFF = 1 073 741 823 - // Maximum allowed cInt value. - static constexpr cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL; -#endif // CLIPPERLIB_INT32 - -#ifdef CLIPPERLIB_INTPOINT_TYPE -using IntPoint = CLIPPERLIB_INTPOINT_TYPE; -#else // CLIPPERLIB_INTPOINT_TYPE -using IntPoint = Eigen::Matrix; -#endif // CLIPPERLIB_INTPOINT_TYPE - -using DoublePoint = Eigen::Matrix; - -//------------------------------------------------------------------------------ - -template -using Allocator = tbb::scalable_allocator; -//using Allocator = std::allocator; -using Path = std::vector>; -using Paths = std::vector>; - -inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;} -inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;} - -std::ostream& operator <<(std::ostream &s, const IntPoint &p); -std::ostream& operator <<(std::ostream &s, const Path &p); -std::ostream& operator <<(std::ostream &s, const Paths &p); - -//------------------------------------------------------------------------------ - -#ifdef CLIPPERLIB_USE_XYZ -typedef std::function ZFillCallback; -#endif - -enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4}; -enum JoinType {jtSquare, jtRound, jtMiter}; -enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound}; - -class PolyNode; -typedef std::vector> PolyNodes; - -class PolyNode -{ -public: - PolyNode() : Parent(0), Index(0), m_IsOpen(false) {} - virtual ~PolyNode(){}; - Path Contour; - PolyNodes Childs; - PolyNode* Parent; - // Traversal of the polygon tree in a depth first fashion. - PolyNode* GetNext() const { return Childs.empty() ? GetNextSiblingUp() : Childs.front(); } - bool IsHole() const; - bool IsOpen() const { return m_IsOpen; } - int ChildCount() const { return (int)Childs.size(); } -private: - unsigned Index; //node index in Parent.Childs - bool m_IsOpen; - JoinType m_jointype; - EndType m_endtype; - PolyNode* GetNextSiblingUp() const { return Parent ? ((Index == Parent->Childs.size() - 1) ? Parent->GetNextSiblingUp() : Parent->Childs[Index + 1]) : nullptr; } - void AddChild(PolyNode& child); - friend class Clipper; //to access Index - friend class ClipperOffset; - friend class PolyTree; //to implement the PolyTree::move operator -}; - -class PolyTree: public PolyNode -{ -public: - PolyTree() {} - PolyTree(PolyTree &&src) { *this = std::move(src); } - virtual ~PolyTree(){Clear();}; - PolyTree& operator=(PolyTree &&src) { - AllNodes = std::move(src.AllNodes); - Contour = std::move(src.Contour); - Childs = std::move(src.Childs); - Parent = nullptr; - Index = src.Index; - m_IsOpen = src.m_IsOpen; - m_jointype = src.m_jointype; - m_endtype = src.m_endtype; - for (size_t i = 0; i < Childs.size(); ++ i) - Childs[i]->Parent = this; - return *this; - } - PolyNode* GetFirst() const { return Childs.empty() ? nullptr : Childs.front(); } - void Clear() { AllNodes.clear(); Childs.clear(); } - int Total() const; - void RemoveOutermostPolygon(); -private: - PolyTree(const PolyTree &src) = delete; - PolyTree& operator=(const PolyTree &src) = delete; - std::vector> AllNodes; - friend class Clipper; //to access AllNodes -}; - -double Area(const Path &poly); -inline bool Orientation(const Path &poly) { return Area(poly) >= 0; } -int PointInPolygon(const IntPoint &pt, const Path &path); - -// Union with "strictly simple" fix enabled. -Paths SimplifyPolygon(const Path &in_poly, PolyFillType fillType = pftNonZero, bool strictly_simple = true); - -void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415); -void CleanPolygon(Path& poly, double distance = 1.415); -void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415); -void CleanPolygons(Paths& polys, double distance = 1.415); - -void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed); -void MinkowskiSum(const Path& pattern, const Paths& paths, Paths& solution, bool pathIsClosed); -void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution); - -void PolyTreeToPaths(const PolyTree& polytree, Paths& paths); -void PolyTreeToPaths(PolyTree&& polytree, Paths& paths); -void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths); -void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths); - -void ReversePath(Path& p); -void ReversePaths(Paths& p); - -struct IntRect { cInt left; cInt top; cInt right; cInt bottom; }; - -//enums that are used internally ... -enum EdgeSide { esLeft = 1, esRight = 2}; - -// namespace Internal { - //forward declarations (for stuff used internally) ... - struct TEdge { - // Bottom point of this edge (with minimum Y). - IntPoint Bot; - // Current position. - IntPoint Curr; - // Top point of this edge (with maximum Y). - IntPoint Top; - // Slope (dx/dy). For horiontal edges, the slope is set to HORIZONTAL (-1.0E+40). - double Dx; - PolyType PolyTyp; - EdgeSide Side; - // Winding number delta. 1 or -1 depending on winding direction, 0 for open paths and flat closed paths. - int WindDelta; - int WindCnt; - int WindCnt2; //winding count of the opposite polytype - int OutIdx; - // Next edge in the input path. - TEdge *Next; - // Previous edge in the input path. - TEdge *Prev; - // Next edge in the Local Minima List chain. - TEdge *NextInLML; - TEdge *NextInAEL; - TEdge *PrevInAEL; - TEdge *NextInSEL; - TEdge *PrevInSEL; - }; - - struct IntersectNode { - IntersectNode(TEdge *Edge1, TEdge *Edge2, IntPoint Pt) : - Edge1(Edge1), Edge2(Edge2), Pt(Pt) {} - TEdge *Edge1; - TEdge *Edge2; - IntPoint Pt; - }; - - struct LocalMinimum { - cInt Y; - TEdge *LeftBound; - TEdge *RightBound; - }; - - // Point of an output polygon. - // 36B on 64bit system without CLIPPERLIB_USE_XYZ. - struct OutPt { - // 4B - int Idx; - // 16B without CLIPPERLIB_USE_XYZ / 24B with CLIPPERLIB_USE_XYZ - IntPoint Pt; - // 4B on 32bit system, 8B on 64bit system - OutPt *Next; - // 4B on 32bit system, 8B on 64bit system - OutPt *Prev; - }; - - using OutPts = std::vector>; - - // Output polygon. - struct OutRec { - int Idx; - bool IsHole; - bool IsOpen; - //The 'FirstLeft' field points to another OutRec that contains or is the - //'parent' of OutRec. It is 'first left' because the ActiveEdgeList (AEL) is - //parsed left from the current edge (owning OutRec) until the owner OutRec - //is found. This field simplifies sorting the polygons into a tree structure - //which reflects the parent/child relationships of all polygons. - //This field should be renamed Parent, and will be later. - OutRec* FirstLeft; - // Used only by void Clipper::BuildResult2(PolyTree& polytree) - PolyNode* PolyNd; - // Linked list of output points, dynamically allocated. - OutPt* Pts; - OutPt* BottomPt; - }; - - struct Join { - Join(OutPt *OutPt1, OutPt *OutPt2, IntPoint OffPt) : - OutPt1(OutPt1), OutPt2(OutPt2), OffPt(OffPt) {} - OutPt *OutPt1; - OutPt *OutPt2; - IntPoint OffPt; - }; -// }; // namespace Internal - -//------------------------------------------------------------------------------ - -//ClipperBase is the ancestor to the Clipper class. It should not be -//instantiated directly. This class simply abstracts the conversion of sets of -//polygon coordinates into edge objects that are stored in a LocalMinima list. -class ClipperBase -{ -public: - ClipperBase() : -#ifndef CLIPPERLIB_INT32 - m_UseFullRange(false), -#endif // CLIPPERLIB_INT32 - m_HasOpenPaths(false) {} - ~ClipperBase() { Clear(); } - bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed); - - template - bool AddPaths(PathsProvider &&paths_provider, PolyType PolyTyp, bool Closed) - { - size_t num_paths = paths_provider.size(); - if (num_paths == 0) - return false; - if (num_paths == 1) - return AddPath(*paths_provider.begin(), PolyTyp, Closed); - - std::vector> num_edges(num_paths, 0); - int num_edges_total = 0; - size_t i = 0; - for (const Path &pg : paths_provider) { - // Remove duplicate end point from a closed input path. - // Remove duplicate points from the end of the input path. - int highI = (int)pg.size() -1; - if (Closed) - while (highI > 0 && (pg[highI] == pg[0])) - --highI; - while (highI > 0 && (pg[highI] == pg[highI -1])) - --highI; - if ((Closed && highI < 2) || (!Closed && highI < 1)) - highI = -1; - num_edges[i ++] = highI + 1; - num_edges_total += highI + 1; - } - if (num_edges_total == 0) - return false; - - // Allocate a new edge array. - std::vector> edges(num_edges_total); - // Fill in the edge array. - bool result = false; - TEdge *p_edge = edges.data(); - i = 0; - for (const Path &pg : paths_provider) { - if (num_edges[i] && !pg.empty()) { - bool res = AddPathInternal(pg, num_edges[i] - 1, PolyTyp, Closed, p_edge); - if (res) { - p_edge += num_edges[i]; - result = true; - } - } - ++ i; - } - if (result) - // At least some edges were generated. Remember the edge array. - m_edges.emplace_back(std::move(edges)); - return result; - } - - void Clear(); - IntRect GetBounds(); - // By default, when three or more vertices are collinear in input polygons (subject or clip), the Clipper object removes the 'inner' vertices before clipping. - // When enabled the PreserveCollinear property prevents this default behavior to allow these inner vertices to appear in the solution. - bool PreserveCollinear() const {return m_PreserveCollinear;}; - void PreserveCollinear(bool value) {m_PreserveCollinear = value;}; -protected: - bool AddPathInternal(const Path &pg, int highI, PolyType PolyTyp, bool Closed, TEdge* edges); - TEdge* AddBoundsToLML(TEdge *e, bool IsClosed); - void Reset(); - TEdge* ProcessBound(TEdge* E, bool IsClockwise); - TEdge* DescendToMin(TEdge *&E); - void AscendToMax(TEdge *&E, bool Appending, bool IsClosed); - - // Local minima (Y, left edge, right edge) sorted by ascending Y. - std::vector> m_MinimaList; - -#ifdef CLIPPERLIB_INT32 - static constexpr const bool m_UseFullRange = false; -#else // CLIPPERLIB_INT32 - // True if the input polygons have abs values higher than loRange, but lower than hiRange. - // False if the input polygons have abs values lower or equal to loRange. - bool m_UseFullRange; -#endif // CLIPPERLIB_INT32 - - // A vector of edges per each input path. - using Edges = std::vector>; - std::vector> m_edges; - // Don't remove intermediate vertices of a collinear sequence of points. - bool m_PreserveCollinear; - // Is any of the paths inserted by AddPath() or AddPaths() open? - bool m_HasOpenPaths; -}; -//------------------------------------------------------------------------------ - -class Clipper : public ClipperBase -{ -public: - Clipper(int initOptions = 0); - ~Clipper() { Clear(); } - void Clear() { ClipperBase::Clear(); DisposeAllOutRecs(); } - bool Execute(ClipType clipType, - Paths &solution, - PolyFillType fillType = pftEvenOdd) - { return Execute(clipType, solution, fillType, fillType); } - bool Execute(ClipType clipType, - Paths &solution, - PolyFillType subjFillType, - PolyFillType clipFillType); - bool Execute(ClipType clipType, - PolyTree &polytree, - PolyFillType fillType = pftEvenOdd) - { return Execute(clipType, polytree, fillType, fillType); } - bool Execute(ClipType clipType, - PolyTree &polytree, - PolyFillType subjFillType, - PolyFillType clipFillType); - bool ReverseSolution() const { return m_ReverseOutput; }; - void ReverseSolution(bool value) {m_ReverseOutput = value;}; - bool StrictlySimple() const {return m_StrictSimple;}; - void StrictlySimple(bool value) {m_StrictSimple = value;}; - //set the callback function for z value filling on intersections (otherwise Z is 0) -#ifdef CLIPPERLIB_USE_XYZ - void ZFillFunction(ZFillCallback zFillFunc) { m_ZFill = zFillFunc; } -#endif -protected: - void Reset(); - virtual bool ExecuteInternal(); -private: - - // Output polygons. - std::deque> m_PolyOuts; - // Output points, allocated by a continuous sets of m_OutPtsChunkSize. - static constexpr const size_t m_OutPtsChunkSize = 32; - std::deque, Allocator>> m_OutPts; - // List of free output points, to be used before taking a point from m_OutPts or allocating a new chunk. - OutPt *m_OutPtsFree; - size_t m_OutPtsChunkLast; - - std::vector> m_Joins; - std::vector> m_GhostJoins; - std::vector> m_IntersectList; - ClipType m_ClipType; - // A priority queue (a binary heap) of Y coordinates. - using cInts = std::vector>; - std::priority_queue m_Scanbeam; - // Maxima are collected by ProcessEdgesAtTopOfScanbeam(), consumed by ProcessHorizontal(). - cInts m_Maxima; - TEdge *m_ActiveEdges; - TEdge *m_SortedEdges; - PolyFillType m_ClipFillType; - PolyFillType m_SubjFillType; - bool m_ReverseOutput; - // Does the result go to a PolyTree or Paths? - bool m_UsingPolyTree; - bool m_StrictSimple; -#ifdef CLIPPERLIB_USE_XYZ - ZFillCallback m_ZFill; //custom callback -#endif - void SetWindingCount(TEdge& edge) const; - bool IsEvenOddFillType(const TEdge& edge) const - { return (edge.PolyTyp == ptSubject) ? m_SubjFillType == pftEvenOdd : m_ClipFillType == pftEvenOdd; } - bool IsEvenOddAltFillType(const TEdge& edge) const - { return (edge.PolyTyp == ptSubject) ? m_ClipFillType == pftEvenOdd : m_SubjFillType == pftEvenOdd; } - void InsertLocalMinimaIntoAEL(const cInt botY); - void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge); - void AddEdgeToSEL(TEdge *edge); - void CopyAELToSEL(); - void DeleteFromSEL(TEdge *e); - void DeleteFromAEL(TEdge *e); - void UpdateEdgeIntoAEL(TEdge *&e); - void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2); - bool IsContributing(const TEdge& edge) const; - bool IsTopHorz(const cInt XPos); - void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2); - void DoMaxima(TEdge *e); - void ProcessHorizontals(); - void ProcessHorizontal(TEdge *horzEdge); - void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); - OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); - OutRec* GetOutRec(int idx); - void AppendPolygon(TEdge *e1, TEdge *e2); - void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt); - OutRec* CreateOutRec(); - OutPt* AddOutPt(TEdge *e, const IntPoint &pt); - OutPt* GetLastOutPt(TEdge *e); - OutPt* AllocateOutPt(); - OutPt* DupOutPt(OutPt* outPt, bool InsertAfter); - // Add the point to a list of free points. - void DisposeOutPt(OutPt *pt) { pt->Next = m_OutPtsFree; m_OutPtsFree = pt; } - void DisposeOutPts(OutPt*& pp) { if (pp != nullptr) { pp->Prev->Next = m_OutPtsFree; m_OutPtsFree = pp; } } - void DisposeAllOutRecs(); - bool ProcessIntersections(const cInt topY); - void BuildIntersectList(const cInt topY); - void ProcessEdgesAtTopOfScanbeam(const cInt topY); - void BuildResult(Paths& polys); - void BuildResult2(PolyTree& polytree); - void SetHoleState(TEdge *e, OutRec *outrec); - bool FixupIntersectionOrder(); - void FixupOutPolygon(OutRec &outrec); - void FixupOutPolyline(OutRec &outrec); - bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl); - void FixHoleLinkage(OutRec &outrec); - bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2); - bool JoinHorz(OutPt* op1, OutPt* op1b, OutPt* op2, OutPt* op2b, const IntPoint &Pt, bool DiscardLeft); - void JoinCommonEdges(); - void DoSimplePolygons(); - void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec); - void FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec); - void FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec); -#ifdef CLIPPERLIB_USE_XYZ - void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2); -#endif -}; -//------------------------------------------------------------------------------ - -class ClipperOffset -{ -public: - ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25, double shortestEdgeLength = 0.) : - MiterLimit(miterLimit), ArcTolerance(roundPrecision), ShortestEdgeLength(shortestEdgeLength), m_lowest(-1, 0) {} - ~ClipperOffset() { Clear(); } - void AddPath(const Path& path, JoinType joinType, EndType endType); - template - void AddPaths(PathsProvider &&paths, JoinType joinType, EndType endType) { - for (const Path &path : paths) - AddPath(path, joinType, endType); - } - void Execute(Paths& solution, double delta); - void Execute(PolyTree& solution, double delta); - void Clear(); - double MiterLimit; - double ArcTolerance; - double ShortestEdgeLength; - -private: - Paths m_destPolys; - Path m_srcPoly; - Path m_destPoly; - std::vector> m_normals; - double m_delta, m_sinA, m_sin, m_cos; - double m_miterLim, m_StepsPerRad; - // x: index of the lowest contour in m_polyNodes - // y: index of the lowest point in the lowest contour - IntPoint m_lowest; - PolyNode m_polyNodes; - - void FixOrientations(); - void DoOffset(double delta); - void OffsetPoint(int j, int& k, JoinType jointype); - void DoSquare(int j, int k); - void DoMiter(int j, int k, double r); - void DoRound(int j, int k); -}; -//------------------------------------------------------------------------------ - -class clipperException : public std::exception -{ - public: - clipperException(const char* description): m_descr(description) {} - virtual ~clipperException() throw() {} - virtual const char* what() const throw() {return m_descr.c_str();} - private: - std::string m_descr; -}; -//------------------------------------------------------------------------------ - -// Union with "strictly simple" fix enabled. -template -inline Paths SimplifyPolygons(PathsProvider &&in_polys, PolyFillType fillType = pftNonZero, bool strictly_simple = true) { - Clipper c; - c.StrictlySimple(strictly_simple); - c.AddPaths(std::forward(in_polys), ptSubject, true); - Paths out; - c.Execute(ctUnion, out, fillType, fillType); - return out; -} - -} //ClipperLib namespace - -#ifdef CLIPPERLIB_NAMESPACE_PREFIX -} // namespace CLIPPERLIB_NAMESPACE_PREFIX -#endif // CLIPPERLIB_NAMESPACE_PREFIX - -#endif //clipper_hpp diff --git a/deps_src/clipper/clipper_z.cpp b/deps_src/clipper/clipper_z.cpp deleted file mode 100644 index f26be7089a..0000000000 --- a/deps_src/clipper/clipper_z.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// Hackish wrapper around the ClipperLib library to compile the Clipper library with the Z support. - -// Enable the Z coordinate support. -#define CLIPPERLIB_USE_XYZ - -// and let it compile -#include "clipper.cpp" diff --git a/deps_src/clipper/clipper_z.hpp b/deps_src/clipper/clipper_z.hpp deleted file mode 100644 index 20596d8e19..0000000000 --- a/deps_src/clipper/clipper_z.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// Hackish wrapper around the ClipperLib library to compile the Clipper library with the Z support. - -#ifndef clipper_z_hpp -#ifdef clipper_hpp -#error "You should include clipper_z.hpp before clipper.hpp" -#endif - -#define clipper_z_hpp - -// Enable the Z coordinate support. -#define CLIPPERLIB_USE_XYZ - -#include "clipper.hpp" - -#undef clipper_hpp -#undef CLIPPERLIB_USE_XYZ - -#endif // clipper_z_hpp diff --git a/deps_src/clipper2/CMakeLists.txt b/deps_src/clipper2/CMakeLists.txt index 86c9a9efab..6343a6ceb5 100644 --- a/deps_src/clipper2/CMakeLists.txt +++ b/deps_src/clipper2/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(Clipper2 VERSION 1.5.2 LANGUAGES C CXX) +project(Clipper2 VERSION 2.0.1 LANGUAGES C CXX) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_CXX_STANDARD 17) @@ -19,6 +19,7 @@ set(CLIPPER2_INC Clipper2Lib/include/clipper2/clipper.minkowski.h Clipper2Lib/include/clipper2/clipper.offset.h Clipper2Lib/include/clipper2/clipper.rectclip.h + Clipper2Lib/include/clipper2/clipper.triangulation.h Clipper2Lib/include/clipper2/clipper2_z.hpp ) @@ -26,6 +27,7 @@ set(CLIPPER2_SRC Clipper2Lib/src/clipper.engine.cpp Clipper2Lib/src/clipper.offset.cpp Clipper2Lib/src/clipper.rectclip.cpp + Clipper2Lib/src/clipper.triangulation.cpp Clipper2Lib/src/clipper2_z.cpp ) @@ -36,6 +38,9 @@ target_include_directories(Clipper2 PUBLIC Clipper2Lib/include ) +# Engine nodes are allocated through tbbmalloc (see clipper.engine.cpp). +target_link_libraries(Clipper2 PRIVATE TBB::tbbmalloc) + if (WIN32) if (MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang") target_compile_options(Clipper2 PRIVATE /W4 /WX) diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h index 6d00f8fa07..25a5c02cc2 100644 --- a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h @@ -1,8 +1,8 @@ /******************************************************************************* * Author : Angus Johnson * -* Date : 12 May 2024 * +* Date : 12 October 2025 * * Website : https://www.angusj.com * -* Copyright : Angus Johnson 2010-2024 * +* Copyright : Angus Johnson 2010-2025 * * Purpose : Core Clipper Library structures and functions * * License : https://www.boost.org/LICENSE_1_0.txt * *******************************************************************************/ @@ -251,6 +251,20 @@ namespace Clipper2Lib { template using Paths = std::vector>; + template + Path& operator<<(Path& poly, const Point& p) + { + poly.emplace_back(p); + return poly; + } + + template + Paths& operator<<(Paths& polys, const Path& p) + { + polys.emplace_back(p); + return polys; + } + using Path64 = Path; using PathD = Path; using Paths64 = std::vector< Path64>; @@ -685,32 +699,31 @@ namespace Clipper2Lib { inline int TriSign(int64_t x) // returns 0, 1 or -1 { - return (x > 0) - (x < 0); + return (x > 0) - (x < 0); } - struct MultiplyUInt64Result + struct UInt128Struct { - const uint64_t result = 0; - const uint64_t carry = 0; + const uint64_t lo = 0; + const uint64_t hi = 0; - bool operator==(const MultiplyUInt64Result& other) const + bool operator==(const UInt128Struct& other) const { - return result == other.result && carry == other.carry; + return lo == other.lo && hi == other.hi; }; + }; - inline MultiplyUInt64Result Multiply(uint64_t a, uint64_t b) // #834, #835 + inline UInt128Struct MultiplyUInt64(uint64_t a, uint64_t b) // #834, #835 { + // note to self - lamba expressions follow const auto lo = [](uint64_t x) { return x & 0xFFFFFFFF; }; const auto hi = [](uint64_t x) { return x >> 32; }; const uint64_t x1 = lo(a) * lo(b); const uint64_t x2 = hi(a) * lo(b) + hi(x1); const uint64_t x3 = lo(a) * hi(b) + lo(x2); - const uint64_t result = lo(x3) << 32 | lo(x1); - const uint64_t carry = hi(a) * hi(b) + hi(x2) + hi(x3); - - return { result, carry }; + return { uint64_t(lo(x3) << 32 | lo(x1)), uint64_t(hi(a) * hi(b) + hi(x2) + hi(x3)) }; } // returns true if (and only if) a * b == c * d @@ -727,14 +740,50 @@ namespace Clipper2Lib { const auto abs_c = static_cast(std::abs(c)); const auto abs_d = static_cast(std::abs(d)); - const auto abs_ab = Multiply(abs_a, abs_b); - const auto abs_cd = Multiply(abs_c, abs_d); + const auto ab = MultiplyUInt64(abs_a, abs_b); + const auto cd = MultiplyUInt64(abs_c, abs_d); // nb: it's important to differentiate 0 values here from other values const auto sign_ab = TriSign(a) * TriSign(b); const auto sign_cd = TriSign(c) * TriSign(d); - return abs_ab == abs_cd && sign_ab == sign_cd; + return ab == cd && sign_ab == sign_cd; +#endif + } + + template + inline int CrossProductSign(const Point& pt1, const Point& pt2, const Point& pt3) + { + const auto a = pt2.x - pt1.x; + const auto b = pt3.y - pt2.y; + const auto c = pt2.y - pt1.y; + const auto d = pt3.x - pt2.x; + +#if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX + const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b); + const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d); + if (ab > cd) return 1; + else if (ab < cd) return -1; + else return 0; +#else + const auto ab = MultiplyUInt64(std::abs(a), std::abs(b)); + const auto cd = MultiplyUInt64(std::abs(c), std::abs(d)); + + const auto sign_ab = TriSign(a) * TriSign(b); + const auto sign_cd = TriSign(c) * TriSign(d); + + if (sign_ab == sign_cd) + { + int result; + if (ab.hi == cd.hi) + { + if (ab.lo == cd.lo) return 0; + result = (ab.lo > cd.lo) ? 1 : -1; + } + else result = (ab.hi > cd.hi) ? 1 : -1; + return (sign_ab > 0) ? result : -result; + } + return (sign_ab > sign_cd) ? 1 : -1; #endif } @@ -838,6 +887,10 @@ namespace Clipper2Lib { return Area(poly) >= 0; } + // GetLineIntersectPt - a 'true' result is non-parallel. The 'ip' will also + // be constrained to seg1. However, it's possible that 'ip' won't be inside + // seg2, even when 'ip' hasn't been constrained (ie 'ip' is inside seg1). + #if CLIPPER2_HI_PRECISION // caution: this will compromise performance // https://github.com/AngusJohnson/Clipper2/issues/317#issuecomment-1314023253 @@ -845,7 +898,7 @@ namespace Clipper2Lib { #define CC_MIN(x,y) ((x)>(y)?(y):(x)) #define CC_MAX(x,y) ((x)<(y)?(y):(x)) template - inline bool GetSegmentIntersectPt(const Point& ln1a, const Point& ln1b, + inline bool GetLineIntersectPt(const Point& ln1a, const Point& ln1b, const Point& ln2a, const Point& ln2b, Point& ip) { double ln1dy = static_cast(ln1b.y - ln1a.y); @@ -891,11 +944,14 @@ namespace Clipper2Lib { ip.x = originx + static_cast(hitx); ip.y = originy + static_cast(hity); } +#ifdef USINGZ + ip.z = 0; +#endif return true; } #else template - inline bool GetSegmentIntersectPt(const Point& ln1a, const Point& ln1b, + inline bool GetLineIntersectPt(const Point& ln1a, const Point& ln1b, const Point& ln2a, const Point& ln2b, Point& ip) { // https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection @@ -913,7 +969,10 @@ namespace Clipper2Lib { { ip.x = static_cast(ln1a.x + t * dx1); ip.y = static_cast(ln1a.y + t * dy1); - } +#ifdef USINGZ + ip.z = 0; +#endif + } return true; } #endif @@ -940,30 +999,53 @@ namespace Clipper2Lib { } template - inline int GetSign(const T& val) - { - if (!val) return 0; + inline int GetSign(const T& val) + { + if (!val) return 0; return (val > 0) ? 1 : -1; } inline bool SegmentsIntersect(const Point64& seg1a, const Point64& seg1b, const Point64& seg2a, const Point64& seg2b, bool inclusive = false) { + double dy1 = static_cast(seg1b.y - seg1a.y); + double dx1 = static_cast(seg1b.x - seg1a.x); + double dy2 = static_cast(seg2b.y - seg2a.y); + double dx2 = static_cast(seg2b.x - seg2a.x); + double cp = dy1 * dx2 - dy2 * dx1; + if (cp == 0) return false; // ie parallel segments + if (inclusive) { - double res1 = CrossProduct(seg1a, seg2a, seg2b); - double res2 = CrossProduct(seg1b, seg2a, seg2b); - if (res1 * res2 > 0) return false; - double res3 = CrossProduct(seg2a, seg1a, seg1b); - double res4 = CrossProduct(seg2b, seg1a, seg1b); - if (res3 * res4 > 0) return false; - return (res1 || res2 || res3 || res4); // ensures not collinear + //result **includes** segments that touch at an end point + double t = ((seg1a.x - seg2a.x) * dy2 - (seg1a.y - seg2a.y) * dx2); + if (t == 0) return true; + if (t > 0) + { + if (cp < 0 || t > cp) return false; + } + else if (cp > 0 || t < cp) return false; // false when t more neg. than cp + + t = ((seg1a.x - seg2a.x) * dy1 - (seg1a.y - seg2a.y) * dx1); + if (t == 0) return true; + if (t > 0) return (cp > 0 && t <= cp); + else return (cp < 0 && t >= cp); // true when t less neg. than cp } - else { - return (GetSign(CrossProduct(seg1a, seg2a, seg2b)) * - GetSign(CrossProduct(seg1b, seg2a, seg2b)) < 0) && - (GetSign(CrossProduct(seg2a, seg1a, seg1b)) * - GetSign(CrossProduct(seg2b, seg1a, seg1b)) < 0); + else + { + //result **excludes** segments that touch at an end point + double t = ((seg1a.x - seg2a.x) * dy2 - (seg1a.y - seg2a.y) * dx2); + if (t == 0) return false; + if (t > 0) + { + if (cp < 0 || t >= cp) return false; + } + else if (cp > 0 || t <= cp ) return false; // false when t more neg. than cp + + t = ((seg1a.x - seg2a.x) * dy1 - (seg1a.y - seg2a.y) * dx1); + if (t == 0) return false; + if (t > 0) return (cp > 0 && t < cp); + else return (cp < 0 && t > cp); // true when t less neg. than cp } } @@ -1051,7 +1133,7 @@ namespace Clipper2Lib { val = 1 - val; // toggle val else { - double d = CrossProduct(*prev, *curr, pt); + int d = CrossProductSign(*prev, *curr, pt); if (d == 0) return PointInPolygonResult::IsOn; if ((d < 0) == is_above) val = 1 - val; } @@ -1065,7 +1147,7 @@ namespace Clipper2Lib { if (curr == cend) curr = cbegin; if (curr == cbegin) prev = cend - 1; else prev = curr - 1; - double d = CrossProduct(*prev, *curr, pt); + int d = CrossProductSign(*prev, *curr, pt); if (d == 0) return PointInPolygonResult::IsOn; if ((d < 0) == is_above) val = 1 - val; } diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h index 8387d2337d..5151e53c7b 100644 --- a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h @@ -15,6 +15,13 @@ #include #include +// Orca: engine nodes are allocated through tbbmalloc, see clipper.engine.cpp. +#define CLIPPER2_NODE_ALLOCATOR \ + static void* operator new(size_t size); \ + static void operator delete(void* ptr) noexcept; \ + static void* operator new[](size_t size); \ + static void operator delete[](void* ptr) noexcept; + #ifdef USINGZ namespace Clipper2Lib_Z { #else @@ -50,6 +57,7 @@ namespace Clipper2Lib { } struct Vertex { + CLIPPER2_NODE_ALLOCATOR Point64 pt; Vertex* next = nullptr; Vertex* prev = nullptr; @@ -57,6 +65,7 @@ namespace Clipper2Lib { }; struct OutPt { + CLIPPER2_NODE_ALLOCATOR Point64 pt; OutPt* next = nullptr; OutPt* prev = nullptr; @@ -81,6 +90,7 @@ namespace Clipper2Lib { //OutRec: contains a path in the clipping solution. Edges in the AEL will //have OutRec pointers assigned when they form part of the clipping solution. struct OutRec { + CLIPPER2_NODE_ALLOCATOR size_t idx = 0; OutRec* owner = nullptr; Active* front_edge = nullptr; @@ -106,6 +116,7 @@ namespace Clipper2Lib { /////////////////////////////////////////////////////////////////// struct Active { + CLIPPER2_NODE_ALLOCATOR Point64 bot; Point64 top; int64_t curr_x = 0; //current (updated at every new scanline) @@ -133,6 +144,7 @@ namespace Clipper2Lib { }; struct LocalMinima { + CLIPPER2_NODE_ALLOCATOR Vertex* vertex; PathType polytype; bool is_open; @@ -303,6 +315,7 @@ namespace Clipper2Lib { protected: PolyPath* parent_; public: + CLIPPER2_NODE_ALLOCATOR PolyPath(PolyPath* parent = nullptr): parent_(parent){} virtual ~PolyPath() {}; //https://en.cppreference.com/w/cpp/language/rule_of_three @@ -330,15 +343,16 @@ namespace Clipper2Lib { //Even levels except level 0 return lvl && !(lvl & 1); } - template - static double Clipper2LibArea(const Path &poly) - { + // Area() of the namespace this header is compiled into (Clipper2Lib or Clipper2Lib_Z). + template + static double Clipper2LibArea(const Path &poly) + { #ifdef USINGZ - return Clipper2Lib_Z::Area(poly); + return Clipper2Lib_Z::Area(poly); #else - return Clipper2Lib::Area(poly); + return Clipper2Lib::Area(poly); #endif - } + } }; typedef typename std::vector> PolyPath64List; @@ -388,7 +402,8 @@ namespace Clipper2Lib { double Area() const { - return std::accumulate(childs_.cbegin(), childs_.cend(), Clipper2LibArea(polygon_), + return std::accumulate(childs_.cbegin(), childs_.cend(), + Clipper2LibArea(polygon_), [](double a, const auto& child) {return a + child->Area(); }); } @@ -462,7 +477,8 @@ namespace Clipper2Lib { double Area() const { - return std::accumulate(childs_.begin(), childs_.end(), Clipper2LibArea(polygon_), + return std::accumulate(childs_.begin(), childs_.end(), + Clipper2LibArea(polygon_), [](double a, const auto& child) {return a + child->Area(); }); } }; diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h index a0d33d51df..2694f285fe 100644 --- a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h @@ -19,17 +19,17 @@ The path structures used extensively in other parts of this library are all based on std::vector classes. Since C++ classes can't be accessed by other -languages, these paths are exported here as very simple array structures -(either of int64_t or double) that can be parsed by just about any +languages, these paths are exported here as very simple array structures +(either of int64_t or double) that can be parsed by just about any programming language. These 2D paths are defined by series of x and y coordinates together with an optional user-defined 'z' value (see Z-values below). Hence, a vertex refers -to a single x and y coordinate (+/- a user-defined value). Data structures -have names with suffixes that indicate the array type (either int64_t or -double). For example, the data structure CPath64 contains an array of int64_t -values, whereas the data structure CPathD contains an array of double. -Where documentation omits the type suffix (eg CPath), it is referring to an +to a single x and y coordinate (+/- a user-defined value). Data structures +have names with suffixes that indicate the array type (either int64_t or +double). For example, the data structure CPath64 contains an array of int64_t +values, whereas the data structure CPathD contains an array of double. +Where documentation omits the type suffix (eg CPath), it is referring to an array whose data type could be either int64_t or double. For conciseness, the following letters are used in the diagrams below: @@ -39,10 +39,10 @@ A: Number of elements in an array CPath64 and CPathD: -These are arrays of either int64_t or double values. Apart from -the first two elements, these arrays are a series of vertices -that together define a path. The very first element contains the -number of vertices (N) in the path, while second element should +These are arrays of either int64_t or double values. Apart from +the first two elements, these arrays are a series of vertices +that together define a path. The very first element contains the +number of vertices (N) in the path, while second element should contain a 0 value. _______________________________________________________________ | counters | vertex1 | vertex2 | ... | vertexN | @@ -52,9 +52,9 @@ _______________________________________________________________ CPaths64 and CPathsD: These are also arrays of either int64_t or double values that -contain any number of consecutive CPath structures. However, +contain any number of consecutive CPath structures. However, preceding the first path is a pair of values. The first value -contains the length of the entire array structure (A), and the +contains the length of the entire array structure (A), and the second contains the number (ie count) of contained paths (C). Memory allocation for CPaths64 = A * sizeof(int64_t) Memory allocation for CPathsD = A * sizeof(double) @@ -65,12 +65,12 @@ __________________________________________ CPolytree64 and CPolytreeD: -The entire polytree structure is an array of int64_t or double. The -first element in the array indicates the array's total length (A). -The second element indicates the number (C) of CPolyPath structures +The entire polytree structure is an array of int64_t or double. The +first element in the array indicates the array's total length (A). +The second element indicates the number (C) of CPolyPath structures that are the TOP LEVEL CPolyPath in the polytree, and these top -level CPolyPath immediately follow these first two array elements. -These top level CPolyPath structures may, in turn, contain nested +level CPolyPath immediately follow these first two array elements. +These top level CPolyPath structures may, in turn, contain nested CPolyPath children, and these collectively make a tree structure. _________________________________________________________ | counters | CPolyPath1 | CPolyPath2 | ... | CPolyPathC | @@ -116,13 +116,10 @@ the four vertices that define the two segments that are intersecting. #include "clipper2/clipper.engine.h" #include "clipper2/clipper.offset.h" #include "clipper2/clipper.rectclip.h" +#include "clipper2/clipper.triangulation.h" #include -#ifdef USINGZ -namespace Clipper2Lib_Z { -#else namespace Clipper2Lib { -#endif typedef int64_t* CPath64; typedef int64_t* CPaths64; @@ -254,9 +251,9 @@ ZCallback64 dllCallback64 = nullptr; ZCallbackD dllCallbackD = nullptr; constexpr int EXPORT_VERTEX_DIMENSIONALITY = 3; -#else +#else constexpr int EXPORT_VERTEX_DIMENSIONALITY = 2; -#endif +#endif template static void GetPathCountAndCPathsArrayLen(const Paths& paths, @@ -396,7 +393,7 @@ static Path ConvertCPathToPathT(T* path) #ifdef USINGZ z_type z = Reinterpret(*v++); result.emplace_back(x, y, z); -#else +#else result.emplace_back(x, y); #endif } @@ -414,7 +411,7 @@ static Paths ConvertCPathsToPathsT(T* paths) for (size_t i = 0; i < cnt; ++i) { size_t cnt2 = static_cast(*v); - v += 2; + v += 2; Path path; path.reserve(cnt2); for (size_t j = 0; j < cnt2; ++j) @@ -447,7 +444,7 @@ static Path64 ConvertCPathDToPath64WithScale(const CPathD path, double scale) #ifdef USINGZ z_type z = Reinterpret(*v++); result.emplace_back(x, y, z); -#else +#else result.emplace_back(x, y); #endif } @@ -492,7 +489,7 @@ static void CreateCPolyPath64(const PolyPath64* pp, int64_t*& v) { *v++ = pt.x; *v++ = pt.y; -#ifdef USINGZ +#ifdef USINGZ * v++ = Reinterpret(pt.z); // raw memory copy #endif } @@ -508,7 +505,7 @@ static void CreateCPolyPathD(const PolyPathD* pp, double*& v) { *v++ = pt.x; *v++ = pt.y; -#ifdef USINGZ +#ifdef USINGZ * v++ = Reinterpret(pt.z); // raw memory copy #endif } @@ -816,6 +813,24 @@ EXTERN_DLL_EXPORT CPaths64 MinkowskiDiff64(const CPath64& cpattern, const CPath6 return CreateCPathsFromPathsT(solution); } +EXTERN_DLL_EXPORT CPaths64 Triangulate64(const CPaths64 paths, bool use_delaunay) +{ + Paths64 pp = ConvertCPathsToPathsT(paths); + Paths64 sol; + if (Triangulate(pp, sol, use_delaunay) != TriangulateResult::success) return nullptr; + return CreateCPathsFromPathsT(sol); +} + +EXTERN_DLL_EXPORT CPathsD TriangulateD(const CPathsD paths, int decimal_precison, bool use_delaunay) +{ + if (decimal_precison < -8 || decimal_precison > 8) return nullptr; + const double scale = std::pow(10, decimal_precison); + Paths64 pp = ConvertCPathsDToPaths64(paths, scale); + Paths64 sol; + if (Triangulate(pp, sol, use_delaunay) != TriangulateResult::success) return nullptr; + return CreateCPathsDFromPaths64(sol, 1 / scale); +} + #ifdef USINGZ typedef void (*DLLZCallback64)(const Point64& e1bot, const Point64& e1top, const Point64& e2bot, const Point64& e2top, Point64& pt); typedef void (*DLLZCallbackD)(const PointD& e1bot, const PointD& e1top, const PointD& e2bot, const PointD& e2top, PointD& pt); diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h index f6301fc52e..139dd0f9bd 100644 --- a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h @@ -1,8 +1,8 @@ /******************************************************************************* * Author : Angus Johnson * -* Date : 27 April 2024 * +* Date : 5 March 2025 * * Website : https://www.angusj.com * -* Copyright : Angus Johnson 2010-2024 * +* Copyright : Angus Johnson 2010-2025 * * Purpose : This module provides a simple interface to the Clipper Library * * License : https://www.boost.org/LICENSE_1_0.txt * *******************************************************************************/ @@ -13,14 +13,15 @@ #include "clipper2/clipper.core.h" #include "clipper2/clipper.engine.h" #include "clipper2/clipper.offset.h" -#include "clipper2/clipper.minkowski.h" #include "clipper2/clipper.rectclip.h" +#include "clipper2/clipper.minkowski.h" +#include "clipper2/clipper.triangulation.h" #include #ifdef USINGZ - namespace Clipper2Lib_Z { +namespace Clipper2Lib_Z { #else - namespace Clipper2Lib { +namespace Clipper2Lib { #endif inline Paths64 BooleanOp(ClipType cliptype, FillRule fillrule, @@ -154,14 +155,14 @@ if (!delta) return paths; if (error_code) return PathsD(); const double scale = std::pow(10, precision); - ClipperOffset clip_offset(miter_limit, arc_tolerance); + ClipperOffset clip_offset(miter_limit, arc_tolerance * scale); clip_offset.AddPaths(ScalePaths(paths, scale, error_code), jt, et); if (error_code) return PathsD(); Paths64 solution; clip_offset.Execute(delta * scale, solution); return ScalePaths(solution, 1 / scale, error_code); } - + template inline Path TranslatePath(const Path& path, T dx, T dy) { @@ -355,6 +356,29 @@ #endif } + inline size_t GetNext(size_t current, size_t high, + const std::vector& flags) + { + ++current; + while (current <= high && flags[current]) ++current; + if (current <= high) return current; + current = 0; + while (flags[current]) ++current; + return current; + } + + inline size_t GetPrior(size_t current, size_t high, + const std::vector& flags) + { + if (current == 0) current = high; + else --current; + while (current > 0 && flags[current]) --current; + if (!flags[current]) return current; + current = high; + while (flags[current]) --current; + return current; + } + } // end details namespace inline std::ostream& operator<< (std::ostream& os, const PolyTree64& pp) @@ -615,29 +639,6 @@ return result; } - inline size_t GetNext(size_t current, size_t high, - const std::vector& flags) - { - ++current; - while (current <= high && flags[current]) ++current; - if (current <= high) return current; - current = 0; - while (flags[current]) ++current; - return current; - } - - inline size_t GetPrior(size_t current, size_t high, - const std::vector& flags) - { - if (current == 0) current = high; - else --current; - while (current > 0 && flags[current]) --current; - if (!flags[current]) return current; - current = high; - while (flags[current]) --current; - return current; - } - template inline Path SimplifyPath(const Path &path, double epsilon, bool isClosedPath = true) @@ -669,13 +670,13 @@ start = curr; do { - curr = GetNext(curr, high, flags); + curr = details::GetNext(curr, high, flags); } while (curr != start && distSqr[curr] > epsSqr); if (curr == start) break; } - prior = GetPrior(curr, high, flags); - next = GetNext(curr, high, flags); + prior = details::GetPrior(curr, high, flags); + next = details::GetNext(curr, high, flags); if (next == prior) break; // flag for removal the smaller of adjacent 'distances' @@ -684,14 +685,14 @@ prior2 = prior; prior = curr; curr = next; - next = GetNext(next, high, flags); + next = details::GetNext(next, high, flags); } else - prior2 = GetPrior(prior, high, flags); + prior2 = details::GetPrior(prior, high, flags); flags[curr] = true; curr = next; - next = GetNext(next, high, flags); + next = details::GetNext(next, high, flags); if (isClosedPath || ((curr != high) && (curr != 0))) distSqr[curr] = PerpendicDistFromLineSqrd(path[curr], path[prior], path[next]); @@ -716,6 +717,35 @@ return result; } + + template + inline bool Path2ContainsPath1(const Path& path1, const Path& path2) + { + // precondition: paths must not intersect, except for + // transient (and presumed 'micro') path intersections + PointInPolygonResult pip = PointInPolygonResult::IsOn; + for (const Point& pt : path1) + { + switch (PointInPolygon(pt, path2)) + { + case PointInPolygonResult::IsOutside: + if (pip == PointInPolygonResult::IsOutside) return false; + pip = PointInPolygonResult::IsOutside; + break; + case PointInPolygonResult::IsInside: + if (pip == PointInPolygonResult::IsInside) return true; + pip = PointInPolygonResult::IsInside; + break; + default: + break; + } + } + if (pip != PointInPolygonResult::IsInside) return false; + // result is likely true but check midpoint + Point mp1 = GetBounds(path1).MidPoint(); + return PointInPolygon(mp1, path2) == PointInPolygonResult::IsInside; + } + template inline void RDP(const Path path, std::size_t begin, std::size_t end, double epsSqrd, std::vector& flags) diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h index a7d53df36f..fd553609c4 100644 --- a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h @@ -39,7 +39,7 @@ private: class Group { public: Paths64 paths_in; - std::optional lowest_path_idx{}; + std::optional lowest_path_idx{}; bool is_reversed = false; JoinType join_type; EndType end_type; @@ -100,7 +100,7 @@ public: void AddPath(const Path64& path, JoinType jt_, EndType et_); void AddPaths(const Paths64& paths, JoinType jt_, EndType et_); void Clear() { groups_.clear(); norms.clear(); }; - + void Execute(double delta, Paths64& sols_64); void Execute(double delta, PolyTree64& polytree); void Execute(DeltaCallback64 delta_cb, Paths64& paths); @@ -114,7 +114,7 @@ public: bool PreserveCollinear() const { return preserve_collinear_; } void PreserveCollinear(bool preserve_collinear){preserve_collinear_ = preserve_collinear;} - + bool ReverseSolution() const { return reverse_solution_; } void ReverseSolution(bool reverse_solution) {reverse_solution_ = reverse_solution;} diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.triangulation.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.triangulation.h new file mode 100644 index 0000000000..a33cb9fe6a --- /dev/null +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.triangulation.h @@ -0,0 +1,30 @@ +/******************************************************************************* +* Author : Angus Johnson * +* Date : 6 December 2025 * +* Release : BETA RELEASE * +* Website : https://www.angusj.com * +* Copyright : Angus Johnson 2010-2025 * +* Purpose : Delaunay Triangulation * +* License : https://www.boost.org/LICENSE_1_0.txt * +*******************************************************************************/ + +#ifndef CLIPPER_TRIANGULATION_H +#define CLIPPER_TRIANGULATION_H + +#include +#include "clipper2/clipper.core.h" + +#ifdef USINGZ +namespace Clipper2Lib_Z { +#else +namespace Clipper2Lib { +#endif + + enum class TriangulateResult { success, fail, no_polygons, paths_intersect }; + + // Triangulate - this function will not accept intesecting paths + TriangulateResult Triangulate(const Paths64& pp, Paths64& solution, bool useDelaunay = true); + TriangulateResult Triangulate(const PathsD& pp, int decPlaces, PathsD& solution, bool useDelaunay = true); + +} // Clipper2Lib namespace +#endif // CLIPPER_TRIANGULATION_H diff --git a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h index 661b0f1c58..9aec09a2a8 100644 --- a/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h +++ b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h @@ -1,6 +1,6 @@ #ifndef CLIPPER_VERSION_H #define CLIPPER_VERSION_H -constexpr auto CLIPPER2_VERSION = "1.5.2"; +constexpr auto CLIPPER2_VERSION = "2.0.1"; #endif // CLIPPER_VERSION_H diff --git a/deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp index fd77bda7bb..2948565ff4 100644 --- a/deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp +++ b/deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp @@ -1,8 +1,8 @@ /******************************************************************************* * Author : Angus Johnson * -* Date : 17 September 2024 * +* Date : 5 November 2025 * * Website : https://www.angusj.com * -* Copyright : Angus Johnson 2010-2024 * +* Copyright : Angus Johnson 2010-2025 * * Purpose : This is the main polygon clipping module * * License : https://www.boost.org/LICENSE_1_0.txt * *******************************************************************************/ @@ -10,6 +10,8 @@ #include "clipper2/clipper.engine.h" #include "clipper2/clipper.h" #include +#include +#include // https://github.com/AngusJohnson/Clipper2/discussions/334 // #discussioncomment-4248602 @@ -27,10 +29,30 @@ namespace Clipper2Lib_Z { namespace Clipper2Lib { #endif + // Orca: tbbmalloc scales far better than the default heap when all slicing threads clip at once. + static void* NodeAlloc(size_t size) + { + if (void* p = scalable_malloc(size)) return p; + throw std::bad_alloc(); + } + +#define CLIPPER2_DEFINE_NODE_ALLOCATOR(T) \ + void* T::operator new(size_t size) { return NodeAlloc(size); } \ + void T::operator delete(void* ptr) noexcept { scalable_free(ptr); } \ + void* T::operator new[](size_t size) { return NodeAlloc(size); } \ + void T::operator delete[](void* ptr) noexcept { scalable_free(ptr); } + CLIPPER2_DEFINE_NODE_ALLOCATOR(Vertex) + CLIPPER2_DEFINE_NODE_ALLOCATOR(OutPt) + CLIPPER2_DEFINE_NODE_ALLOCATOR(OutRec) + CLIPPER2_DEFINE_NODE_ALLOCATOR(Active) + CLIPPER2_DEFINE_NODE_ALLOCATOR(LocalMinima) + CLIPPER2_DEFINE_NODE_ALLOCATOR(PolyPath) +#undef CLIPPER2_DEFINE_NODE_ALLOCATOR + static const Rect64 invalid_rect = Rect64(false); - // Every closed path (ie polygon) is made up of a series of vertices forming edge - // 'bounds' that alternate between ascending bounds (containing edges going up + // Every closed path (ie polygon) is made up of a series of vertices forming edge + // 'bounds' that alternate between ascending bounds (containing edges going up // relative to the Y-axis) and descending bounds. 'Local Minima' refers to // vertices where ascending and descending bounds join at the bottom, and // 'Local Maxima' are where ascending and descending bounds join at the top. @@ -482,8 +504,7 @@ namespace Clipper2Lib { inline void SetOwner(OutRec* outrec, OutRec* new_owner) { //precondition1: new_owner is never null - while (new_owner->owner && !new_owner->owner->pts) - new_owner->owner = new_owner->owner->owner; + new_owner->owner = GetRealOutRec(new_owner->owner); OutRec* tmp = new_owner; while (tmp && tmp != outrec) tmp = tmp->owner; if (tmp) new_owner->owner = outrec->owner; @@ -536,9 +557,9 @@ namespace Clipper2Lib { val = 1 - val; // toggle val else { - double d = CrossProduct(op2->prev->pt, op2->pt, pt); - if (d == 0) return PointInPolygonResult::IsOn; - if ((d < 0) == is_above) val = 1 - val; + int i = CrossProductSign(op2->prev->pt, op2->pt, pt); + if (i == 0) return PointInPolygonResult::IsOn; + if ((i < 0) == is_above) val = 1 - val; } is_above = !is_above; op2 = op2->next; @@ -546,9 +567,9 @@ namespace Clipper2Lib { if (is_above != starting_above) { - double d = CrossProduct(op2->prev->pt, op2->pt, pt); - if (d == 0) return PointInPolygonResult::IsOn; - if ((d < 0) == is_above) val = 1 - val; + int i = CrossProductSign(op2->prev->pt, op2->pt, pt); + if (i == 0) return PointInPolygonResult::IsOn; + if ((i < 0) == is_above) val = 1 - val; } if (val == 0) return PointInPolygonResult::IsOutside; @@ -578,30 +599,31 @@ namespace Clipper2Lib { return result; } - inline bool Path1InsidePath2(OutPt* op1, OutPt* op2) + inline bool Path2ContainsPath1(OutPt* op1, OutPt* op2) { - // we need to make some accommodation for rounding errors - // so we won't jump if the first vertex is found outside - PointInPolygonResult result; - int outside_cnt = 0; + // this function accommodates rounding errors that + // can cause path micro intersections + PointInPolygonResult pip = PointInPolygonResult::IsOn; OutPt* op = op1; - do - { - result = PointInOpPolygon(op->pt, op2); - if (result == PointInPolygonResult::IsOutside) ++outside_cnt; - else if (result == PointInPolygonResult::IsInside) --outside_cnt; + do { + switch (PointInOpPolygon(op->pt, op2)) + { + case PointInPolygonResult::IsOutside: + if (pip == PointInPolygonResult::IsOutside) return false; + pip = PointInPolygonResult::IsOutside; + break; + case PointInPolygonResult::IsInside: + if (pip == PointInPolygonResult::IsInside) return true; + pip = PointInPolygonResult::IsInside; + break; + default: break; + } op = op->next; - } while (op != op1 && std::abs(outside_cnt) < 2); - if (std::abs(outside_cnt) > 1) return (outside_cnt < 0); - // since path1's location is still equivocal, check its midpoint - Point64 mp = GetBounds(GetCleanPath(op1)).MidPoint(); - Path64 path2 = GetCleanPath(op2); - return PointInPolygon(mp, path2) != PointInPolygonResult::IsOutside; + } while (op != op1); + // result unclear, so try again using cleaned paths + return Path2ContainsPath1(GetCleanPath(op1), GetCleanPath(op2)); // (#973) } - //------------------------------------------------------------------------------ - //------------------------------------------------------------------------------ - void AddLocMin(LocalMinimaList& list, Vertex& vert, PathType polytype, bool is_open) { @@ -1126,21 +1148,19 @@ namespace Clipper2Lib { return newcomer.curr_x > resident.curr_x; //get the turning direction a1.top, a2.bot, a2.top - double d = CrossProduct(resident.top, newcomer.bot, newcomer.top); - if (d != 0) return d < 0; + int i = CrossProductSign(resident.top, newcomer.bot, newcomer.top); + if (i != 0) return i < 0; //edges must be collinear to get here //for starting open paths, place them according to //the direction they're about to turn if (!IsMaxima(resident) && (resident.top.y > newcomer.top.y)) { - return CrossProduct(newcomer.bot, - resident.top, NextVertex(resident)->pt) <= 0; + return (CrossProductSign(newcomer.bot, resident.top, NextVertex(resident)->pt) <= 0); } else if (!IsMaxima(newcomer) && (newcomer.top.y > resident.top.y)) { - return CrossProduct(newcomer.bot, - newcomer.top, NextVertex(newcomer)->pt) >= 0; + return (CrossProductSign(newcomer.bot, newcomer.top, NextVertex(newcomer)->pt) >= 0); } int64_t y = newcomer.bot.y; @@ -1155,7 +1175,7 @@ namespace Clipper2Lib { resident.bot, resident.top)) return true; else //compare turning direction of the alternate bound - return (CrossProduct(PrevPrevVertex(resident)->pt, + return (CrossProductSign(PrevPrevVertex(resident)->pt, newcomer.bot, PrevPrevVertex(newcomer)->pt) > 0) == newcomerIsLeft; } @@ -1565,7 +1585,7 @@ namespace Clipper2Lib { FixSelfIntersects(outrec); } - void ClipperBase::DoSplitOp(OutRec* outrec, OutPt* splitOp) + void ClipperBase::DoSplitOp (OutRec* outrec, OutPt* splitOp) { // splitOp.prev -> splitOp && // splitOp.next -> splitOp.next.next are intersecting @@ -1574,7 +1594,7 @@ namespace Clipper2Lib { outrec->pts = prevOp; Point64 ip; - GetSegmentIntersectPt(prevOp->pt, splitOp->pt, + GetLineIntersectPt(prevOp->pt, splitOp->pt, splitOp->next->pt, nextNextOp->pt, ip); #ifdef USINGZ @@ -1630,7 +1650,7 @@ namespace Clipper2Lib { if (using_polytree_) { - if (Path1InsidePath2(prevOp, newOp)) + if (Path2ContainsPath1(prevOp, newOp)) { newOr->splits = new OutRecList(); newOr->splits->emplace_back(outrec); @@ -1652,19 +1672,32 @@ namespace Clipper2Lib { void ClipperBase::FixSelfIntersects(OutRec* outrec) { OutPt* op2 = outrec->pts; + if (op2->prev == op2->next->next) + return; // because triangles can't self-intersect for (; ; ) { - // triangles can't self-intersect - if (op2->prev == op2->next->next) break; if (SegmentsIntersect(op2->prev->pt, op2->pt, op2->next->pt, op2->next->next->pt)) { - if (op2 == outrec->pts || op2->next == outrec->pts) - outrec->pts = outrec->pts->prev; - DoSplitOp(outrec, op2); - if (!outrec->pts) break; - op2 = outrec->pts; - continue; + if (SegmentsIntersect(op2->prev->pt, + op2->pt, op2->next->next->pt, op2->next->next->next->pt)) + { + // adjacent intersections (ie a micro self-intersections) + op2 = DuplicateOp(op2, false); + op2->pt = op2->next->next->next->pt; + op2 = op2->next; + } + else + { + if (op2 == outrec->pts || op2->next == outrec->pts) + outrec->pts = outrec->pts->prev; + DoSplitOp(outrec, op2); + if (!outrec->pts) break; + op2 = outrec->pts; + if (op2->prev == op2->next->next) + break; // again, because triangles can't self-intersect + continue; + } } else op2 = op2->next; @@ -1805,14 +1838,14 @@ namespace Clipper2Lib { switch (fillrule_) { - case FillRule::Positive: - if (edge_c->wind_cnt != 1) return; + case FillRule::Positive: + if (edge_c->wind_cnt != 1) return; break; - case FillRule::Negative: - if (edge_c->wind_cnt != -1) return; + case FillRule::Negative: + if (edge_c->wind_cnt != -1) return; break; - default: - if (std::abs(edge_c->wind_cnt) != 1) return; + default: + if (std::abs(edge_c->wind_cnt) != 1) return; } #ifdef USINGZ @@ -1933,7 +1966,7 @@ namespace Clipper2Lib { const bool e1_windcnt_in_01 = old_e1_windcnt == 0 || old_e1_windcnt == 1; const bool e2_windcnt_in_01 = old_e2_windcnt == 0 || old_e2_windcnt == 1; - if ((!IsHotEdge(e1) && !e1_windcnt_in_01) || + if ((!IsHotEdge(e1) && !e1_windcnt_in_01) || (!IsHotEdge(e2) && !e2_windcnt_in_01)) return; @@ -2112,10 +2145,9 @@ namespace Clipper2Lib { e->prev_in_sel = e->prev_in_ael; e->next_in_sel = e->next_in_ael; e->jump = e->next_in_sel; - if (e->join_with == JoinWith::Left) - e->curr_x = e->prev_in_ael->curr_x; // also avoids complications - else - e->curr_x = TopX(*e, top_y); + // it is safe to ignore 'joined' edges here because + // if necessary they will be split in IntersectEdges() + e->curr_x = TopX(*e, top_y); e = e->next_in_ael; } } @@ -2262,15 +2294,14 @@ namespace Clipper2Lib { void MoveSplits(OutRec* fromOr, OutRec* toOr) { - if (!fromOr->splits) return; if (!toOr->splits) toOr->splits = new OutRecList(); OutRecList::iterator orIter = fromOr->splits->begin(); for (; orIter != fromOr->splits->end(); ++orIter) - toOr->splits->emplace_back(*orIter); + if (toOr != *orIter) // #987 + toOr->splits->emplace_back(*orIter); fromOr->splits->clear(); } - void ClipperBase::ProcessHorzJoins() { for (const HorzJoin& j : horz_join_list_) @@ -2299,8 +2330,8 @@ namespace Clipper2Lib { } if (using_polytree_) //#498, #520, #584, D#576, #618 - { - if (Path1InsidePath2(or1->pts, or2->pts)) + { + if (Path2ContainsPath1(or1->pts, or2->pts)) { //swap or1's & or2's pts OutPt* tmp = or1->pts; @@ -2311,7 +2342,7 @@ namespace Clipper2Lib { //or2 is now inside or1 or2->owner = or1; } - else if (Path1InsidePath2(or2->pts, or1->pts)) + else if (Path2ContainsPath1(or2->pts, or1->pts)) { or2->owner = or1; } @@ -2324,13 +2355,14 @@ namespace Clipper2Lib { else or2->owner = or1; } - else + else // joining, not splitting { or2->pts = nullptr; if (using_polytree_) { SetOwner(or2, or1); - MoveSplits(or2, or1); //#618 + if (or2->splits) + MoveSplits(or2, or1); //#618 } else or2->owner = or1; @@ -2350,7 +2382,7 @@ namespace Clipper2Lib { void ClipperBase::AddNewIntersectNode(Active& e1, Active& e2, int64_t top_y) { Point64 ip; - if (!GetSegmentIntersectPt(e1.bot, e1.top, e2.bot, e2.top, ip)) + if (!GetLineIntersectPt(e1.bot, e1.top, e2.bot, e2.top, ip)) ip = Point64(e1.curr_x, top_y); //parallel edges //rounding errors can occasionally place the calculated intersection @@ -2934,22 +2966,28 @@ namespace Clipper2Lib { bool ClipperBase::CheckSplitOwner(OutRec* outrec, OutRecList* splits) { - for (auto split : *splits) + // nb: use indexing (not an iterator) in case 'splits' is modified inside this loop (#1029) + for (size_t idx = 0; idx < splits->size(); ++idx) { + OutRec* split = (*splits)[idx]; + if (!split->pts && split->splits && + CheckSplitOwner(outrec, split->splits)) return true; //#942 split = GetRealOutRec(split); - if(!split || split == outrec || split->recursive_split == outrec) continue; + if (!split || split == outrec || split->recursive_split == outrec) continue; split->recursive_split = outrec; // prevent infinite loops if (split->splits && CheckSplitOwner(outrec, split->splits)) - return true; - else if (CheckBounds(split) && - IsValidOwner(outrec, split) && - split->bounds.Contains(outrec->bounds) && - Path1InsidePath2(outrec->pts, split->pts)) - { - outrec->owner = split; //found in split - return true; - } + return true; + + if (!CheckBounds(split) || !split->bounds.Contains(outrec->bounds) || + !Path2ContainsPath1(outrec->pts, split->pts)) continue; + + if (!IsValidOwner(outrec, split)) // split is owned by outrec! (#957) + split->owner = outrec->owner; + + outrec->owner = split; + return true; + } return false; } @@ -2960,13 +2998,12 @@ namespace Clipper2Lib { // post-condition: if a valid path, outrec will have a polypath if (outrec->polypath || outrec->bounds.IsEmpty()) return; - while (outrec->owner) { if (outrec->owner->splits && CheckSplitOwner(outrec, outrec->owner->splits)) break; if (outrec->owner->pts && CheckBounds(outrec->owner) && outrec->owner->bounds.Contains(outrec->bounds) && - Path1InsidePath2(outrec->pts, outrec->owner->pts)) break; + Path2ContainsPath1(outrec->pts, outrec->owner->pts)) break; outrec->owner = outrec->owner->owner; } @@ -3029,6 +3066,7 @@ namespace Clipper2Lib { { OutRec* outrec = outrec_list_[i]; if (!outrec || !outrec->pts) continue; + if (outrec->is_open) { Path64 path; diff --git a/deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp index c00a345c01..60b514356a 100644 --- a/deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp +++ b/deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp @@ -1,6 +1,6 @@ /******************************************************************************* * Author : Angus Johnson * -* Date : 22 January 2025 * +* Date : 11 October 2025 * * Website : https://www.angusj.com * * Copyright : Angus Johnson 2010-2025 * * Purpose : Path Offset (Inflate/Shrink) * @@ -37,29 +37,35 @@ const double arc_const = 0.002; // <-- 1/500 // Miscellaneous methods //------------------------------------------------------------------------------ -std::optional GetLowestClosedPathIdx(const Paths64& paths) +void GetLowestClosedPathInfo(const Paths64& paths, std::optional& idx, bool& is_neg_area) { - std::optional result; + idx.reset(); Point64 botPt = Point64(INT64_MAX, INT64_MIN); for (size_t i = 0; i < paths.size(); ++i) { + double a = MAX_DBL; for (const Point64& pt : paths[i]) { if ((pt.y < botPt.y) || ((pt.y == botPt.y) && (pt.x >= botPt.x))) continue; - result = i; + if (a == MAX_DBL) + { + a = Area(paths[i]); + if (a == 0) break; // invalid closed path, so break from inner loop + is_neg_area = a < 0; + } + idx = i; botPt.x = pt.x; botPt.y = pt.y; } } - return result; } inline double Hypot(double x, double y) { // given that this is an internal function, and given the x and y parameters // will always be coordinate values (or the difference between coordinate values), - // x and y should always be within INT64_MIN to INT64_MAX. Consequently, + // x and y should always be within INT64_MIN to INT64_MAX. Consequently, // there should be no risk that the following computation will overflow // see https://stackoverflow.com/a/32436148/359538 return std::sqrt(x * x + y * y); @@ -145,15 +151,16 @@ ClipperOffset::Group::Group(const Paths64& _paths, JoinType _join_type, EndType if (end_type == EndType::Polygon) { - lowest_path_idx = GetLowestClosedPathIdx(paths_in); + bool is_neg_area; + GetLowestClosedPathInfo(paths_in, lowest_path_idx, is_neg_area); // the lowermost path must be an outer path, so if its orientation is negative, // then flag the whole group is 'reversed' (will negate delta etc.) // as this is much more efficient than reversing every path. - is_reversed = (lowest_path_idx.has_value()) && Area(paths_in[lowest_path_idx.value()]) < 0; + is_reversed = lowest_path_idx.has_value() && is_neg_area; } else { - lowest_path_idx = std::nullopt; + lowest_path_idx.reset(); is_reversed = false; } } @@ -236,7 +243,7 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k) { PointD pt4 = PointD(pt3.x + vec.x * group_delta_, pt3.y + vec.y * group_delta_); PointD pt = ptQ; - GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt); + GetLineIntersectPt(pt1, pt2, pt3, pt4, pt); //get the second intersect point through reflecion path_out.emplace_back(ReflectPoint(pt, ptQ)); path_out.emplace_back(pt); @@ -245,7 +252,7 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k) { PointD pt4 = GetPerpendicD(path[j], norms[k], group_delta_); PointD pt = ptQ; - GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt); + GetLineIntersectPt(pt1, pt2, pt3, pt4, pt); path_out.emplace_back(pt); //get the second intersect point through reflecion path_out.emplace_back(ReflectPoint(pt, ptQ)); @@ -291,7 +298,8 @@ void ClipperOffset::DoRound(const Path64& path, size_t j, size_t k, double angle #else path_out.emplace_back(pt.x + offsetVec.x, pt.y + offsetVec.y); #endif - int steps = static_cast(std::ceil(steps_per_rad_ * std::abs(angle))); // #448, #456 + // Orca: round the step count like Clipper1 did, so round offsets keep their vertices. + int steps = std::max(static_cast(std::round(steps_per_rad_ * std::abs(angle))), 1); for (int i = 1; i < steps; ++i) // ie 1 less than steps { offsetVec = PointD(offsetVec.x * step_cos_ - step_sin_ * offsetVec.y, @@ -333,9 +341,9 @@ void ClipperOffset::OffsetPoint(Group& group, const Path64& path, size_t j, size if (cos_a > -0.999 && (sin_a * group_delta_ < 0)) // test for concavity first (#593) { // is concave - // by far the simplest way to construct concave joins, especially those joining very - // short segments, is to insert 3 points that produce negative regions. These regions - // will be removed later by the finishing union operation. This is also the best way + // by far the simplest way to construct concave joins, especially those joining very + // short segments, is to insert 3 points that produce negative regions. These regions + // will be removed later by the finishing union operation. This is also the best way // to ensure that path reversals (ie over-shrunk paths) are removed. #ifdef USINGZ path_out.emplace_back(GetPerpendic(path[j], norms[k], group_delta_), path[j].z); @@ -366,11 +374,31 @@ void ClipperOffset::OffsetPoint(Group& group, const Path64& path, size_t j, size DoSquare(path, j, k); } +// Orca: join concave corners at the crossing of both edge offsets where safe, 3-point loops make dense inward offsets slow. +static bool OffsetConcaveCrossing(const Path64& path, const PathD& norms, size_t j, size_t k, size_t next, + double delta, Path64& path_out) +{ + const double sin_a = CrossProduct(norms[j], norms[k]); + const double cos_a = DotProduct(norms[j], norms[k]); + if (cos_a <= -0.999 || sin_a * delta >= 0) return false; + const double x = std::fabs(delta * sin_a) / (1 + cos_a); + if (4 * x * x > DistanceSqr(path[k], path[j]) || 4 * x * x > DistanceSqr(path[j], path[next])) return false; + const double q = delta / (1 + cos_a); +#ifdef USINGZ + path_out.emplace_back(path[j].x + (norms[k].x + norms[j].x) * q, path[j].y + (norms[k].y + norms[j].y) * q, path[j].z); +#else + path_out.emplace_back(path[j].x + (norms[k].x + norms[j].x) * q, path[j].y + (norms[k].y + norms[j].y) * q); +#endif + return true; +} + void ClipperOffset::OffsetPolygon(Group& group, const Path64& path) { path_out.clear(); for (Path64::size_type j = 0, k = path.size() - 1; j < path.size(); k = j, ++j) - OffsetPoint(group, path, j, k); + if (deltaCallback64_ || path[j] == path[k] || + !OffsetConcaveCrossing(path, norms, j, k, j + 1 == path.size() ? 0 : j + 1, group_delta_, path_out)) + OffsetPoint(group, path, j, k); solution->emplace_back(path_out); } @@ -380,7 +408,7 @@ void ClipperOffset::OffsetOpenJoined(Group& group, const Path64& path) Path64 reverse_path(path); std::reverse(reverse_path.begin(), reverse_path.end()); - //rebuild normals + //rebuild normals std::reverse(norms.begin(), norms.end()); norms.emplace_back(norms[0]); norms.erase(norms.begin()); @@ -601,10 +629,10 @@ void ClipperOffset::ExecuteInternal(double delta) if (!solution->size()) return; - bool paths_reversed = CheckReverseOrientation(); + bool paths_reversed = CheckReverseOrientation(); //clean up self-intersections ... Clipper64 c; - c.PreserveCollinear(false); + c.PreserveCollinear(preserve_collinear_); //the solution should retain the orientation of the input c.ReverseSolution(reverse_solution_ != paths_reversed); #ifdef USINGZ diff --git a/deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp index a4d83ad137..216ccbab19 100644 --- a/deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp +++ b/deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp @@ -1,8 +1,8 @@ /******************************************************************************* * Author : Angus Johnson * -* Date : 5 July 2024 * +* Date : 11 October 2025 * * Website : https://www.angusj.com * -* Copyright : Angus Johnson 2010-2024 * +* Copyright : Angus Johnson 2010-2025 * * Purpose : FAST rectangular clipping * * License : https://www.boost.org/LICENSE_1_0.txt * *******************************************************************************/ @@ -77,8 +77,8 @@ namespace Clipper2Lib { bool GetSegmentIntersection(const Point64& p1, const Point64& p2, const Point64& p3, const Point64& p4, Point64& ip) { - double res1 = CrossProduct(p1, p3, p4); - double res2 = CrossProduct(p2, p3, p4); + int res1 = CrossProductSign(p1, p3, p4); + int res2 = CrossProductSign(p2, p3, p4); if (res1 == 0) { ip = p1; @@ -97,8 +97,8 @@ namespace Clipper2Lib { } if ((res1 > 0) == (res2 > 0)) return false; - double res3 = CrossProduct(p3, p1, p2); - double res4 = CrossProduct(p4, p1, p2); + int res3 = CrossProductSign(p3, p1, p2); + int res4 = CrossProductSign(p4, p1, p2); if (res3 == 0) { ip = p3; @@ -116,7 +116,7 @@ namespace Clipper2Lib { if ((res3 > 0) == (res4 > 0)) return false; // segments must intersect to get here - return GetSegmentIntersectPt(p1, p2, p3, p4, ip); + return GetLineIntersectPt(p1, p2, p3, p4, ip); } inline bool GetIntersection(const Path64& rectPath, @@ -227,7 +227,7 @@ namespace Clipper2Lib { const Point64& prev_pt, const Point64& curr_pt, const Point64& rect_mp) { if (AreOpposites(prev, curr)) - return CrossProduct(prev_pt, rect_mp, curr_pt) < 0; + return CrossProductSign(prev_pt, rect_mp, curr_pt) < 0; else return HeadingClockwise(prev, curr); } diff --git a/deps_src/clipper2/Clipper2Lib/src/clipper.triangulation.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.triangulation.cpp new file mode 100644 index 0000000000..25e3acd158 --- /dev/null +++ b/deps_src/clipper2/Clipper2Lib/src/clipper.triangulation.cpp @@ -0,0 +1,1222 @@ +/******************************************************************************* +* Author : Angus Johnson * +* Date : 13 December 2025 * +* Release : BETA RELEASE * +* Website : https://www.angusj.com * +* Copyright : Angus Johnson 2010-2025 * +* Purpose : Constrained Delaunay Triangulation * +* License : https://www.boost.org/LICENSE_1_0.txt * +*******************************************************************************/ + +#include "clipper2/clipper.h" +#include "clipper2/clipper.triangulation.h" + +#ifdef USINGZ +namespace Clipper2Lib_Z { +#else +namespace Clipper2Lib { +#endif + + enum class EdgeKind { loose, ascend, descend }; // ascend & descend are 'fixed' edges + enum class IntersectKind { none, collinear, intersect }; + enum class EdgeContainsResult { neither, left, right }; + + //forward definitions + class Vertex2; + class Edge; + class Triangle; + + typedef std::vector VertexList; + typedef std::vector EdgeList; + + class Vertex2 { + public: + Point64 pt; + EdgeList edges; + bool innerLM = false; + Vertex2(const Point64& p64) : pt(p64) { edges.reserve(2); }; + }; + + class Edge { + public: + Vertex2* vL = nullptr; + Vertex2* vR = nullptr; + Vertex2* vB = nullptr; + Vertex2* vT = nullptr; + EdgeKind kind = EdgeKind::loose; + Triangle* triA = nullptr; + Triangle* triB = nullptr; + bool isActive = false; + Edge* nextE = nullptr; + Edge* prevE = nullptr; + }; + + class Triangle { + public: + Edge* edges[3]; + Triangle(Edge* e1, Edge* e2, Edge* e3) + { + edges[0] = e1; + edges[1] = e2; + edges[2] = e3; + } + }; + + ///////////////////////////////////////////////////////////////////////////// + // Delaunay class declaration + ///////////////////////////////////////////////////////////////////////////// + + class Delaunay { + private: + VertexList allVertices; + EdgeList allEdges; + std::vector allTriangles; + std::stack pendingDelaunayStack; + std::stack horzEdgeStack; + std::stack locMinStack; + bool useDelaunay = true; + Vertex2* lowermostVertex = nullptr; + Edge* firstActive = nullptr; + void AddPath(const Path64& path); + bool AddPaths(const Paths64& paths); + void CleanUp(); + bool FixupEdgeIntersects(); + void MergeDupOrCollinearVertices(); + void SplitEdge(Edge* longE, Edge* shortE); + bool RemoveIntersection(Edge* e1, Edge* e2); + Edge* CreateEdge(Vertex2* v1, Vertex2* v2, EdgeKind k); + Triangle* CreateTriangle(Edge* e1, Edge* e2, Edge* e3); + Edge* CreateInnerLocMinLooseEdge(Vertex2* vAbove); + Edge* HorizontalBetween(Vertex2* v1, Vertex2* v2); + void DoTriangulateLeft(Edge* edge, Vertex2* pivot, int64_t minY); + void DoTriangulateRight(Edge* edge, Vertex2* pivot, int64_t minY); + void AddEdgeToActives(Edge* edge); + void RemoveEdgeFromActives(Edge* edge); + void ForceLegal(Edge* edge); + public: + explicit Delaunay(bool delaunay = true) : useDelaunay(delaunay) {}; + ~Delaunay() { CleanUp(); }; + Paths64 Execute(const Paths64& paths, TriangulateResult& triResult); + }; + + ///////////////////////////////////////////////////////////////////////////// + // Miscellaneous functions + ///////////////////////////////////////////////////////////////////////////// + + static bool VertexListSort(const Vertex2* a, const Vertex2* b) + { + return (a->pt.y == b->pt.y) ? (a->pt.x < b->pt.x) : (a->pt.y > b->pt.y); + } + + static bool EdgeListSort(const Edge* a, const Edge* b) + { + return (a->vL->pt.x < b->vL->pt.x); + } + + static bool IsLooseEdge(const Edge& e) + { + return e.kind == EdgeKind::loose; + } + + static bool IsLeftEdge(const Edge& e) + { + // left edge (bound) of a fill region + // ie fills on the **right** side of the edge + // precondition - e is never a 'loose' edge + return e.kind == EdgeKind::ascend; + } + + static bool IsRightEdge(const Edge& e) + { + // right edge (bound) of a fill region + // but still fills on the **right** side of the edge + // precondition - e is never a 'loose' edge + return e.kind == EdgeKind::descend; + } + + static bool IsHorizontal(const Edge& e) + { + return e.vB->pt.y == e.vT->pt.y; + } + + static bool LeftTurning(const Point64& p1, const Point64& p2, const Point64& p3) + { + return CrossProductSign(p1, p2, p3) < 0; + } + + static bool RightTurning(const Point64& p1, const Point64& p2, const Point64& p3) + { + return CrossProductSign(p1, p2, p3) > 0; + } + + static bool EdgeCompleted(Edge* edge) + { + if (!edge->triA) return false; + if (edge->triB) return true; + return edge->kind != EdgeKind::loose; + } + + static EdgeContainsResult EdgeContains(const Edge* edge, const Vertex2* v) + { + if (edge->vL == v) return EdgeContainsResult::left; + else if (edge->vR == v) return EdgeContainsResult::right; + else return EdgeContainsResult::neither; + } + + static double GetAngle(const Point64& a, const Point64& b, const Point64& c) + { + //https://stackoverflow.com/a/3487062/359538 + double abx = static_cast(b.x - a.x); + double aby = static_cast(b.y - a.y); + double bcx = static_cast(b.x - c.x); + double bcy = static_cast(b.y - c.y); + double dp = (abx * bcx + aby * bcy); + double cp = (abx * bcy - aby * bcx); + return std::atan2(cp, dp); //range between -Pi and Pi + } + + static double GetLocMinAngle(Vertex2* v) + { + // todo - recheck the result's sign compared to left vs right turning + // (currently assumes left turning => positive values) + // precondition - this function is called before processing locMin. + //Assert(v->edges.size() == 2); + int asc, des; + if (v->edges[0]->kind == EdgeKind::ascend) + { + asc = 0; + des = 1; + } + else + { + des = 0; + asc = 1; + } + // winding direction - descending to ascending + return GetAngle(v->edges[des]->vT->pt, v->pt, v->edges[asc]->vT->pt); + } + + static void RemoveEdgeFromVertex(Vertex2* vert, Edge* edge) + { + auto it = std::find(vert->edges.begin(), vert->edges.end(), edge); + if (it == vert->edges.end()) throw "oops!"; + vert->edges.erase(it); + } + + static bool FindLocMinIdx(const Path64& path, size_t len, size_t& idx) + { + if (len < 3) return false; + size_t i0 = idx, n = (idx + 1) % len; + while (path[n].y <= path[idx].y) + { + idx = n; n = (n + 1) % len; + if (idx == i0) return false; // fails if the path is completely horizontal + } + while (path[n].y >= path[idx].y) + { + idx = n; n = (n + 1) % len; + } + return true; + } + + static size_t Prev(size_t& idx, size_t len) + { + if (idx == 0) return len - 1; else return idx - 1; + } + + static size_t Next(size_t& idx, size_t len) + { + return (idx + 1) % len; + } + + static Edge* FindLinkingEdge(const Vertex2* vert1, const Vertex2* vert2, bool preferAscending) + { + Edge* res = nullptr; + for (auto e : vert1->edges) + { + if (e->vL == vert2 || e->vR == vert2) + { + if (e->kind == EdgeKind::loose || + ((e->kind == EdgeKind::ascend) == preferAscending)) return e; + res = e; + } + } + return res; + } + + static Path64 PathFromTriangle(Triangle tri) + { + Path64 res; + res.reserve(3); + res.push_back(tri.edges[0]->vL->pt); + res.push_back(tri.edges[0]->vR->pt); + const Edge& e = *tri.edges[1]; + if (e.vL->pt == res[0] || e.vL->pt == res[1]) + res.push_back(e.vR->pt); + else + res.push_back(e.vL->pt); + return res; + } + + static double InCircleTest(const Point64& ptA, const Point64& ptB, + const Point64& ptC, const Point64& ptD) + { + // Return the determinant value of 3 x 3 matrix ... + // | ax-dx ay-dy Sqr(ax-dx)+Sqr(ay-dy) | + // | bx-dx by-dy Sqr(bx-dx)+Sqr(by-dy) | + // | cx-dx cy-dy Sqr(cx-dx)+Sqr(cy-dy) | + + // The *sign* of the return value is determined by + // the orientation (CW vs CCW) of ptA, ptB & ptC. + + // precondition - ptA, ptB & ptC make a *non-empty* triangle + double m00 = static_cast(ptA.x - ptD.x); + double m01 = static_cast(ptA.y - ptD.y); + double m02 = (Sqr(m00) + Sqr(m01)); + double m10 = static_cast(ptB.x - ptD.x); + double m11 = static_cast(ptB.y - ptD.y); + double m12 = (Sqr(m10) + Sqr(m11)); + double m20 = static_cast(ptC.x - ptD.x); + double m21 = static_cast(ptC.y - ptD.y); + double m22 = (Sqr(m20) + Sqr(m21)); + return m00 * (m11 * m22 - m21 * m12) - + m10 * (m01 * m22 - m21 * m02) + + m20 * (m01 * m12 - m11 * m02); + } + + static double ShortestDistFromSegment(const Point64& pt, const Point64& segPt1, const Point64& segPt2) + { + // precondition: segPt1 <> segPt2 + double dx = static_cast(segPt2.x - segPt1.x); + double dy = static_cast(segPt2.y - segPt1.y); + //Assert((dx < > 0) or (dy < > 0)); // ie segPt1 <> segPt2 + + double ax = static_cast(pt.x - segPt1.x); + double ay = static_cast(pt.y - segPt1.y); + //q = (ax * dx + ay * dy) / (dx * dx + dy * dy); + double qNum = ax * dx + ay * dy; + if (qNum < 0) // pt is closest to seq1 + return DistanceSqr(pt, segPt1); + else if (qNum > (Sqr(dx) + Sqr(dy))) // pt is closest to seq2 + return DistanceSqr(pt, segPt2); + else + return Sqr(ax * dy - dx * ay) / (dx * dx + dy * dy); + } + + static IntersectKind SegsIntersect(const Point64 s1a, const Point64 s1b, + const Point64 s2a, const Point64 s2b) + { + double dy1 = static_cast(s1b.y - s1a.y); + double dx1 = static_cast(s1b.x - s1a.x); + double dy2 = static_cast(s2b.y - s2a.y); + double dx2 = static_cast(s2b.x - s2a.x); + double cp = dy1 * dx2 - dy2 * dx1; + if (cp == 0) return IntersectKind::collinear; + + double t = (static_cast(s1a.x - s2a.x) * dy2 - + static_cast(s1a.y - s2a.y) * dx2); + //ignore segments that 'intersect' at an end-point + if (t == 0) return IntersectKind::none; + if (t > 0) + { + if (cp < 0 || t >= cp) return IntersectKind::none; + } + else + { + if (cp > 0 || t <= cp) return IntersectKind::none; + } + + // so far, the *segment* 's1' intersects the *line* through 's2', + // but now make sure it also intersects the *segment* 's2' + t = ((s1a.x - s2a.x) * dy1 - (s1a.y - s2a.y) * dx1); + if (t == 0) return IntersectKind::none; + if (t > 0) + { + if (cp > 0 && t < cp) return IntersectKind::intersect; + } + else + { + if (cp < 0 && t > cp) return IntersectKind::intersect; + } + return IntersectKind::none; + } + + ///////////////////////////////////////////////////////////////////////////// + // Delaunay class definitions + ///////////////////////////////////////////////////////////////////////////// + + void Delaunay::CleanUp() + { + for (auto v : allVertices) delete v; + allVertices.resize(0); + for (auto e : allEdges) delete e; + allEdges.resize(0); + for (auto t : allTriangles) delete t; + allTriangles.resize(0); + + firstActive = nullptr; + lowermostVertex = nullptr; + } + + void Delaunay::ForceLegal(Edge* edge) + { + // don't try to make empty triangles legal + if (!edge->triA || !edge->triB) return; + + // vertA will be assigned the vertex in edge's triangleA + // that is NOT an end vertex of edge + // Likewise, vertB will be assigned the vertex in edge's + // triangleB that is NOT an end vertex of edge + // If edge is rotated, vertA & vertB will become its end vertices. + Vertex2* vertA = nullptr; + Vertex2* vertB = nullptr; + + // Excluding 'edge', edgesA will contain two edges (one from + // triangleA and one from triangleB) that touch edge.vL. + // And edgesB will contain the two edges that touch edge.vR. + + Edge* edgesA[3] = { nullptr, nullptr, nullptr }; + Edge* edgesB[3] = { nullptr, nullptr, nullptr }; + for (int i = 0; i < 3; ++i) + { + if (edge->triA->edges[i] == edge) continue; + switch (EdgeContains(edge->triA->edges[i], edge->vL)) + { + case EdgeContainsResult::left: + edgesA[1] = edge->triA->edges[i]; + vertA = edge->triA->edges[i]->vR; + break; + case EdgeContainsResult::right: + edgesA[1] = edge->triA->edges[i]; + vertA = edge->triA->edges[i]->vL; + break; + default: + edgesB[1] = edge->triA->edges[i]; + } + } + + for (int i = 0; i < 3; ++i) + { + if (edge->triB->edges[i] == edge) continue; + switch (EdgeContains(edge->triB->edges[i], edge->vL)) + { + case EdgeContainsResult::left: + edgesA[2] = edge->triB->edges[i]; + vertB = edge->triB->edges[i]->vR; + break; + case EdgeContainsResult::right: + edgesA[2] = edge->triB->edges[i]; + vertB = edge->triB->edges[i]->vL; + break; + default: + edgesB[2] = edge->triB->edges[i]; + } + } + + // InCircleTest reqires edge.triangleA to be a valid triangle + // if IsEmptyTriangle(edge.triangleA) then Exit; // slower + if (CrossProductSign(vertA->pt, edge->vL->pt, edge->vR->pt) == 0) return; + + // ictResult - result sign is dependant on triangleA's orientation + double ictResult = InCircleTest(vertA->pt, edge->vL->pt, edge->vR->pt, vertB->pt); + if (ictResult == 0 || // if on or out of circle then exit + (RightTurning(vertA->pt, edge->vL->pt, edge->vR->pt) == (ictResult < 0))) return; + + // TRIANGLES HERE ARE **NOT** DELAUNAY COMPLIANT, SO MAKE THEM SO. + + // NOTE: ONCE WE BEGIN DELAUNAY COMPLIANCE, vL & vR WILL + // NO LONGER REPRESENT LEFT AND RIGHT VERTEX ORIENTATION. + // THIS IS MINOR PERFORMANCE EFFICIENCY IS SAFE AS LONG AS + // THE TRIANGULATE() METHOD IS CALLED ONCE ONLY ON A GIVEN + // SET OF PATHS + + edge->vL = vertA; + edge->vR = vertB; + + edge->triA->edges[0] = edge; + for (int i = 1; i < 3; ++i) + { + edge->triA->edges[i] = edgesA[i]; + if (!edgesA[i]) throw "oops"; // stops compiler warnings + if (IsLooseEdge(*edgesA[i])) + pendingDelaunayStack.push(edgesA[i]); + // since each edge has its own triangleA and triangleB, we have to be careful + // to update the correct one ... + if (edgesA[i]->triA == edge->triA || edgesA[i]->triB == edge->triA) continue; + + if (edgesA[i]->triA == edge->triB) + edgesA[i]->triA = edge->triA; + else if (edgesA[i]->triB == edge->triB) + edgesA[i]->triB = edge->triA; + else throw "oops"; + } + + edge->triB->edges[0] = edge; + for (int i = 1; i < 3; ++i) + { + edge->triB->edges[i] = edgesB[i]; + if (!edgesB[i]) throw "oops"; // stops compiler warnings + if (IsLooseEdge(*edgesB[i])) + pendingDelaunayStack.push(edgesB[i]); + // since each edge has its own triangleA and triangleB, we have to be careful + // to update the correct one ... + if (edgesB[i]->triA == edge->triB || edgesB[i]->triB == edge->triB) continue; + + if (edgesB[i]->triA == edge->triA) + edgesB[i]->triA = edge->triB; + else if (edgesB[i]->triB == edge->triA) + edgesB[i]->triB = edge->triB; + else throw "oops"; + } + + } + + Edge* Delaunay::CreateEdge(Vertex2* v1, Vertex2* v2, EdgeKind k) + { + Edge* res = allEdges.emplace_back(new Edge()); + if (v1->pt.y == v2->pt.y) + { + res->vB = v1; res->vT = v2; + } + else if (v1->pt.y < v2->pt.y) + { + res->vB = v2; res->vT = v1; + } + else + { + res->vB = v1; res->vT = v2; + } + + if (v1->pt.x <= v2->pt.x) + { + res->vL = v1; res->vR = v2; + } + else + { + res->vL = v2; res->vR = v1; + } + res->kind = k; + v1->edges.push_back(res); + v2->edges.push_back(res); + + if (k == EdgeKind::loose) + { + pendingDelaunayStack.push(res); + AddEdgeToActives(res); + } + return res; + } + + Triangle* Delaunay::CreateTriangle(Edge* e1, Edge* e2, Edge* e3) + { + Triangle* res = allTriangles.emplace_back(new Triangle(e1, e2, e3)); + // nb: only expire loose edges when both sides of these edges have triangles. + for (int i = 0; i < 3; ++i) + if (res->edges[i]->triA) + { + res->edges[i]->triB = res; + // this is the edge's second triangle hence no longer active + RemoveEdgeFromActives(res->edges[i]); + } + else + { + res->edges[i]->triA = res; + // this is the edge's first triangle, so only remove + // this edge from actives if it's a fixed edge. + if (!IsLooseEdge(*res->edges[i])) + RemoveEdgeFromActives(res->edges[i]); + } + return res; + } + + bool Delaunay::RemoveIntersection(Edge* e1, Edge* e2) + { + // find which vertex is closest to the other segment + // (ie not the vertex closest to the intersection point) ... + + Vertex2* v = e1->vL; + Edge* tmpE = e2; + double d = ShortestDistFromSegment(e1->vL->pt, e2->vL->pt, e2->vR->pt); + double d2 = ShortestDistFromSegment(e1->vR->pt, e2->vL->pt, e2->vR->pt); + if (d2 < d) { d = d2; v = e1->vR; } + d2 = ShortestDistFromSegment(e2->vL->pt, e1->vL->pt, e1->vR->pt); + if (d2 < d) { d = d2; tmpE = e1; v = e2->vL; } + d2 = ShortestDistFromSegment(e2->vR->pt, e1->vL->pt, e1->vR->pt); + if (d2 < d) { d = d2; tmpE = e1; v = e2->vR; } + if (d > 1.000) + return false; // Oops - this is not just a simple 'rounding' intersection + + // split 'tmpE' into 2 edges at 'v' + Vertex2* v2 = tmpE->vT; + RemoveEdgeFromVertex(v2, tmpE); + // replace v2 in tmpE with v + if (tmpE->vL == v2) tmpE->vL = v; + else tmpE->vR = v; + tmpE->vT = v; + v->edges.push_back(tmpE); + v->innerLM = false; // #47 + // left turning is angle positive + if (tmpE->vB->innerLM && GetLocMinAngle(tmpE->vB) <= 0) + tmpE->vB->innerLM = false; // #44, 52 + // finally create a new edge between v and v2 ... + CreateEdge(v, v2, tmpE->kind); + return true; + } + + bool Delaunay::FixupEdgeIntersects() + { + // precondition - edgeList must be sorted - ascending on edge.vL.pt.x + + for (size_t i1 = 0; i1 < allEdges.size(); ++i1) + { + Edge* e1 = allEdges[i1]; + // nb: we can safely ignore edges newly created inside this for loop + for (size_t i2 = i1 + 1; i2 < allEdges.size(); ++i2) + { + Edge* e2 = allEdges[i2]; + if (e2->vL->pt.x >= e1->vR->pt.x) + break; // all 'e' from now on are too far right + + // 'e2' is inside e1's horizontal region. If 'e2' is also inside + // e1's vertical region, only then check for an intersection ... + if (e2->vT->pt.y < e1->vB->pt.y && e2->vB->pt.y > e1->vT->pt.y && + (SegsIntersect(e2->vL->pt, e2->vR->pt, + e1->vL->pt, e1->vR->pt) == IntersectKind::intersect)) + { + if (!RemoveIntersection(e2, e1)) + return false; // oops!! + } + // nb: collinear edges are managed in MergeDupOrCollinearVertices below + } + } + return true; + } + + void Delaunay::SplitEdge(Edge* longE, Edge* shortE) + { + auto oldT = longE->vT, newT = shortE->vT; + // remove longEdge from longEdge.vT.edges + RemoveEdgeFromVertex(oldT, longE); + // shorten longEdge + longE->vT = newT; + if (longE->vL == oldT) longE->vL = newT; + else longE->vR = newT; + // add shortened longEdge to newT.edges + newT->edges.push_back(longE); + // and create a new edge betweem newV, oldT + CreateEdge(newT, oldT, longE->kind); + } + + void Delaunay::MergeDupOrCollinearVertices() + { + // note: this procedure may add new edges and change the + // number of edges connected with a given vertex, but it + // won't add or delete vertices (so it's safe to use iterators) + auto vIter1 = allVertices.begin(); + for (auto vIter2 = allVertices.begin() + 1; vIter2 != allVertices.end(); ++vIter2) + { + if ((*vIter1)->pt != (*vIter2)->pt) + { + vIter1 = vIter2; + continue; + } + + // merge v1 & v2 + Vertex2* v1 = *vIter1, * v2 = *vIter2; + if (!v1->innerLM || !v2->innerLM) + v1->innerLM = false; + + // in all of v2's edges, replace links to v2 with links to v1 + for (auto e : v2->edges) + { + if (e->vB == v2) e->vB = v1; + else e->vT = v1; + if (e->vL == v2) e->vL = v1; + else e->vR = v1; + } + // move all of v2's edges to v1 + std::copy(v2->edges.begin(), v2->edges.end(), back_inserter(v1->edges)); + v2->edges.resize(0); + + // excluding horizontals, if pv.edges contains two edges + // that are *collinear* and share the same bottom coords + // but have different lengths, split the longer edge at + // the top of the shorter edge ... + for (auto itE = v1->edges.begin(); itE != v1->edges.end(); ++itE) + { + if (IsHorizontal(*(*itE)) || (*itE)->vB != v1) continue; + for (auto itE2 = itE + 1; itE2 != v1->edges.end(); ++itE2) + { + auto e1 = *itE, e2 = *itE2; + if (e2->vB != v1 || e1->vT->pt.y == e2->vT->pt.y || + (CrossProductSign(e1->vT->pt, v1->pt, e2->vT->pt) != 0)) continue; + // we have parallel edges, both heading up from v1.pt. + // split the longer edge at the top of the shorter edge. + if (e1->vT->pt.y < e2->vT->pt.y) SplitEdge(e1, e2); + else SplitEdge(e2, e1); + break; // because only two edges can be collinear + } + } + } + } + + Edge* Delaunay::CreateInnerLocMinLooseEdge(Vertex2* vAbove) + { + if (!firstActive) return nullptr; // oops!! + + int64_t xAbove = vAbove->pt.x; + int64_t yAbove = vAbove->pt.y; + + // find the closest 'active' edge with a vertex that's not above vAbove + Edge* e = firstActive, *eBelow = nullptr; + double bestD = -1.0; + while (e) + { + if (e->vL->pt.x <= xAbove && e->vR->pt.x >= xAbove && + e->vB->pt.y >= yAbove && e->vB != vAbove && e->vT != vAbove && + !LeftTurning(e->vL->pt, vAbove->pt, e->vR->pt)) + { + double d = ShortestDistFromSegment(vAbove->pt, e->vL->pt, e->vR->pt); + if (!eBelow || d < bestD) // compare e with eBelow + { + eBelow = e; + bestD = d; + } + } + e = e->nextE; + } + if (!eBelow) return nullptr; // oops!! + + // get the best vertex from 'eBelow' + Vertex2* vBest = (eBelow->vT->pt.y <= yAbove) ? eBelow->vB : eBelow->vT; + int64_t xBest = vBest->pt.x; + int64_t yBest = vBest->pt.y; + + // make sure no edges intersect 'vAbove' and 'vBest' ... + // todo: fActives is currently *unsorted* but consider making it + // a tree structure based on each edge's left and right bounds + e = firstActive; + if (xBest < xAbove) + { + while (e) + { + if (e->vR->pt.x > xBest && e->vL->pt.x < xAbove && + e->vB->pt.y > yAbove && e->vT->pt.y < yBest && + (SegsIntersect(e->vB->pt, e->vT->pt, + vBest->pt, vAbove->pt) == IntersectKind::intersect)) + { + vBest = (e->vT->pt.y > yAbove) ? e->vT : e->vB; + xBest = vBest->pt.x; + yBest = vBest->pt.y; + } + e = e->nextE; + } + } + else + { + while (e) + { + if (e->vR->pt.x < xBest && e->vL->pt.x > xAbove && + e->vB->pt.y > yAbove && e->vT->pt.y < yBest && + (SegsIntersect(e->vB->pt, e->vT->pt, + vBest->pt, vAbove->pt) == IntersectKind::intersect)) + { + vBest = e->vT->pt.y > yAbove ? e->vT : e->vB; + xBest = vBest->pt.x; + yBest = vBest->pt.y; + } + e = e->nextE; + } + } + return CreateEdge(vBest, vAbove, EdgeKind::loose); + } + + Edge* Delaunay::HorizontalBetween(Vertex2* v1, Vertex2* v2) + { + int64_t y = v1->pt.y, l, r; + if (v1->pt.x > v2->pt.x) + { + l = v2->pt.x; + r = v1->pt.x; + } + else + { + l = v1->pt.x; + r = v2->pt.x; + } + + Edge* res = firstActive; + while (res) + { + if (res->vL->pt.y == y && res->vR->pt.y == y && + res->vL->pt.x >= l && res->vR->pt.x <= r && + (res->vL->pt.x != l || res->vL->pt.x != r)) break; + res = res->nextE; + } + return res; + } + + void Delaunay::DoTriangulateLeft(Edge* edge, Vertex2* pivot, int64_t minY) + { + // precondition - pivot must be one end of edge (Usually .vB) + //Assert(!EdgeCompleted(edge)); + Vertex2* vAlt = nullptr; + Edge* eAlt = nullptr; + Vertex2* v = (edge->vB == pivot) ? edge->vT : edge->vB; + + for (auto e : pivot->edges) + { + if (e == edge || !e->isActive) continue; + Vertex2* vX = e->vT == pivot ? e->vB : e->vT; + if (vX == v) continue; + + int cps = CrossProductSign(v->pt, pivot->pt, vX->pt); + if (cps == 0) //collinear paths + { + // if pivot is between v and vX then continue; + // nb: this is important for both horiz and non-horiz collinear + if ((v->pt.x > pivot->pt.x) == (pivot->pt.x > vX->pt.x)) continue; + } + // else if right-turning or not the best edge, then continue + else if (cps > 0 || (vAlt && !LeftTurning(vX->pt, pivot->pt, vAlt->pt))) + continue; + vAlt = vX; + eAlt = e; + } + + if (!vAlt || vAlt->pt.y < minY) return; + + // Don't triangulate **across** fixed edges + if (vAlt->pt.y < pivot->pt.y) + { + if (IsLeftEdge(*eAlt)) return; + } + else if (vAlt->pt.y > pivot->pt.y) + { + if (IsRightEdge(*eAlt)) return; + } + + Edge* eX = FindLinkingEdge(vAlt, v, (vAlt->pt.y < v->pt.y)); + if (!eX) + { + // be very careful creating loose horizontals at minY + if (vAlt->pt.y == v->pt.y && v->pt.y == minY && + HorizontalBetween(vAlt, v)) return; + eX = CreateEdge(vAlt, v, EdgeKind::loose); + } + + CreateTriangle(edge, eAlt, eX); + if (!EdgeCompleted(eX)) + DoTriangulateLeft(eX, vAlt, minY); + + } + + void Delaunay::DoTriangulateRight(Edge* edge, Vertex2* pivot, int64_t minY) + { + // precondition - pivot must be one end of edge (Usually .vB) + //Assert(!EdgeCompleted(edge)); + Vertex2* vAlt = nullptr; + Edge* eAlt = nullptr; + Vertex2* v = (edge->vB == pivot) ? edge->vT : edge->vB; + + for (auto e : pivot->edges) + { + if (e == edge || !e->isActive) continue; + Vertex2* vX = e->vT == pivot ? e->vB : e->vT; + if (vX == v) continue; + + int cps = CrossProductSign(v->pt, pivot->pt, vX->pt); + if (cps == 0) //collinear paths + { + // if pivot is between v and vX then continue; + // nb: this is important for both horiz and non-horiz collinear + if ((v->pt.x > pivot->pt.x) == (pivot->pt.x > vX->pt.x)) continue; + } + // else if right-turning or not the best edge, then continue + else if (cps < 0 || (vAlt && !RightTurning(vX->pt, pivot->pt, vAlt->pt))) + continue; + vAlt = vX; + eAlt = e; + } + + if (!vAlt || vAlt->pt.y < minY) return; + + // Don't triangulate **across** fixed edges + if (vAlt->pt.y < pivot->pt.y) + { + if (IsRightEdge(*eAlt)) return; + } + else if (vAlt->pt.y > pivot->pt.y) + { + if (IsLeftEdge(*eAlt)) return; + } + + Edge* eX = FindLinkingEdge(vAlt, v, (vAlt->pt.y > v->pt.y)); + if (!eX) + { + // be very careful creating loose horizontals at minY + if (vAlt->pt.y == v->pt.y && v->pt.y == minY && + HorizontalBetween(vAlt, v)) return; + eX = CreateEdge(vAlt, v, EdgeKind::loose); + } + + CreateTriangle(edge, eX, eAlt); + if (!EdgeCompleted(eX)) + DoTriangulateRight(eX, vAlt, minY); + + + } + + void Delaunay::AddEdgeToActives(Edge* edge) + { + // nb: on occassions this method can get called twice for a given edge + // This is because, in the Triangulate() method where vertex 'edges' + // arrays are being parsed, edges can can be removed from the array + // which changes the index of following edges. + if (edge->isActive) return; + + edge->prevE = nullptr; + edge->nextE = firstActive; + edge->isActive = true; + if (firstActive) + firstActive->prevE = edge; + firstActive = edge; + } + + + void Delaunay::RemoveEdgeFromActives(Edge* edge) + { + // first, remove the edge from its vertices + RemoveEdgeFromVertex(edge->vB, edge); + RemoveEdgeFromVertex(edge->vT, edge); + + // now remove the edge from double linked list (AEL) + Edge* prev = edge->prevE; + Edge* next = edge->nextE; + if (next) next->prevE = prev; + if (prev) prev->nextE = next; + edge->isActive = false; + if (firstActive == edge) firstActive = next; + } + + Paths64 Delaunay::Execute(const Paths64& paths, TriangulateResult& triResult) + { + if (!AddPaths(paths)) + { + triResult = TriangulateResult::no_polygons; + return Paths64(); // oops! + } + + // if necessary fix path orientation because the algorithm + // expects clockwise outer paths and counter-clockwise inner paths + if (lowermostVertex->innerLM) + { + // the orientation of added paths must be wrong, so + // 1. reverse innerLM flags ... + Vertex2* lm; + while (!locMinStack.empty()) + { + lm = locMinStack.top(); + lm->innerLM = !lm->innerLM; + locMinStack.pop(); + } + // 2. swap edge kinds + for (Edge* e : allEdges) + if (e->kind == EdgeKind::ascend) + e->kind = EdgeKind::descend; + else + e->kind = EdgeKind::ascend; + } + else + { + // path orientation is fine so ... + while (!locMinStack.empty()) + locMinStack.pop(); + } + + std::sort(allEdges.begin(), allEdges.end(), EdgeListSort); + if (!FixupEdgeIntersects()) + { + CleanUp(); + triResult = TriangulateResult::paths_intersect; + return Paths64(); // oops! + } + + std::sort(allVertices.begin(), allVertices.end(), VertexListSort); + MergeDupOrCollinearVertices(); + + int64_t currY = allVertices[0]->pt.y; + for (auto vIt = allVertices.begin(); vIt != allVertices.end(); ++vIt) + { + Vertex2* v = *vIt; + if (v->edges.empty()) continue; + if (v->pt.y != currY) + { + // JOIN AN INNER LOCMIN WITH A SUITABLE EDGE BELOW + while (!locMinStack.empty()) + { + Vertex2* lm = locMinStack.top(); + locMinStack.pop(); + Edge* e = CreateInnerLocMinLooseEdge(lm); + if (!e) + { + CleanUp(); + triResult = TriangulateResult::fail; + return Paths64(); // oops! + } + + if (IsHorizontal(*e)) + { + if (e->vL == e->vB) + DoTriangulateLeft(e, e->vB, currY); else + DoTriangulateRight(e, e->vB, currY); + } + else + { + DoTriangulateLeft(e, e->vB, currY); + if (!EdgeCompleted(e)) + DoTriangulateRight(e, e->vB, currY); + } + + // and because adding locMin edges to Actives was delayed .. + AddEdgeToActives(lm->edges[0]); + AddEdgeToActives(lm->edges[1]); + } + + while (!horzEdgeStack.empty()) + { + Edge* e = horzEdgeStack.top(); + horzEdgeStack.pop(); + if (EdgeCompleted(e)) continue; + if (e->vB == e->vL) // #45 + { + if (IsLeftEdge(*e)) + DoTriangulateLeft(e, e->vB, currY); + } + else + if (IsRightEdge(*e)) + DoTriangulateRight(e, e->vB, currY); + } + currY = v->pt.y; + } + + for (int i = static_cast(v->edges.size()) - 1; i >= 0; --i) + { + // the following line may look superfluous, but within this loop + // v->edges may be altered with additions and or deletions. + // So this line *is* necessary (and why we can't use an iterator). + // Also, we need to use a *descending* index which is safe because + // any additions will be loose edges which are ignored here. + if (i >= static_cast(v->edges.size())) continue; + + Edge* e = v->edges[i]; + if (EdgeCompleted(e) || IsLooseEdge(*e)) continue; + + if (v == e->vB) + { + if (IsHorizontal(*e)) + horzEdgeStack.push(e); + // delay adding locMin edges to actives + if (!v->innerLM) + AddEdgeToActives(e); + } + else + { + if (IsHorizontal(*e)) + horzEdgeStack.push(e); + else if (IsLeftEdge(*e)) + DoTriangulateLeft(e, e->vB, v->pt.y); + else + DoTriangulateRight(e, e->vB, v->pt.y); + } + } // for v->edges loop + + if (v->innerLM) locMinStack.push(v); + + } // for allVertices loop + + + while (!horzEdgeStack.empty()) + { + Edge* e = horzEdgeStack.top(); + horzEdgeStack.pop(); + if (!EdgeCompleted(e) && e->vB == e->vL) + DoTriangulateLeft(e, e->vB, currY); + } + + if (useDelaunay) + { + // Convert triangles to Delaunay conforming + while (!pendingDelaunayStack.empty()) + { + Edge* e = pendingDelaunayStack.top(); + pendingDelaunayStack.pop(); + ForceLegal(e); + } + } + + Paths64 res; + res.reserve(allTriangles.size()); + for (auto tri : allTriangles) + { + Path64 p = PathFromTriangle(*tri); + int cps = CrossProductSign(p[0], p[1], p[2]); + if (cps == 0) continue; // skip any empty triangles + if (cps < 0) // ccw + std::reverse(p.begin(), p.end()); + res.push_back(p); + } + + CleanUp(); + triResult = TriangulateResult::success; + return res; + } + + static double DistSqr(const Point64& pt1, const Point64& pt2) + { + return Sqr(pt1.x - pt2.x) + Sqr(pt1.y - pt2.y); + } + + void Delaunay::AddPath(const Path64& path) + { + size_t len = path.size(), i0 = 0, iPrev, iNext; + // find the first locMin for the current path + if (!FindLocMinIdx(path, len, i0)) return; + iPrev = Prev(i0, len); + while (path[iPrev] == path[i0]) iPrev = Prev(iPrev, len); + iNext = Next(i0, len); + + // it is possible for a locMin here to simply be a + // collinear spike that should be ignored, so ... + size_t i = i0; + while (CrossProductSign(path[iPrev], path[i], path[iNext]) == 0) + { + FindLocMinIdx(path, len, i); + if (i == i0) return; // this is an entirely collinear path + iPrev = Prev(i, len); + while (path[iPrev] == path[i]) iPrev = Prev(iPrev, len); + iNext = Next(i, len); + } + + size_t vert_cnt = allVertices.size(); + + // we are now at the first legitimate locMin + Vertex2* v0 = allVertices.emplace_back(new Vertex2(path[i])); + + if (LeftTurning(path[iPrev], path[i], path[iNext])) + v0->innerLM = true; + Vertex2* vPrev = v0; + i = iNext; + + for (;;) + { + // vPrev is a locMin here + locMinStack.push(vPrev); + // ? update lowermostVertex ... + if (!lowermostVertex || + vPrev->pt.y > lowermostVertex->pt.y || + (vPrev->pt.y == lowermostVertex->pt.y && + vPrev->pt.x < lowermostVertex->pt.x)) + lowermostVertex = vPrev; + + iNext = Next(i, len); + if (CrossProductSign(vPrev->pt, path[i], path[iNext]) == 0) + { + i = iNext; + continue; + } + + // ascend up next bound to LocMax + while (path[i].y <= vPrev->pt.y) + { + Vertex2* v = allVertices.emplace_back(new Vertex2(path[i])); + CreateEdge(vPrev, v, EdgeKind::ascend); + vPrev = v; + i = iNext; + iNext = Next(i, len); + + while (CrossProductSign(vPrev->pt, path[i], path[iNext]) == 0) + { + i = iNext; + iNext = Next(i, len); + } + } + + // Now at a locMax, so descend to next locMin + Vertex2* vPrevPrev = vPrev; + while (i != i0 && path[i].y >= vPrev->pt.y) + { + Vertex2* v = allVertices.emplace_back(new Vertex2(path[i])); + CreateEdge(v, vPrev, EdgeKind::descend); + vPrevPrev = vPrev; + vPrev = v; + i = iNext; + iNext = Next(i, len); + + while (CrossProductSign(vPrev->pt, path[i], path[iNext]) == 0) + { + i = iNext; + iNext = Next(i, len); + } + } + + // now at the next locMin + if (i == i0) break; // break for(;;) loop + if (LeftTurning(vPrevPrev->pt, vPrev->pt, path[i])) + vPrev->innerLM = true; + } + CreateEdge(v0, vPrev, EdgeKind::descend); + + // finally, ignore this path if is not a polygon or too small + len = allVertices.size() - vert_cnt; + i = vert_cnt; + if (len < 3 || (len == 3 && // or just a very tiny triangle + ((DistSqr(allVertices[i]->pt, allVertices[i + 1]->pt) <= 1) || + (DistSqr(allVertices[i + 1]->pt, allVertices[i + 2]->pt) <= 1) || + (DistSqr(allVertices[i + 2]->pt, allVertices[i]->pt) <= 1)))) + { + for (size_t j = vert_cnt; j < allVertices.size(); ++j) + allVertices[j]->edges.clear(); // flag to ignore + } + } + + bool Delaunay::AddPaths(const Paths64& paths) + { + const auto total_vertex_count = + std::accumulate(paths.begin(), paths.end(), size_t(0), + [](const auto& a, const Path64& path) + {return a + path.size(); }); + if (total_vertex_count == 0) return false; + allVertices.reserve(allVertices.capacity() + total_vertex_count); + allEdges.reserve(allEdges.capacity() + total_vertex_count); + + for (const Path64& path : paths) + AddPath(path); + return (allVertices.size() > 2); + } + + TriangulateResult Triangulate(const Paths64& pp, Paths64& solution, bool useDelaunay) + { + TriangulateResult result; + Delaunay d(useDelaunay); + solution = d.Execute(pp, result); + return result; + } + + TriangulateResult Triangulate(const PathsD& pp, int decPlaces, PathsD& solution, bool useDelaunay) + { + int ec; + double scale; + TriangulateResult result; + if (decPlaces <= 0) scale = 1; + else if (decPlaces > 8) scale = std::pow(10, 8); + else scale = std::pow(10, decPlaces); + Paths64 pp64 = ScalePaths(pp, scale, ec); + + Delaunay d(useDelaunay); + Paths64 sol64 = d.Execute(pp64, result); + solution = ScalePaths(sol64, 1 / scale, ec); + return result; + } + +} // Clipper2Lib namespace diff --git a/deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp index f5c7c6f4fd..385bd37463 100644 --- a/deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp +++ b/deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp @@ -6,3 +6,4 @@ #include "clipper.engine.cpp" #include "clipper.offset.cpp" #include "clipper.rectclip.cpp" +#include "clipper.triangulation.cpp" diff --git a/deps_src/libnest2d/include/libnest2d/backends/libslic3r/geometries.hpp b/deps_src/libnest2d/include/libnest2d/backends/libslic3r/geometries.hpp index 63ed1c2779..381e4a7e90 100644 --- a/deps_src/libnest2d/include/libnest2d/backends/libslic3r/geometries.hpp +++ b/deps_src/libnest2d/include/libnest2d/backends/libslic3r/geometries.hpp @@ -132,14 +132,14 @@ template<> inline void offset(Slic3r::ExPolygon& sh, coord_t distance, const PolygonTag&) { #define DISABLE_BOOST_OFFSET - auto res = Slic3r::offset_ex(sh, distance, Slic3r::ClipperLib::jtSquare); + auto res = Slic3r::offset_ex(sh, distance, Slic3r::jtSquare); if (!res.empty()) sh = res.front(); } template<> inline void offset(Slic3r::Polygon& sh, coord_t distance, const PathTag&) { - auto res = Slic3r::offset(sh, distance, Slic3r::ClipperLib::jtSquare); + auto res = Slic3r::offset(sh, distance, Slic3r::jtSquare); if (!res.empty()) sh = res.front(); } diff --git a/docs/HLSD/polygon-clipping.md b/docs/HLSD/polygon-clipping.md new file mode 100644 index 0000000000..60bf97d515 --- /dev/null +++ b/docs/HLSD/polygon-clipping.md @@ -0,0 +1,131 @@ +# Polygon Clipping — High Level Design + +## Purpose and scope + +Almost every stage of slicing works on 2D regions: slices, perimeters, infill +areas, bridges, supports and brims are all produced by boolean operations and +offsets on polygons. libslic3r does this through two interfaces, both built on +the Clipper2 library vendored in `deps_src/clipper2`: + +- `ClipperUtils` (`src/libslic3r/ClipperUtils.hpp`) takes and returns Slic3r + geometry: `Polygon(s)`, `ExPolygon(s)`, `Polyline(s)`, `Lines` and + `Surfaces`. It provides unions, intersections, differences and xor, closed + and open offsets, morphological opening and closing, variable width offsets + and polyline clipping. +- `ClipperZUtils` (`src/libslic3r/ClipperZUtils.hpp`) clips paths whose + vertices carry a Z value, which callers use to tag vertices with a source + index or an extrusion width. + +No other code calls Clipper2. + +`ClipperUtils` declares its own `JoinType`, `EndType`, `PolyFillType` and +`ClipType` enums and maps them to Clipper2's. Every call builds its own +Clipper2 objects and shares no state, so slicing threads can clip +concurrently. + +Clipping is one of the largest costs of slicing, and nearly all of it goes +through `ClipperUtils`. The layer is therefore designed for throughput as much +as for predictable geometry. + +## Vendored Clipper2 + +`deps_src/clipper2` builds the static target `Clipper2`. It carries four +changes to the upstream sources that must be carried over when Clipper2 is +updated. The namespace switch sits at the top of every header and source, the +other three are marked with `Orca:` comments. + +| Change | Files | Why | +| --- | --- | --- | +| Z build in its own namespace | all headers and sources, `clipper2_z.cpp`, `clipper2_z.hpp` | The library is compiled a second time with `USINGZ` in namespace `Clipper2Lib_Z`, so the 2D and the Z variants link into one binary. | +| Engine nodes from tbbmalloc | `clipper.engine.h`, `clipper.engine.cpp` | Vertices, active edges, output points and records, local minima and `PolyTree` nodes are allocated one by one. `CLIPPER2_NODE_ALLOCATOR` routes them through `scalable_malloc`, because the default heap does not scale when all slicing threads clip at once. | +| Concave joins at the edge crossing | `clipper.offset.cpp` | For closed paths, a concave corner is joined at the crossing of the two offset edges when that point lies within half of both adjacent edges. The upstream 3-point loop makes inward offsets of dense curves very slow to union. | +| Rounded arc steps | `clipper.offset.cpp` | Round joins use the rounded number of steps, not the ceiling, which keeps the vertex count of round offsets that the rest of the code is tuned for. | + +## ClipperUtils semantics + +The callers of `ClipperUtils` rely on a fixed set of behaviours. Where +Clipper2 behaves differently by default, the wrapper adjusts it. + +### Booleans + +- The fill rule is non-zero unless the function takes a `PolyFillType`. One + rule applies to both subject and clip; Clipper2 has no per-operand rule. +- Collinear vertices are removed from the result. Clipper2 keeps them by + default, so every boolean sets `PreserveCollinear(false)`. +- Outer contours are CCW and holes are CW. No output contour touches + itself: where one would pass twice through a vertex, it is split there into + two contours. +- `ExPolygons` results are built from one `PolyTree64` pass. An island inside + a hole becomes an `ExPolygon` of its own. +- `ApplySafetyOffset::Yes` grows the clip polygons by `ClipperSafetyOffset` + before an intersection or a difference, so that edges shared by subject and + clip do not leave slivers. +- Open polylines are clipped with the non-zero rule and keep their direction. + +### Offsets + +- Before offsetting, input vertices closer than + `ClipperOffsetShortestEdgeFactor` × |delta| to the previously kept vertex + are dropped. This bounds the work on dense contours, and the error it + introduces is far below the offset distance. +- The miter limit is at least 2. For `jtRound`, a positive `miterLimit` + argument is the arc tolerance, capped at |delta| / 4, and 0.25 is used + otherwise. Other joins use the smaller of 0.25 and |delta| / 4 for round end + caps. +- A single `Polygon` keeps its orientation: a CCW polygon grows with a + positive delta, a CW polygon is a hole and shrinks. +- `Polygons` follow the same rule per path. When every CW path lies strictly + inside the bounding box of a CCW path, which is the usual case of contours + with their holes, all paths are offset in one Clipper2 group. Otherwise + each path is offset on its own and the results are united, with the + non-zero rule when growing and the positive rule when shrinking. +- `ExPolygons` and `Surfaces` are offset as one group after the contours are + oriented CCW and the holes CW, whatever their input orientation. +- Zero-area paths vanish under a negative offset instead of growing. +- Polyline offsets use the requested end type. Clipper2 already unites the + result, so no further union is done. + +### Coordinate range + +Clipper2 computes intersections and slopes in doubles, which hold integers +exactly only up to 2^53 (about 9e15 units, 9,000 km). Geometry passed to +`ClipperUtils` must stay well inside that range; near the int64 limit the +results shift by hundreds of units. This is why the arrange `InfiniteBed` is a +box of ±2^50 units around its centre rather than libnest2d's infinite box, +which reaches ±2.3e18. + +## ClipperZUtils + +`ZPoint` is a `Vec3crd`, and a `ZPath` is a vector of them. +`clip_zpaths()` runs one boolean with the non-zero rule on the Clipper2 Z +build. The subject may be open, the clip is closed, and the result lists the +closed paths before the open ones. + +The Z of each output vertex follows these rules: + +- An input vertex keeps its Z. +- An intersection that lies on an end point of one of the two crossing edges + takes that end point's Z, preferring the subject edge. +- Any other intersection gets its Z from the callback, which receives both + crossing edges, the subject edge first. + +Clipper2 calls the callback only when it creates an output vertex at an +intersection, not for every crossing it processes. A callback that records +intersections, like `ClipperZIntersectionVisitor`, therefore sees only those. + +The users are: + +| User | Z carries | +| --- | --- | +| `Algorithm::wave_seeds()` (region expansion) | source and boundary index; intersections get a negative index into the visitor's list of crossing pairs | +| `Algorithm::split_line()` | index of the source vertex; an intersection gets the negated index of its source edge, so the pieces can be put back in path order | +| `PerimeterGenerator` overhang and top-surface clipping of Arachne walls | extrusion width, interpolated along the edge at intersections | +| Tree support anchors in `SupportCommon` | index of the source contour, -1 at intersections | +| `extrusion_paths_append()` | extrusion width, turned into extrusion paths | + +## Testing + +`tests/libslic3r/test_clipper_utils.cpp` and `test_clipper_offset.cpp` cover +the wrapper's booleans, orientation and offset rules. The perimeter, support +and region expansion users are exercised by the slicing tests in +`tests/fff_print`. diff --git a/src/libslic3r/Algorithm/LineSplit.cpp b/src/libslic3r/Algorithm/LineSplit.cpp index 9e359b76ea..d91514dbf9 100644 --- a/src/libslic3r/Algorithm/LineSplit.cpp +++ b/src/libslic3r/Algorithm/LineSplit.cpp @@ -14,7 +14,7 @@ static std::atomic g_dbg_id = 0; #endif // Z for points from clip polygon -static constexpr auto CLIP_IDX = std::numeric_limits::max(); +static constexpr auto CLIP_IDX = std::numeric_limits::max(); static void cb_split_line(const ClipperZUtils::ZPoint& e1bot, const ClipperZUtils::ZPoint& e1top, @@ -91,14 +91,7 @@ SplittedLine do_split_line(const ClipperZUtils::ZPath& path, const ExPolygons& c clip_path.emplace_back(ClipperZUtils::to_zpath(hole.points, CLIP_IDX)); } - ClipperLib_Z::Clipper zclipper; - zclipper.PreserveCollinear(true); - zclipper.ZFillFunction(cb_split_line); - zclipper.AddPaths(clip_path, ClipperLib_Z::ptClip, true); - zclipper.AddPath(path, ClipperLib_Z::ptSubject, false); - ClipperLib_Z::PolyTree polytree; - zclipper.Execute(ClipperLib_Z::ctIntersection, polytree, ClipperLib_Z::pftNonZero, ClipperLib_Z::pftNonZero); - ClipperLib_Z::PolyTreeToPaths(std::move(polytree), intersections); + intersections = ClipperZUtils::clip_zpaths(ctIntersection, ClipperZUtils::ZPaths{ path }, true, clip_path, cb_split_line, true); } if (intersections.empty()) { return {}; diff --git a/src/libslic3r/Algorithm/LineSplit.hpp b/src/libslic3r/Algorithm/LineSplit.hpp index e12113fa6c..80f64e684c 100644 --- a/src/libslic3r/Algorithm/LineSplit.hpp +++ b/src/libslic3r/Algorithm/LineSplit.hpp @@ -50,7 +50,7 @@ SplittedLine split_line(const PathType& path, const ExPolygons& clip, bool close // Convert the input path into an open ZPath ClipperZUtils::ZPath p; p.reserve(path.size() + (closed ? 1 : 0)); - ClipperLib_Z::cInt z = 0; + coord_t z = 0; for (const auto& point : path) { p.emplace_back(point.x(), point.y(), z); z++; diff --git a/src/libslic3r/Algorithm/RegionExpansion.cpp b/src/libslic3r/Algorithm/RegionExpansion.cpp index 6a77c470e7..2cfb15ce6d 100644 --- a/src/libslic3r/Algorithm/RegionExpansion.cpp +++ b/src/libslic3r/Algorithm/RegionExpansion.cpp @@ -10,7 +10,7 @@ namespace Slic3r { namespace Algorithm { -// Calculating radius discretization according to ClipperLib offsetter code, see void ClipperOffset::DoOffset(double delta) +// Calculating radius discretization according to the Clipper offsetter code, see ClipperOffset::DoGroupOffset() inline double clipper_round_offset_error(double offset, double arc_tolerance) { static constexpr const double def_arc_tolerance = 0.25; @@ -61,7 +61,6 @@ RegionExpansionParameters RegionExpansionParameters::build( // Accuracy of the offsetter for wave propagation. out.arc_tolerance = scaled(0.1); - out.shortest_edge_length = out.initial_step * ClipperOffsetShortestEdgeFactor; // Maximum inflation of seed contours over the boundary. Used to trim boundary to speed up // clipping during wave propagation. Needs to be in sync with the offsetter accuracy. @@ -75,25 +74,20 @@ RegionExpansionParameters RegionExpansionParameters::build( // similar to expolygons_to_zpaths(), but each contour is expanded before converted to zpath. // The expanded contours are then opened (the first point is repeated at the end). -static ClipperLib_Z::Paths expolygons_to_zpaths_expanded_opened( +static ClipperZUtils::ZPaths expolygons_to_zpaths_expanded_opened( const ExPolygons &src, const float expansion, coord_t &base_idx) { - ClipperLib_Z::Paths out; + ClipperZUtils::ZPaths out; out.reserve(2 * std::accumulate(src.begin(), src.end(), size_t(0), [](const size_t acc, const ExPolygon &expoly) { return acc + expoly.num_contours(); })); - ClipperLib::ClipperOffset offsetter; - offsetter.ShortestEdgeLength = expansion * ClipperOffsetShortestEdgeFactor; - ClipperLib::Paths expansion_cache; for (const ExPolygon &expoly : src) { for (size_t icontour = 0; icontour < expoly.num_contours(); ++ icontour) { - // Execute reorients the contours so that the outer most contour has a positive area. Thus the output - // contours will be CCW oriented even though the input paths are CW oriented. - // Offset is applied after contour reorientation, thus the signum of the offset value is reversed. - offsetter.Clear(); - offsetter.AddPath(expoly.contour_or_hole(icontour).points, ClipperLib::jtSquare, ClipperLib::etClosedPolygon); - expansion_cache.clear(); - offsetter.Execute(expansion_cache, icontour == 0 ? expansion : -expansion); - append(out, ClipperZUtils::to_zpaths(expansion_cache, base_idx)); + // Orient CCW, then grow the contour and shrink the holes. The output contours are CCW. + Polygon contour = expoly.contour_or_hole(icontour); + if (! contour.is_counter_clockwise()) + contour.reverse(); + for (const Polygon &expanded : offset(contour, icontour == 0 ? expansion : -expansion, jtSquare)) + out.emplace_back(ClipperZUtils::to_zpath(expanded.points, base_idx)); } ++ base_idx; } @@ -104,21 +98,21 @@ static ClipperLib_Z::Paths expolygons_to_zpaths_expanded_opened( // Thus some pieces of the clipped polygons may now become split at the ends of the source polygons. // Those ends are sorted lexicographically in "splits". // Reconnect those split pieces. -static inline void merge_splits(ClipperLib_Z::Paths &paths, std::vector> &splits) +static inline void merge_splits(ClipperZUtils::ZPaths &paths, std::vector> &splits) { for (auto it_path = paths.begin(); it_path != paths.end(); ) { - ClipperLib_Z::Path &path = *it_path; + ClipperZUtils::ZPath &path = *it_path; assert(path.size() >= 2); bool merged = false; if (path.size() >= 2) { - const ClipperLib_Z::IntPoint &front = path.front(); - const ClipperLib_Z::IntPoint &back = path.back(); + const ClipperZUtils::ZPoint &front = path.front(); + const ClipperZUtils::ZPoint &back = path.back(); // The path before clipping was supposed to cross the clipping boundary or be fully out of it. // Thus the clipped contour is supposed to become open, with one exception: The anchor expands into a closed hole. if (front.x() != back.x() || front.y() != back.y()) { // Look up the ends in "splits", possibly join the contours. // "splits" maps into the other piece connected to the same end point. - auto find_end = [&splits](const ClipperLib_Z::IntPoint &pt) -> std::pair* { + auto find_end = [&splits](const ClipperZUtils::ZPoint &pt) -> std::pair* { auto it = std::lower_bound(splits.begin(), splits.end(), pt, [](const auto &l, const auto &r){ return ClipperZUtils::zpoint_lower(l.first, r); }); return it != splits.end() && it->first == pt ? &(*it) : nullptr; @@ -136,7 +130,7 @@ static inline void merge_splits(ClipperLib_Z::Paths &paths, std::vectorsecond = int(it_path - paths.begin()); } else { // Open end was found and matched with end->second - ClipperLib_Z::Path &other_path = paths[end->second]; + ClipperZUtils::ZPath &other_path = paths[end->second]; polylines_merge(other_path, other_path.front() == end->first, std::move(path), end_front); if (std::next(it_path) == paths.end()) { paths.pop_back(); @@ -212,36 +206,29 @@ std::vector wave_seeds( using Intersection = ClipperZUtils::ClipperZIntersectionVisitor::Intersection; using Intersections = ClipperZUtils::ClipperZIntersectionVisitor::Intersections; - ClipperLib_Z::Paths segments; - Intersections intersections; + ClipperZUtils::ZPaths segments; + Intersections intersections; - coord_t idx_boundary_begin = 1; - coord_t idx_boundary_end = idx_boundary_begin; - coord_t idx_src_end; + coord_t idx_boundary_begin = 1; + coord_t idx_boundary_end = idx_boundary_begin; + coord_t idx_src_end; { - ClipperLib_Z::Clipper zclipper; ClipperZUtils::ClipperZIntersectionVisitor visitor(intersections); - zclipper.ZFillFunction(visitor.clipper_callback()); // as closed contours - zclipper.AddPaths(ClipperZUtils::expolygons_to_zpaths(boundary, idx_boundary_end), ClipperLib_Z::ptClip, true); + ClipperZUtils::ZPaths zboundary = ClipperZUtils::expolygons_to_zpaths(boundary, idx_boundary_end); // as open contours - std::vector> zsrc_splits; - { - idx_src_end = idx_boundary_end; - ClipperLib_Z::Paths zsrc = expolygons_to_zpaths_expanded_opened(src, tiny_expansion, idx_src_end); - zclipper.AddPaths(zsrc, ClipperLib_Z::ptSubject, false); - zsrc_splits.reserve(zsrc.size()); - for (const ClipperLib_Z::Path &path : zsrc) { - assert(path.size() >= 2); - assert(path.front() == path.back()); - zsrc_splits.emplace_back(path.front(), -1); - } - std::sort(zsrc_splits.begin(), zsrc_splits.end(), [](const auto &l, const auto &r){ return ClipperZUtils::zpoint_lower(l.first, r.first); }); + std::vector> zsrc_splits; + idx_src_end = idx_boundary_end; + ClipperZUtils::ZPaths zsrc = expolygons_to_zpaths_expanded_opened(src, tiny_expansion, idx_src_end); + zsrc_splits.reserve(zsrc.size()); + for (const ClipperZUtils::ZPath &path : zsrc) { + assert(path.size() >= 2); + assert(path.front() == path.back()); + zsrc_splits.emplace_back(path.front(), -1); } - ClipperLib_Z::PolyTree polytree; - zclipper.Execute(ClipperLib_Z::ctIntersection, polytree, ClipperLib_Z::pftNonZero, ClipperLib_Z::pftNonZero); - ClipperLib_Z::PolyTreeToPaths(std::move(polytree), segments); + std::sort(zsrc_splits.begin(), zsrc_splits.end(), [](const auto &l, const auto &r){ return ClipperZUtils::zpoint_lower(l.first, r.first); }); + segments = ClipperZUtils::clip_zpaths(ctIntersection, zsrc, true, zboundary, visitor.clipper_callback()); merge_splits(segments, zsrc_splits); } @@ -256,10 +243,10 @@ std::vector wave_seeds( WaveSeeds out; out.reserve(segments.size()); int iseed = 0; - for (const ClipperLib_Z::Path &path : segments) { + for (const ClipperZUtils::ZPath &path : segments) { assert(path.size() >= 2); - ClipperLib_Z::IntPoint front = path.front(); - ClipperLib_Z::IntPoint back = path.back(); + ClipperZUtils::ZPoint front = path.front(); + ClipperZUtils::ZPoint back = path.back(); // Both ends of a seed segment are supposed to be inside a single boundary expolygon. // Thus as long as the seed contour is not closed, it should be open at a boundary point. assert((front == back && front.z() >= idx_boundary_end && front.z() < idx_src_end) || @@ -280,7 +267,7 @@ std::vector wave_seeds( // boundary ID is not directly available). coord_t src_z = -1, boundary_z = -1; // Scan all path points for the information we need. - for (const ClipperLib_Z::IntPoint &point : path) { + for (const ClipperZUtils::ZPoint &point : path) { if (point.z() >= idx_boundary_end && point.z() < idx_src_end && src_z < 0) src_z = point.z(); else if (point.z() >= idx_boundary_begin && point.z() < idx_boundary_end && boundary_z < 0) @@ -311,7 +298,7 @@ std::vector wave_seeds( // See https://github.com/prusa3d/PrusaSlicer/issues/12469. // Segement is open, yet its first point seems to be part of boundary polygon. // Take the first point with src polygon index. - for (const ClipperLib_Z::IntPoint &point : path) { + for (const ClipperZUtils::ZPoint &point : path) { if (point.z() >= idx_boundary_end) { front = point; back = point; @@ -360,17 +347,13 @@ std::vector wave_seeds( return out; } -static ClipperLib::Paths wavefront_initial(ClipperLib::ClipperOffset &co, const ClipperLib::Paths &polylines, float offset) +static Polygons wavefront_initial(const VecOfPoints &polylines, float offset, double arc_tolerance) { - ClipperLib::Paths out; + Polygons out; out.reserve(polylines.size()); - ClipperLib::Paths out_this; - for (const ClipperLib::Path &path : polylines) { + for (const Points &path : polylines) { assert(path.size() >= 2); - co.Clear(); - co.AddPath(path, jtRound, path.front() == path.back() ? ClipperLib::etClosedLine : ClipperLib::etOpenRound); - co.Execute(out_this, offset); - append(out, std::move(out_this)); + append(out, Slic3r::offset(Polyline(path), offset, jtRound, arc_tolerance, path.front() == path.back() ? etClosedLine : etOpenRound)); } return out; } @@ -378,43 +361,24 @@ static ClipperLib::Paths wavefront_initial(ClipperLib::ClipperOffset &co, const // Input polygons may consist of multiple expolygons, even nested expolygons. // After inflation some polygons may thus overlap, however the overlap is being resolved during the successive // clipping operation, thus it is not being done here. -static ClipperLib::Paths wavefront_step(ClipperLib::ClipperOffset &co, const ClipperLib::Paths &polygons, float offset) +static Polygons wavefront_step(const Polygons &polygons, float offset, double arc_tolerance) { - ClipperLib::Paths out; + Polygons out; out.reserve(polygons.size()); - ClipperLib::Paths out_this; - for (const ClipperLib::Path &polygon : polygons) { - co.Clear(); - // Execute reorients the contours so that the outer most contour has a positive area. Thus the output - // contours will be CCW oriented even though the input paths are CW oriented. - // Offset is applied after contour reorientation, thus the signum of the offset value is reversed. - co.AddPath(polygon, jtRound, ClipperLib::etClosedPolygon); - bool ccw = ClipperLib::Orientation(polygon); - co.Execute(out_this, ccw ? offset : - offset); - if (! ccw) { - // Reverse the resulting contours. - for (ClipperLib::Path &path : out_this) - std::reverse(path.begin(), path.end()); - } - append(out, std::move(out_this)); - } + for (const Polygon &polygon : polygons) + // CCW contours grow, CW holes shrink. + append(out, Slic3r::offset(polygon, offset, jtRound, arc_tolerance)); return out; } -static ClipperLib::Paths wavefront_clip(const ClipperLib::Paths &wavefront, const Polygons &clipping) +static Polygons wavefront_clip(const Polygons &wavefront, const Polygons &clipping) { - ClipperLib::Clipper clipper; - clipper.AddPaths(wavefront, ClipperLib::ptSubject, true); - clipper.AddPaths(ClipperUtils::PolygonsProvider(clipping), ClipperLib::ptClip, true); - ClipperLib::Paths out; - clipper.Execute(ClipperLib::ctIntersection, out, ClipperLib::pftPositive, ClipperLib::pftPositive); - return out; + return intersection(wavefront, clipping, pftPositive); } static Polygons propagate_wave_from_boundary( - ClipperLib::ClipperOffset &co, // Seed of the wave: Open polylines very close to the boundary. - const ClipperLib::Paths &seed, + const VecOfPoints &seed, // Boundary inside which the waveform will propagate. const ExPolygon &boundary, // How much to inflate the seed lines to produce the first wave area. @@ -425,25 +389,24 @@ static Polygons propagate_wave_from_boundary( const size_t num_other_steps, // Maximum inflation of seed contours over the boundary. Used to trim boundary to speed up // clipping during wave propagation. - const float max_inflation) + const float max_inflation, + // Accuracy of the round offsets. + const double arc_tolerance) { assert(! seed.empty() && seed.front().size() >= 2); Polygons clipping = ClipperUtils::clip_clipper_polygons_with_subject_bbox(boundary, get_extents(seed).inflated(max_inflation)); - ClipperLib::Paths polygons = wavefront_clip(wavefront_initial(co, seed, initial_step), clipping); + Polygons polygons = wavefront_clip(wavefront_initial(seed, initial_step, arc_tolerance), clipping); // Now offset the remaining for (size_t ioffset = 0; ioffset < num_other_steps; ++ ioffset) - polygons = wavefront_clip(wavefront_step(co, polygons, other_step), clipping); - return to_polygons(polygons); + polygons = wavefront_clip(wavefront_step(polygons, other_step, arc_tolerance), clipping); + return polygons; } // Resulting regions are sorted by boundary id and source id. std::vector propagate_waves(const WaveSeeds &seeds, const ExPolygons &boundary, const RegionExpansionParameters ¶ms) { std::vector out; - ClipperLib::Paths paths; - ClipperLib::ClipperOffset co; - co.ArcTolerance = params.arc_tolerance; - co.ShortestEdgeLength = params.shortest_edge_length; + VecOfPoints paths; for (auto it_seed = seeds.begin(); it_seed != seeds.end();) { auto it = it_seed; paths.clear(); @@ -452,7 +415,7 @@ std::vector propagate_waves(const WaveSeeds &seeds, const ExPol // Propagate the wavefront while clipping it with the trimmed boundary. // Collect the expanded polygons, merge them with the source polygons. RegionExpansion re; - for (Polygon &polygon : propagate_wave_from_boundary(co, paths, boundary[it_seed->boundary], params.initial_step, params.other_step, params.num_other_steps, params.max_inflation)) + for (Polygon &polygon : propagate_wave_from_boundary(paths, boundary[it_seed->boundary], params.initial_step, params.other_step, params.num_other_steps, params.max_inflation, params.arc_tolerance)) out.push_back({ std::move(polygon), it_seed->src, it_seed->boundary }); it_seed = it; } diff --git a/src/libslic3r/Algorithm/RegionExpansion.hpp b/src/libslic3r/Algorithm/RegionExpansion.hpp index eb99674902..a3e5ddaa38 100644 --- a/src/libslic3r/Algorithm/RegionExpansion.hpp +++ b/src/libslic3r/Algorithm/RegionExpansion.hpp @@ -25,7 +25,6 @@ struct RegionExpansionParameters // Accuracy of the offsetter for wave propagation. double arc_tolerance; - double shortest_edge_length; static RegionExpansionParameters build( // Scaled expansion value diff --git a/src/libslic3r/Arachne/WallToolPaths.cpp b/src/libslic3r/Arachne/WallToolPaths.cpp index 724016bcb1..d1f0341bda 100644 --- a/src/libslic3r/Arachne/WallToolPaths.cpp +++ b/src/libslic3r/Arachne/WallToolPaths.cpp @@ -263,10 +263,8 @@ std::unique_ptr cre */ void fixSelfIntersections(const coord_t epsilon, Polygons &thiss) { - if (epsilon < 1) { - ClipperLib::SimplifyPolygons(ClipperUtils::PolygonsProvider(thiss), ClipperLib::pftEvenOdd); + if (epsilon < 1) return; - } const int64_t half_epsilon = (epsilon + 1) / 2; @@ -304,8 +302,6 @@ void fixSelfIntersections(const coord_t epsilon, Polygons &thiss) } } } - - ClipperLib::SimplifyPolygons(ClipperUtils::PolygonsProvider(thiss), ClipperLib::pftEvenOdd); } /*! @@ -352,18 +348,11 @@ void removeDegenerateVerts(Polygons &thiss) void removeSmallAreas(Polygons &thiss, const double min_area_size, const bool remove_holes) { - auto to_path = [](const Polygon &poly) -> ClipperLib::Path { - ClipperLib::Path out; - for (const Point &pt : poly.points) - out.emplace_back(ClipperLib::cInt(pt.x()), ClipperLib::cInt(pt.y())); - return out; - }; - auto new_end = thiss.end(); if (remove_holes) { for (auto it = thiss.begin(); it < new_end;) { // All polygons smaller than target are removed by replacing them with a polygon from the back of the vector. - if (fabs(ClipperLib::Area(to_path(*it))) < min_area_size) { + if (fabs(it->area()) < min_area_size) { --new_end; *it = std::move(*new_end); continue; // Don't increment the iterator such that the polygon just swapped in is checked next. @@ -374,7 +363,7 @@ void removeSmallAreas(Polygons &thiss, const double min_area_size, const bool re // For each polygon, computes the signed area, move small outlines at the end of the vector and keep pointer on small holes Polygons small_holes; for (auto it = thiss.begin(); it < new_end;) { - if (double area = ClipperLib::Area(to_path(*it)); fabs(area) < min_area_size) { + if (double area = it->area(); fabs(area) < min_area_size) { if (area >= 0) { --new_end; if (it < new_end) { @@ -773,7 +762,7 @@ void WallToolPaths::separateOutInnerContour() //To get a correct shape, we need to make the outside contour positive and any holes inside negative. //This can be done by applying the even-odd rule to the shape. This rule is not sensitive to the winding order of the polygon. //The even-odd rule would be incorrect if the polygon self-intersects, but that should never be generated by the skeletal trapezoidation. - inner_contour = union_(inner_contour, ClipperLib::PolyFillType::pftEvenOdd); + inner_contour = union_(inner_contour, pftEvenOdd); } const Polygons& WallToolPaths::getInnerContour() diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp index 66bb707ebe..2beaa4f92f 100644 --- a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp +++ b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp @@ -287,9 +287,9 @@ double ExtrusionLine::area() const } // namespace Slic3r::Arachne namespace Slic3r { -void extrusion_paths_append(ExtrusionPaths &dst, const ClipperLib_Z::Paths &extrusion_paths, const ExtrusionRole role, const Flow &flow) +void extrusion_paths_append(ExtrusionPaths &dst, const ClipperZUtils::ZPaths &extrusion_paths, const ExtrusionRole role, const Flow &flow) { - for (const ClipperLib_Z::Path &extrusion_path : extrusion_paths) { + for (const ClipperZUtils::ZPath &extrusion_path : extrusion_paths) { ThickPolyline thick_polyline = Arachne::to_thick_polyline(extrusion_path); Slic3r::append(dst, thick_polyline_to_multi_path(thick_polyline, role, flow, scaled(0.05), float(SCALED_EPSILON)).paths); } diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp index 72e008cef1..8b4a753f5e 100644 --- a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp +++ b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp @@ -5,7 +5,7 @@ #ifndef UTILS_EXTRUSION_LINE_H #define UTILS_EXTRUSION_LINE_H -#include +#include "../../ClipperZUtils.hpp" #include #include #include @@ -294,7 +294,7 @@ using VariableWidthLines = std::vector; //, int...EigenArgs> inline constexpr Eigen::Matrix unscaled( - const Slic3r::ClipperLib::IntPoint &v) noexcept + const Slic3r::Point &v) noexcept { return Eigen::Matrix{unscaled(v.x()), unscaled(v.y())}; @@ -405,7 +405,7 @@ protected: // 2) X distance of item corner to bed corner (low weight) // 3) item row occupancy (useful when rotation is enabled) // 4）需要允许往屏蔽区域的左边或下边去一点，不然很多物体可能认为摆不进去，实际上我们最后是可以做平移的 - double dist_for_BOTTOM_LEFT(Box ibb, const ClipperLib::IntPoint& origin_pack) + double dist_for_BOTTOM_LEFT(Box ibb, const Slic3r::Point& origin_pack) { double dist_corner_y = ibb.minCorner().y() - origin_pack.y(); double dist_corner_x = ibb.minCorner().x() - origin_pack.x(); @@ -421,7 +421,7 @@ protected: return bindist; } - double dist_to_bin(const Box& ibb, const ClipperLib::IntPoint& origin_pack, typename Packer::PlacementConfig::Alignment starting_point_alignment) + double dist_to_bin(const Box& ibb, const Slic3r::Point& origin_pack, typename Packer::PlacementConfig::Alignment starting_point_alignment) { double bindist = 0; if (starting_point_alignment == PConfig::Alignment::BOTTOM_LEFT) @@ -439,7 +439,7 @@ protected: // as it possibly can be but at the same time, it has to provide // reasonable results. std::tuple - objfunc(const Item &item, const ClipperLib::IntPoint &origin_pack) + objfunc(const Item &item, const Slic3r::Point &origin_pack) { const double bin_area = m_bin_area; const SpatIndex& spatindex = m_rtree; @@ -1014,7 +1014,12 @@ void _arrange( inline Box to_nestbin(const BoundingBox &bb) { return Box{{bb.min(X), bb.min(Y)}, {bb.max(X), bb.max(Y)}};} inline Circle to_nestbin(const CircleBed &c) { return Circle({c.center()(0), c.center()(1)}, c.radius()); } inline ExPolygon to_nestbin(const Polygon &p) { return ExPolygon{p}; } -inline Box to_nestbin(const InfiniteBed &bed) { return Box::infinite({bed.center.x(), bed.center.y()}); } +// libnest2d's infinite box reaches the int64 limit, where Clipper2's double math is no longer exact. +inline Box to_nestbin(const InfiniteBed &bed) +{ + const coord_t r = coord_t(1) << 50; + return Box{{bed.center.x() - r, bed.center.y() - r}, {bed.center.x() + r, bed.center.y() + r}}; +} inline coord_t width(const BoundingBox& box) { return box.max.x() - box.min.x(); } inline coord_t height(const BoundingBox& box) { return box.max.y() - box.min.y(); } @@ -1122,8 +1127,6 @@ void arrange(ArrangePolygons & arrangables, const BedT & bed, const ArrangeParams & params) { - namespace clppr = Slic3r::ClipperLib; - std::vector items, fixeditems; items.reserve(arrangables.size()); diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index cb296e43c0..ef15304c8b 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -94,12 +94,9 @@ set(lisbslic3r_sources calib.hpp Circle.cpp Circle.hpp - clipper.cpp - clipper.hpp ClipperUtils.cpp ClipperUtils.hpp - Clipper2Utils.cpp - Clipper2Utils.hpp + ClipperZUtils.cpp ClipperZUtils.hpp Color.cpp Color.hpp @@ -716,7 +713,6 @@ target_link_libraries(libslic3r ${OCCT_LIBS} boost_libs cereal::cereal - clipper Clipper2 draco::draco glu-libtess diff --git a/src/libslic3r/Clipper2Utils.cpp b/src/libslic3r/Clipper2Utils.cpp deleted file mode 100644 index f119fc3924..0000000000 --- a/src/libslic3r/Clipper2Utils.cpp +++ /dev/null @@ -1,228 +0,0 @@ -#include "Clipper2Utils.hpp" -#include "libslic3r.h" -#include "clipper2/clipper.h" - -namespace Slic3r { - -//BBS: FIXME -Slic3r::Polylines Paths64_to_polylines(const Clipper2Lib::Paths64& in) -{ - Slic3r::Polylines out; - out.reserve(in.size()); - for (const Clipper2Lib::Path64& path64 : in) { - Slic3r::Points points; - points.reserve(path64.size()); - for (const Clipper2Lib::Point64& point64 : path64) - points.emplace_back(Slic3r::Point(point64.x, point64.y)); - out.emplace_back(Slic3r::Polyline(points)); - } - return out; -} - -//BBS: FIXME -template -Clipper2Lib::Paths64 Slic3rPoints_to_Paths64(const Container& in) -{ - Clipper2Lib::Paths64 out; - out.reserve(in.size()); - for (const auto& item : in) { - Clipper2Lib::Path64 path; - path.reserve(item.size()); - for (const Slic3r::Point& point : item.points) - path.emplace_back(Clipper2Lib::Point64(point.x(), point.y())); - out.emplace_back(std::move(path)); - } - return out; -} - -Clipper2Lib::Paths64 Slic3rPolylines_to_Paths64(const Polylines& in) -{ - return Slic3rPoints_to_Paths64(in); -} - -Points Path64ToPoints(const Clipper2Lib::Path64& path64) -{ - Points points; - points.reserve(path64.size()); - for (const Clipper2Lib::Point64 &point64 : path64) points.emplace_back(Slic3r::Point(point64.x, point64.y)); - return points; -} - -static ExPolygons PolyTreeToExPolygons(Clipper2Lib::PolyTree64 &&polytree) -{ - struct Inner - { - static void PolyTreeToExPolygonsRecursive(Clipper2Lib::PolyTree64 &&polynode, ExPolygons *expolygons) - { - size_t cnt = expolygons->size(); - expolygons->resize(cnt + 1); - (*expolygons)[cnt].contour.points = Path64ToPoints(polynode.Polygon()); - - (*expolygons)[cnt].holes.resize(polynode.Count()); - for (int i = 0; i < polynode.Count(); ++i) { - (*expolygons)[cnt].holes[i].points = Path64ToPoints(polynode[i]->Polygon()); - // Add outer polygons contained by (nested within) holes. - for (int j = 0; j < polynode[i]->Count(); ++j) PolyTreeToExPolygonsRecursive(std::move(*polynode[i]->Child(j)), expolygons); - } - } - - static size_t PolyTreeCountExPolygons(const Clipper2Lib::PolyPath64& polynode) - { - size_t cnt = 1; - for (size_t i = 0; i < polynode.Count(); ++i) { - for (size_t j = 0; j < polynode.Child(i)->Count(); ++j) cnt += PolyTreeCountExPolygons(*polynode.Child(i)->Child(j)); - } - return cnt; - } - }; - - ExPolygons retval; - size_t cnt = 0; - for (int i = 0; i < polytree.Count(); ++i) cnt += Inner::PolyTreeCountExPolygons(*polytree[i]); - retval.reserve(cnt); - for (int i = 0; i < polytree.Count(); ++i) Inner::PolyTreeToExPolygonsRecursive(std::move(*polytree[i]), &retval); - return retval; -} - -void SimplifyPolyTree(const Clipper2Lib::PolyPath64 &polytree, double epsilon, Clipper2Lib::PolyPath64 &result) -{ - for (const auto &child : polytree) { - Clipper2Lib::PolyPath64 *newchild = result.AddChild(Clipper2Lib::SimplifyPath(child->Polygon(), epsilon)); - SimplifyPolyTree(*child, epsilon, *newchild); - } -} - -Clipper2Lib::Paths64 Slic3rPolygons_to_Paths64(const Polygons &in) -{ - Clipper2Lib::Paths64 out; - out.reserve(in.size()); - for (const Polygon &poly : in) { - Clipper2Lib::Path64 path; - path.reserve(poly.points.size()); - for (const Slic3r::Point &point : poly.points) path.emplace_back(Clipper2Lib::Point64(point.x(), point.y())); - out.emplace_back(std::move(path)); - } - return out; -} - -Clipper2Lib::Paths64 Slic3rExPolygons_to_Paths64(const ExPolygons& in) -{ - Clipper2Lib::Paths64 out; - out.reserve(in.size()); - for (const ExPolygon& expolygon : in) { - for (size_t i = 0; i < expolygon.num_contours(); i++) { - const auto &poly = expolygon.contour_or_hole(i); - Clipper2Lib::Path64 path; - path.reserve(poly.points.size()); - for (const Slic3r::Point &point : poly.points) path.emplace_back(Clipper2Lib::Point64(point.x(), point.y())); - out.emplace_back(std::move(path)); - } - } - return out; -} - -Polylines _clipper2_pl_open(Clipper2Lib::ClipType clipType, const Slic3r::Polylines& subject, const Slic3r::Polygons& clip) -{ - Clipper2Lib::Clipper64 c; - c.AddOpenSubject(Slic3rPoints_to_Paths64(subject)); - c.AddClip(Slic3rPoints_to_Paths64(clip)); - - Clipper2Lib::ClipType ct = clipType; - Clipper2Lib::FillRule fr = Clipper2Lib::FillRule::NonZero; - Clipper2Lib::Paths64 solution, solution_open; - c.Execute(ct, fr, solution, solution_open); - - Slic3r::Polylines out; - out.reserve(solution.size() + solution_open.size()); - polylines_append(out, Paths64_to_polylines(solution)); - polylines_append(out, Paths64_to_polylines(solution_open)); - - return out; -} - -Slic3r::Polylines intersection_pl_2(const Slic3r::Polylines& subject, const Slic3r::Polygons& clip) - { return _clipper2_pl_open(Clipper2Lib::ClipType::Intersection, subject, clip); } -Slic3r::Polylines diff_pl_2(const Slic3r::Polylines& subject, const Slic3r::Polygons& clip) - { return _clipper2_pl_open(Clipper2Lib::ClipType::Difference, subject, clip); } - -ExPolygons union_ex_2(const Polygons& polygons) -{ - Clipper2Lib::Clipper64 c; - c.AddSubject(Slic3rPolygons_to_Paths64(polygons)); - - Clipper2Lib::ClipType ct = Clipper2Lib::ClipType::Union; - Clipper2Lib::FillRule fr = Clipper2Lib::FillRule::NonZero; - Clipper2Lib::PolyTree64 solution; - c.Execute(ct, fr, solution); - - ExPolygons results = PolyTreeToExPolygons(std::move(solution)); - - return results; -} - -ExPolygons union_ex_2(const ExPolygons &expolygons) -{ - Clipper2Lib::Clipper64 c; - c.AddSubject(Slic3rExPolygons_to_Paths64(expolygons)); - - Clipper2Lib::ClipType ct = Clipper2Lib::ClipType::Union; - Clipper2Lib::FillRule fr = Clipper2Lib::FillRule::NonZero; - Clipper2Lib::PolyTree64 solution; - c.Execute(ct, fr, solution); - - ExPolygons results = PolyTreeToExPolygons(std::move(solution)); - - return results; -} - -// 对 ExPolygons 进行偏移 -ExPolygons offset_ex_2(const ExPolygons &expolygons, double delta) -{ - Clipper2Lib::Paths64 subject = Slic3rExPolygons_to_Paths64(expolygons); - Clipper2Lib::ClipperOffset offsetter; - offsetter.AddPaths(subject, Clipper2Lib::JoinType::Round, Clipper2Lib::EndType::Polygon); - Clipper2Lib::PolyPath64 polytree; - offsetter.Execute(delta, polytree); - ExPolygons results = PolyTreeToExPolygons(std::move(polytree)); - - return results; -} - -ExPolygons offset_ex_2(const ExPolygons &expolygons, double delta, Clipper2Lib::JoinType joinType) -{ - Clipper2Lib::Paths64 subject = Slic3rExPolygons_to_Paths64(expolygons); - Clipper2Lib::ClipperOffset offsetter; - offsetter.AddPaths(subject, joinType, Clipper2Lib::EndType::Polygon); - Clipper2Lib::PolyPath64 polytree; - offsetter.Execute(delta, polytree); - ExPolygons results = PolyTreeToExPolygons(std::move(polytree)); - - return results; -} - -ExPolygons offset2_ex_2(const ExPolygons& expolygons, double delta1, double delta2) -{ - // 1st offset - Clipper2Lib::Paths64 subject = Slic3rExPolygons_to_Paths64(expolygons); - Clipper2Lib::ClipperOffset offsetter; - offsetter.AddPaths(subject, Clipper2Lib::JoinType::Round, Clipper2Lib::EndType::Polygon); - Clipper2Lib::PolyPath64 polytree; - offsetter.Execute(delta1, polytree); - - // simplify the result - Clipper2Lib::PolyPath64 polytree2; - SimplifyPolyTree(polytree, SCALED_EPSILON, polytree2); - - // 2nd offset - offsetter.Clear(); - offsetter.AddPaths(Clipper2Lib::PolyTreeToPaths64(polytree2), Clipper2Lib::JoinType::Round, Clipper2Lib::EndType::Polygon); - polytree.Clear(); - offsetter.Execute(delta2, polytree); - - // convert back to expolygons - ExPolygons results = PolyTreeToExPolygons(std::move(polytree)); - - return results; -} - -} \ No newline at end of file diff --git a/src/libslic3r/Clipper2Utils.hpp b/src/libslic3r/Clipper2Utils.hpp deleted file mode 100644 index 2b4b0fb2ef..0000000000 --- a/src/libslic3r/Clipper2Utils.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef slic3r_Clipper2Utils_hpp_ -#define slic3r_Clipper2Utils_hpp_ - -#include "ExPolygon.hpp" -#include "Polygon.hpp" -#include "Polyline.hpp" -#include "clipper2/clipper.h" - -namespace Slic3r { - -Clipper2Lib::Paths64 Slic3rPolylines_to_Paths64(const Slic3r::Polylines& in); -Slic3r::Polylines Paths64_to_polylines(const Clipper2Lib::Paths64& in); -Slic3r::Polylines intersection_pl_2(const Slic3r::Polylines& subject, const Slic3r::Polygons& clip); -Slic3r::Polylines diff_pl_2(const Slic3r::Polylines& subject, const Slic3r::Polygons& clip); -ExPolygons union_ex_2(const Polygons &expolygons); -ExPolygons union_ex_2(const ExPolygons &expolygons); -ExPolygons offset_ex_2(const ExPolygons &expolygons, double delta); -ExPolygons offset_ex_2(const ExPolygons &expolygons, double delta, Clipper2Lib::JoinType joinType); -ExPolygons offset2_ex_2(const ExPolygons &expolygons, double delta1, double delta2); -} - -#endif \ No newline at end of file diff --git a/src/libslic3r/Clipper2ZUtils.hpp b/src/libslic3r/Clipper2ZUtils.hpp deleted file mode 100644 index b0891d1c63..0000000000 --- a/src/libslic3r/Clipper2ZUtils.hpp +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef slic3r_Clipper2ZUtils_hpp_ -#define slic3r_Clipper2ZUtils_hpp_ -#include -#include -#include - -#include -#include -namespace Slic3r { namespace Clipper2ZUtils { - -using ZPoint64 = Clipper2Lib_Z::Point64; -using ZPoints64 = Clipper2Lib_Z::Path64; -using ZPath64 = Clipper2Lib_Z::Path64; -using ZPaths64 = Clipper2Lib_Z::Paths64; - -inline bool zpoint64_lower(const ZPoint64 &l, const ZPoint64 &r) { - return l.x < r.x || (l.x == r.x && (l.y < r.y || (l.y == r.y && l.z < r.z))); -} - -// Convert a single path to zpath with a given Z coordinate. -// If Open, then duplicate the first point at the end. -template -inline ZPath64 to_zpath64(const Points &path, int64_t z) -{ - ZPath64 out; - if (!path.empty()) { - out.reserve(path.size() + (Open ? 1 : 0)); - for (const Point &p : path) out.emplace_back(p.x(), p.y(), z); - if (Open) out.emplace_back(out.front()); - } - return out; -} - -template -inline ZPath64 to_zpath64(const Clipper2Lib_Z::Path64 &path, int64_t z) -{ - ZPath64 out; - if (!path.empty()) { - out.reserve(path.size() + (Open ? 1 : 0)); - for (const Clipper2Lib_Z::Point64 &p : path) out.emplace_back(p.x, p.y, z); - if (Open) out.emplace_back(out.front()); - } - return out; -} - -// Convert multiple paths to zpaths with a given Z coordinate. -template -inline ZPaths64 to_zpaths64(const VecOfPoints &paths, int64_t z) -{ - ZPaths64 out; - out.reserve(paths.size()); - for (const Points &path : paths) out.emplace_back(to_zpath64(path, z)); - return out; -} - -template -inline ZPaths64 to_zpaths64(const Clipper2Lib_Z::Paths64 &paths, int64_t z) -{ - ZPaths64 out; - out.reserve(paths.size()); - for (const Clipper2Lib_Z::Path64 &path : paths) out.emplace_back(to_zpath64(path, z)); - return out; -} - -// Convert multiple expolygons into zpaths with Z specified by index -// offset by base_idx. -template -inline ZPaths64 expolygons_to_zpaths64(const ExPolygons &src, int64_t &base_idx) -{ - ZPaths64 out; - out.reserve(std::accumulate(src.begin(), src.end(), size_t(0), - [](const size_t acc, const ExPolygon &expoly) { return acc + expoly.num_contours(); })); - for (const ExPolygon &expoly : src) { - out.emplace_back(to_zpath64(expoly.contour.points, base_idx)); - for (const Polygon &hole : expoly.holes) - out.emplace_back(to_zpath64(hole.points, base_idx)); - ++base_idx; - } - return out; -} - -// Convert multiple expolygons into zpaths with the same Z. -template -inline ZPaths64 expolygons_to_zpaths64_with_same_z(const ExPolygons &src, int64_t z) -{ - ZPaths64 out; - out.reserve(std::accumulate(src.begin(), src.end(), size_t(0), - [](const size_t acc, const ExPolygon &expoly) { return acc + expoly.num_contours(); })); - for (const ExPolygon &expoly : src) { - out.emplace_back(to_zpath64(expoly.contour.points, z)); - for (const Polygon &hole : expoly.holes) - out.emplace_back(to_zpath64(hole.points, z)); - } - return out; -} - -// Convert a zpath back to 2D Points. -// If Open, then duplicate the first point at the end. -template -inline Points from_zpath64(const ZPath64 &path) -{ - Points out; - if (!path.empty()) { - out.reserve(path.size() + (Open ? 1 : 0)); - for (const ZPoint64 &p : path) out.emplace_back(p.x, p.y); - if (Open) out.emplace_back(out.front()); - } - return out; -} - -// Convert multiple zpaths back to 2D paths. -template -inline void from_zpaths64(const ZPaths64 &paths, VecOfPoints &out) -{ - out.reserve(out.size() + paths.size()); - for (const ZPath64 &path : paths) out.emplace_back(from_zpath64(path)); -} -template -inline VecOfPoints from_zpaths64(const ZPaths64 &paths) -{ - VecOfPoints out; - from_zpaths64(paths, out); - return out; -} - -// Intersection visitor for Clipper2 (zCallback_). -class Clipper2ZIntersectionVisitor -{ -public: - using Intersection = std::pair; - using Intersections = std::vector; - - Clipper2ZIntersectionVisitor(Intersections &intersections) : m_intersections(intersections) {} - - void reset() { m_intersections.clear(); } - - void operator()(const ZPoint64 &e1bot, const ZPoint64 &e1top, const ZPoint64 &e2bot, const ZPoint64 &e2top, ZPoint64 &pt) - { - std::array srcs{e1bot.z, e1top.z, e2bot.z, e2top.z}; - std::sort(srcs.begin(), srcs.end()); - auto it = std::unique(srcs.begin(), srcs.end()); - int new_size = std::distance(srcs.begin(), it); - assert(new_size == 1 || new_size == 2); - if (new_size == 1) { - pt.z = srcs[0]; - } - else if(new_size == 2){ - m_intersections.emplace_back(srcs[0], srcs[1]); - pt.z = -int64_t(m_intersections.size()); - } - } - - auto clipper_callback() - { - return [this](const ZPoint64 &e1bot, const ZPoint64 &e1top, - const ZPoint64 &e2bot, const ZPoint64 &e2top, ZPoint64 &pt) { - return (*this)(e1bot, e1top, e2bot, e2top, pt); }; - } - - const Intersections &intersections() const { return m_intersections; } - -private: - Intersections &m_intersections; -}; - -}} // namespace Slic3r::Clipper2ZUtils -#endif // slic3r_Clipper2ZUtils_hpp_ \ No newline at end of file diff --git a/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp index ea19eeb559..88be185f8c 100644 --- a/src/libslic3r/ClipperUtils.cpp +++ b/src/libslic3r/ClipperUtils.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -6,6 +8,8 @@ #include "Geometry.hpp" #include "ShortestPath.hpp" +#include + // #define CLIPPER_UTILS_DEBUG #ifdef CLIPPER_UTILS_DEBUG @@ -25,45 +29,12 @@ namespace Slic3r { -#ifdef CLIPPER_UTILS_DEBUG -// For debugging the Clipper library, for providing bug reports to the Clipper author. -bool export_clipper_input_polygons_bin(const char *path, const ClipperLib::Paths &input_subject, const ClipperLib::Paths &input_clip) -{ - FILE *pfile = fopen(path, "wb"); - if (pfile == NULL) - return false; - - uint32_t sz = uint32_t(input_subject.size()); - fwrite(&sz, 1, sizeof(sz), pfile); - for (size_t i = 0; i < input_subject.size(); ++i) { - const ClipperLib::Path &path = input_subject[i]; - sz = uint32_t(path.size()); - ::fwrite(&sz, 1, sizeof(sz), pfile); - ::fwrite(path.data(), sizeof(ClipperLib::IntPoint), sz, pfile); - } - sz = uint32_t(input_clip.size()); - ::fwrite(&sz, 1, sizeof(sz), pfile); - for (size_t i = 0; i < input_clip.size(); ++i) { - const ClipperLib::Path &path = input_clip[i]; - sz = uint32_t(path.size()); - ::fwrite(&sz, 1, sizeof(sz), pfile); - ::fwrite(path.data(), sizeof(ClipperLib::IntPoint), sz, pfile); - } - ::fclose(pfile); - return true; - -err: - ::fclose(pfile); - return false; -} -#endif /* CLIPPER_UTILS_DEBUG */ - namespace ClipperUtils { Points EmptyPathsProvider::s_empty_points; Points SinglePathProvider::s_end; // Clip source polygon to be used as a clipping polygon with a bouding box around the source (to be clipped) polygon. -// Useful as an optimization for expensive ClipperLib operations, for example when clipping source polygons one by one +// Useful as an optimization for expensive Clipper operations, for example when clipping source polygons one by one // with a set of polygons covering the whole layer below. template inline void clip_clipper_polygon_with_subject_bbox_templ(const PointsType &src, const BoundingBox &bbox, PointsType &out, const bool get_entire_polygons=false) { @@ -170,517 +141,501 @@ void clip_clipper_polygon_with_subject_bbox(const Polygon &src, const BoundingBo } } -static ExPolygons PolyTreeToExPolygons(ClipperLib::PolyTree &&polytree) +namespace C2 = Clipper2Lib; + +namespace { + +C2::ClipType to_c2(ClipType type) { - struct Inner { - static void PolyTreeToExPolygonsRecursive(ClipperLib::PolyNode &&polynode, ExPolygons *expolygons) - { - size_t cnt = expolygons->size(); - expolygons->resize(cnt + 1); - (*expolygons)[cnt].contour.points = std::move(polynode.Contour); - (*expolygons)[cnt].holes.resize(polynode.ChildCount()); - for (int i = 0; i < polynode.ChildCount(); ++ i) { - (*expolygons)[cnt].holes[i].points = std::move(polynode.Childs[i]->Contour); - // Add outer polygons contained by (nested within) holes. - for (int j = 0; j < polynode.Childs[i]->ChildCount(); ++ j) - PolyTreeToExPolygonsRecursive(std::move(*polynode.Childs[i]->Childs[j]), expolygons); - } - } - - static size_t PolyTreeCountExPolygons(const ClipperLib::PolyNode &polynode) - { - size_t cnt = 1; - for (int i = 0; i < polynode.ChildCount(); ++ i) { - for (int j = 0; j < polynode.Childs[i]->ChildCount(); ++ j) - cnt += PolyTreeCountExPolygons(*polynode.Childs[i]->Childs[j]); - } - return cnt; - } - }; - - ExPolygons retval; - size_t cnt = 0; - for (int i = 0; i < polytree.ChildCount(); ++ i) - cnt += Inner::PolyTreeCountExPolygons(*polytree.Childs[i]); - retval.reserve(cnt); - for (int i = 0; i < polytree.ChildCount(); ++ i) - Inner::PolyTreeToExPolygonsRecursive(std::move(*polytree.Childs[i]), &retval); - return retval; + switch (type) { + case ctIntersection: return C2::ClipType::Intersection; + case ctUnion: return C2::ClipType::Union; + case ctDifference: return C2::ClipType::Difference; + default: return C2::ClipType::Xor; + } } -Polylines PolyTreeToPolylines(ClipperLib::PolyTree &&polytree) +C2::FillRule to_c2(PolyFillType type) { - struct Inner { - static void AddPolyNodeToPaths(ClipperLib::PolyNode &polynode, Polylines &out) - { - if (! polynode.Contour.empty()) - out.emplace_back(std::move(polynode.Contour)); - for (ClipperLib::PolyNode *child : polynode.Childs) - AddPolyNodeToPaths(*child, out); - } - }; - - Polylines out; - out.reserve(polytree.Total()); - Inner::AddPolyNodeToPaths(polytree, out); - return out; + switch (type) { + case pftEvenOdd: return C2::FillRule::EvenOdd; + case pftNonZero: return C2::FillRule::NonZero; + case pftPositive: return C2::FillRule::Positive; + default: return C2::FillRule::Negative; + } } -#if 0 -// Global test. -bool has_duplicate_points(const ClipperLib::PolyTree &polytree) +C2::JoinType to_c2(JoinType type) { - struct Helper { - static void collect_points_recursive(const ClipperLib::PolyNode &polynode, ClipperLib::Path &out) { - // For each hole of the current expolygon: - out.insert(out.end(), polynode.Contour.begin(), polynode.Contour.end()); - for (int i = 0; i < polynode.ChildCount(); ++ i) - collect_points_recursive(*polynode.Childs[i], out); - } - }; - ClipperLib::Path pts; - for (int i = 0; i < polytree.ChildCount(); ++ i) - Helper::collect_points_recursive(*polytree.Childs[i], pts); - return has_duplicate_points(std::move(pts)); + switch (type) { + case jtSquare: return C2::JoinType::Square; + case jtRound: return C2::JoinType::Round; + default: return C2::JoinType::Miter; + } } -#else -// Local test inside each of the contours. -bool has_duplicate_points(const ClipperLib::PolyTree &polytree) -{ - struct Helper { - static bool has_duplicate_points_recursive(const ClipperLib::PolyNode &polynode) { - if (has_duplicate_points(polynode.Contour)) - return true; - for (int i = 0; i < polynode.ChildCount(); ++ i) - if (has_duplicate_points_recursive(*polynode.Childs[i])) - return true; - return false; - } - }; - ClipperLib::Path pts; - for (int i = 0; i < polytree.ChildCount(); ++ i) - if (Helper::has_duplicate_points_recursive(*polytree.Childs[i])) - return true; - return false; -} -#endif -// Offset CCW contours outside, CW contours (holes) inside. -// Don't calculate union of the output paths. +C2::EndType to_c2(EndType type) +{ + switch (type) { + case etClosedPolygon: return C2::EndType::Polygon; + case etClosedLine: return C2::EndType::Joined; + case etOpenSquare: return C2::EndType::Square; + case etOpenRound: return C2::EndType::Round; + default: return C2::EndType::Butt; + } +} + +inline int64_t px(const Point &pt) { return pt.x(); } +inline int64_t py(const Point &pt) { return pt.y(); } +inline int64_t px(const C2::Point64 &pt) { return pt.x; } +inline int64_t py(const C2::Point64 &pt) { return pt.y; } + template -static ClipperLib::Paths raw_offset(PathsProvider &&paths, float offset, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::EndType endType = ClipperLib::etClosedPolygon) +C2::Paths64 to_paths64(PathsProvider &&paths) { - ClipperLib::ClipperOffset co; - ClipperLib::Paths out; + C2::Paths64 out; out.reserve(paths.size()); - ClipperLib::Paths out_this; - if (joinType == jtRound) - co.ArcTolerance = miterLimit; - else - co.MiterLimit = miterLimit; - co.ShortestEdgeLength = std::abs(offset * ClipperOffsetShortestEdgeFactor); - for (const ClipperLib::Path &path : paths) { - co.Clear(); - // Execute reorients the contours so that the outer most contour has a positive area. Thus the output - // contours will be CCW oriented even though the input paths are CW oriented. - // Offset is applied after contour reorientation, thus the signum of the offset value is reversed. - co.AddPath(path, joinType, endType); - bool ccw = endType == ClipperLib::etClosedPolygon ? ClipperLib::Orientation(path) : true; - co.Execute(out_this, ccw ? offset : - offset); - if (! ccw) { - // Reverse the resulting contours. - for (ClipperLib::Path &path : out_this) - std::reverse(path.begin(), path.end()); + for (const Points &path : paths) { + C2::Path64 &dst = out.emplace_back(); + dst.reserve(path.size()); + for (const Point &pt : path) + dst.emplace_back(pt.x(), pt.y()); + } + return out; +} + +// Drops vertices closer than `shortest` to the last kept one, like Clipper1's ShortestEdgeLength. +template +bool append_offset_path(C2::Paths64 &out, const PathT &path, double shortest, C2::EndType end) +{ + int high = int(path.size()) - 1; + if (high < 0) + return false; + const double shortest2 = shortest * shortest; + auto same = [shortest2](const auto &a, const auto &b) { + const double dx = double(px(a) - px(b)); + const double dy = double(py(a) - py(b)); + return shortest2 > 0. ? dx * dx + dy * dy < shortest2 : dx == 0. && dy == 0.; + }; + if (end == C2::EndType::Polygon || end == C2::EndType::Joined) + while (high > 0 && same(path[high], path[0])) + -- high; + C2::Path64 dst; + dst.reserve(high + 1); + dst.emplace_back(px(path[0]), py(path[0])); + for (int i = 1, last = 0; i <= high; ++ i) + if (! same(path[i], path[last])) { + dst.emplace_back(px(path[i]), py(path[i])); + last = i; } - append(out, std::move(out_this)); - } + if (end == C2::EndType::Polygon && dst.size() < 3) + return false; + out.emplace_back(std::move(dst)); + return true; +} + +inline Points c2_to_points(const C2::Path64 &path) +{ + Points out; + out.reserve(path.size()); + for (const C2::Point64 &pt : path) + out.emplace_back(pt.x, pt.y); return out; } -// Offset outside by 10um, one by one. -template -static ClipperLib::Paths safety_offset(PathsProvider &&paths) +Polygons c2_to_polygons(const C2::Paths64 &paths) { - return raw_offset(std::forward(paths), ClipperSafetyOffset, DefaultJoinType, DefaultMiterLimit); -} - -template -TResult clipper_do( - const ClipperLib::ClipType clipType, - TSubj && subject, - TClip && clip, - const ClipperLib::PolyFillType fillType) -{ - ClipperLib::Clipper clipper; - clipper.AddPaths(std::forward(subject), ClipperLib::ptSubject, true); - clipper.AddPaths(std::forward(clip), ClipperLib::ptClip, true); - TResult retval; - clipper.Execute(clipType, retval, fillType, fillType); - return retval; -} - -template -TResult clipper_do( - const ClipperLib::ClipType clipType, - TSubj && subject, - TClip && clip, - const ClipperLib::PolyFillType fillType, - const ApplySafetyOffset do_safety_offset) -{ - // Safety offset only allowed on intersection and difference. - assert(do_safety_offset == ApplySafetyOffset::No || clipType != ClipperLib::ctUnion); - return do_safety_offset == ApplySafetyOffset::Yes ? - clipper_do(clipType, std::forward(subject), safety_offset(std::forward(clip)), fillType) : - clipper_do(clipType, std::forward(subject), std::forward(clip), fillType); -} - -template -TResult clipper_union( - TSubj && subject, - // fillType pftNonZero and pftPositive "should" produce the same result for "normalized with implicit union" set of polygons - const ClipperLib::PolyFillType fillType = ClipperLib::pftNonZero) -{ - ClipperLib::Clipper clipper; - clipper.AddPaths(std::forward(subject), ClipperLib::ptSubject, true); - TResult retval; - clipper.Execute(ClipperLib::ctUnion, retval, fillType, fillType); - return retval; -} - -// Perform union of input polygons using the positive rule, convert to ExPolygons. -//FIXME is there any benefit of not doing the boolean / using pftEvenOdd? -inline ExPolygons ClipperPaths_to_Slic3rExPolygons(const ClipperLib::Paths &input, bool do_union) -{ - return PolyTreeToExPolygons(clipper_union(input, do_union ? ClipperLib::pftNonZero : ClipperLib::pftEvenOdd)); -} - -template -static ClipperLib::Paths raw_offset_polyline(PathsProvider &&paths, float offset, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::EndType end_type = ClipperLib::etOpenButt) -{ - assert(offset > 0); - return raw_offset(std::forward(paths), offset, joinType, miterLimit, end_type); -} - -template -static TResult expand_paths(PathsProvider &&paths, float offset, ClipperLib::JoinType joinType, double miterLimit) -{ - // BBS - //assert(offset > 0); - return clipper_union(raw_offset(std::forward(paths), offset, joinType, miterLimit)); -} - -// used by shrink_paths() -template static void remove_outermost_polygon(Container & solution); -template<> void remove_outermost_polygon(ClipperLib::Paths &solution) - { if (! solution.empty()) solution.erase(solution.begin()); } -template<> void remove_outermost_polygon(ClipperLib::PolyTree &solution) - { solution.RemoveOutermostPolygon(); } - -template -static TResult shrink_paths(PathsProvider &&paths, float offset, ClipperLib::JoinType joinType, double miterLimit) -{ - // BBS - //assert(offset > 0); - TResult out; - if (auto raw = raw_offset(std::forward(paths), - offset, joinType, miterLimit); ! raw.empty()) { - ClipperLib::Clipper clipper; - clipper.AddPaths(raw, ClipperLib::ptSubject, true); - ClipperLib::IntRect r = clipper.GetBounds(); - clipper.AddPath({ { r.left - 10, r.bottom + 10 }, { r.right + 10, r.bottom + 10 }, { r.right + 10, r.top - 10 }, { r.left - 10, r.top - 10 } }, ClipperLib::ptSubject, true); - clipper.ReverseSolution(true); - clipper.Execute(ClipperLib::ctUnion, out, ClipperLib::pftNegative, ClipperLib::pftNegative); - remove_outermost_polygon(out); - } + Polygons out; + out.reserve(paths.size()); + for (const C2::Path64 &path : paths) + out.emplace_back().points = c2_to_points(path); return out; } -template -static TResult offset_paths(PathsProvider &&paths, float offset, ClipperLib::JoinType joinType, double miterLimit) +Polylines c2_to_polylines(const C2::Paths64 &paths) { - // BBS - //assert(offset != 0); - - return offset > 0 ? - expand_paths(std::forward(paths), offset, joinType, miterLimit) : - shrink_paths(std::forward(paths), - offset, joinType, miterLimit); + Polylines out; + out.reserve(paths.size()); + for (const C2::Path64 &path : paths) + out.emplace_back(c2_to_points(path)); + return out; } -Slic3r::Polygons offset(const Slic3r::Polygon &polygon, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return to_polygons(raw_offset(ClipperUtils::SinglePathProvider(polygon.points), delta, joinType, miterLimit)); } +size_t c2_count_expolygons(const C2::PolyPath64 &outer) +{ + size_t cnt = 1; + for (const auto &hole : outer) + for (const auto &island : *hole) + cnt += c2_count_expolygons(*island); + return cnt; +} -Slic3r::Polygons offset(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return to_polygons(offset_paths(ClipperUtils::PolygonsProvider(polygons), delta, joinType, miterLimit)); } -Slic3r::ExPolygons offset_ex(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return PolyTreeToExPolygons(offset_paths(ClipperUtils::PolygonsProvider(polygons), delta, joinType, miterLimit)); } +void c2_append_expolygons(const C2::PolyPath64 &outer, ExPolygons &out) +{ + ExPolygon &expoly = out.emplace_back(); + expoly.contour.points = c2_to_points(outer.Polygon()); + expoly.holes.reserve(outer.Count()); + for (const auto &hole : outer) + expoly.holes.emplace_back().points = c2_to_points(hole->Polygon()); + // Islands inside the holes. + for (const auto &hole : outer) + for (const auto &island : *hole) + c2_append_expolygons(*island, out); +} -Slic3r::Polygons offset(const Slic3r::Polyline &polyline, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::EndType end_type) - { assert(delta > 0); return to_polygons(clipper_union(raw_offset_polyline(ClipperUtils::SinglePathProvider(polyline.points), delta, joinType, miterLimit, end_type))); } +ExPolygons c2_to_expolygons(const C2::PolyTree64 &tree) +{ + size_t cnt = 0; + for (const auto &outer : tree) + cnt += c2_count_expolygons(*outer); + ExPolygons out; + out.reserve(cnt); + for (const auto &outer : tree) + c2_append_expolygons(*outer, out); + return out; +} -Slic3r::Polygons offset(const Slic3r::Polyline3 &polyline, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::EndType end_type) +template +void c2_clip(C2::ClipType type, const C2::Paths64 &subject, const C2::Paths64 &clip, C2::FillRule fill, TOut &out) +{ + C2::Clipper64 clipper; + // Clipper2 keeps collinear vertices by default, Clipper1 removed them. + clipper.PreserveCollinear(false); + clipper.AddSubject(subject); + if (! clip.empty()) + clipper.AddClip(clip); + clipper.Execute(type, fill, out); +} + +Polylines c2_clip_open(C2::ClipType type, const C2::Paths64 &subject, const C2::Paths64 &clip) +{ + C2::Clipper64 clipper; + clipper.PreserveCollinear(false); + clipper.AddOpenSubject(subject); + if (! clip.empty()) + clipper.AddClip(clip); + C2::Paths64 closed, open; + clipper.Execute(type, C2::FillRule::NonZero, closed, open); + return c2_to_polylines(open); +} + +// Clipper1 semantics: miter limit at least 2, arc tolerance (also for round caps) at most a quarter of the offset. +void c2_offset_setup(C2::ClipperOffset &co, float delta, JoinType joinType, double miterLimit) +{ + const double max_arc_tolerance = std::abs(delta) * 0.25; + if (joinType == jtRound) + co.ArcTolerance(miterLimit > 0. ? std::min(miterLimit, max_arc_tolerance) : 0.25); + else { + co.MiterLimit(std::max(miterLimit, 2.)); + co.ArcTolerance(std::min(0.25, max_arc_tolerance)); + } +} + +// A single group offsets like Clipper1's path by path offset only if every CW path is a hole of a CCW path. +bool c2_offset_as_group(const C2::Paths64 &paths, const std::vector &areas) +{ + std::vector contours; + for (size_t i = 0; i < paths.size(); ++ i) + if (areas[i] > 0.) + contours.emplace_back(C2::GetBounds(paths[i])); + for (size_t i = 0; i < paths.size(); ++ i) + if (areas[i] < 0.) { + const C2::Rect64 hole = C2::GetBounds(paths[i]); + if (std::none_of(contours.begin(), contours.end(), [&hole](const C2::Rect64 &r) { + return r.left < hole.left && r.right > hole.right && r.top < hole.top && r.bottom > hole.bottom; + })) + return false; + } + return true; +} + +template +void c2_offset_closed_paths(C2::Paths64 &&paths, float delta, JoinType joinType, double miterLimit, TOut &out) +{ + std::vector areas; + areas.reserve(paths.size()); + for (const C2::Path64 &path : paths) + areas.emplace_back(C2::Area(path)); + C2::ClipperOffset co; + c2_offset_setup(co, delta, joinType, miterLimit); + if (c2_offset_as_group(paths, areas)) { + // Clipper2 would grow degenerate paths even for a negative offset. + if (delta < 0. && std::all_of(areas.begin(), areas.end(), [](double a) { return a == 0.; })) + return; + co.AddPaths(paths, to_c2(joinType), C2::EndType::Polygon); + co.Execute(delta, out); + return; + } + C2::Paths64 offsetted, single; + for (size_t i = 0; i < paths.size(); ++ i) { + if (areas[i] == 0. && delta < 0.) + continue; + co.Clear(); + co.AddPath(paths[i], to_c2(joinType), C2::EndType::Polygon); + // Clipper2 reverses a lone CW path, so the flipped sign shrinks it as a hole. + co.Execute(areas[i] < 0. ? - delta : delta, single); + append(offsetted, std::move(single)); + } + c2_clip(C2::ClipType::Union, offsetted, {}, delta > 0. ? C2::FillRule::NonZero : C2::FillRule::Positive, out); +} + +template +void c2_offset_closed(PathsT &&src, float delta, JoinType joinType, double miterLimit, TOut &out) +{ + const double shortest = std::abs(delta * ClipperOffsetShortestEdgeFactor); + C2::Paths64 paths; + paths.reserve(src.size()); + for (const auto &path : src) + append_offset_path(paths, path, shortest, C2::EndType::Polygon); + c2_offset_closed_paths(std::move(paths), delta, joinType, miterLimit, out); +} + +template +void c2_offset2_closed(PathsProvider &&src, float delta1, float delta2, JoinType joinType, double miterLimit, TOut &out) +{ + C2::Paths64 first; + c2_offset_closed(std::forward(src), delta1, joinType, miterLimit, first); + c2_offset_closed(first, delta2, joinType, miterLimit, out); +} + +inline const ExPolygon& expolygon_of(const ExPolygon &expoly) { return expoly; } +inline const ExPolygon& expolygon_of(const ExPolygon *expoly) { return *expoly; } +inline const ExPolygon& expolygon_of(const Surface &surface) { return surface.expolygon; } +inline const ExPolygon& expolygon_of(const Surface *surface) { return surface->expolygon; } + +// Clipper1 ignored the orientation of expolygons, a single group needs CCW contours and CW holes. +template +void c2_offset_expolygons(const ExPolygonRange &src, float delta, JoinType joinType, double miterLimit, TOut &out) +{ + const double shortest = std::abs(delta * ClipperOffsetShortestEdgeFactor); + C2::Paths64 paths; + for (const auto &item : src) { + const ExPolygon &expoly = expolygon_of(item); + if (! append_offset_path(paths, expoly.contour.points, shortest, C2::EndType::Polygon)) + continue; + if (const double area = C2::Area(paths.back()); area == 0.) { + // A degenerate contour vanishes when shrunk and encloses no hole when grown. + if (delta < 0.) + paths.pop_back(); + continue; + } else if (area < 0.) + std::reverse(paths.back().begin(), paths.back().end()); + for (const Polygon &hole : expoly.holes) + if (append_offset_path(paths, hole.points, shortest, C2::EndType::Polygon)) { + if (const double area = C2::Area(paths.back()); area == 0.) + paths.pop_back(); + else if (area > 0.) + std::reverse(paths.back().begin(), paths.back().end()); + } + } + C2::ClipperOffset co; + c2_offset_setup(co, delta, joinType, miterLimit); + co.AddPaths(paths, to_c2(joinType), C2::EndType::Polygon); + co.Execute(delta, out); +} + +template +Polygons c2_expolygons_offset(const ExPolygonRange &src, float delta, JoinType joinType, double miterLimit) +{ + C2::Paths64 out; + c2_offset_expolygons(src, delta, joinType, miterLimit, out); + return c2_to_polygons(out); +} + +template +ExPolygons c2_expolygons_offset_ex(const ExPolygonRange &src, float delta, JoinType joinType, double miterLimit) +{ + C2::PolyTree64 out; + c2_offset_expolygons(src, delta, joinType, miterLimit, out); + return c2_to_expolygons(out); +} + +template +Polygons c2_offset_lines(PathsProvider &&src, float delta, JoinType joinType, double miterLimit, EndType endType) +{ + C2::Paths64 out; + if (endType == etClosedPolygon) { + c2_offset_closed(std::forward(src), delta, joinType, miterLimit, out); + return c2_to_polygons(out); + } + const C2::EndType end = to_c2(endType); + const double shortest = std::abs(delta * ClipperOffsetShortestEdgeFactor); + C2::Paths64 paths; + paths.reserve(src.size()); + for (const Points &path : src) + append_offset_path(paths, path, shortest, end); + C2::ClipperOffset co; + c2_offset_setup(co, delta, joinType, miterLimit); + co.AddPaths(paths, to_c2(joinType), end); + co.Execute(delta, out); + return c2_to_polygons(out); +} + +template +C2::Paths64 c2_clip_paths(PathsProvider &&clip, ApplySafetyOffset do_safety_offset) +{ + if (do_safety_offset == ApplySafetyOffset::No) + return to_paths64(std::forward(clip)); + C2::Paths64 out; + c2_offset_closed(std::forward(clip), ClipperSafetyOffset, DefaultJoinType, DefaultMiterLimit, out); + return out; +} + +} // namespace + +Slic3r::Polygons offset(const Slic3r::Polygon &polygon, const float delta, JoinType joinType, double miterLimit) +{ + C2::Paths64 paths; + if (! append_offset_path(paths, polygon.points, std::abs(delta * ClipperOffsetShortestEdgeFactor), C2::EndType::Polygon)) + return {}; + const double area = C2::Area(paths.front()); + if (area == 0. && delta < 0.) + return {}; + C2::ClipperOffset co; + c2_offset_setup(co, delta, joinType, miterLimit); + co.AddPaths(paths, to_c2(joinType), C2::EndType::Polygon); + C2::Paths64 out; + // A CW polygon shrinks as a hole and stays CW. + co.Execute(area < 0. ? - delta : delta, out); + return c2_to_polygons(out); +} + +Slic3r::Polygons offset(const Slic3r::Polygons &polygons, const float delta, JoinType joinType, double miterLimit) +{ + C2::Paths64 out; + c2_offset_closed(ClipperUtils::PolygonsProvider(polygons), delta, joinType, miterLimit, out); + return c2_to_polygons(out); +} +Slic3r::ExPolygons offset_ex(const Slic3r::Polygons &polygons, const float delta, JoinType joinType, double miterLimit) +{ + C2::PolyTree64 out; + c2_offset_closed(ClipperUtils::PolygonsProvider(polygons), delta, joinType, miterLimit, out); + return c2_to_expolygons(out); +} + +Slic3r::Polygons offset(const Slic3r::Polyline &polyline, const float delta, JoinType joinType, double miterLimit, EndType end_type) + { assert(delta > 0); return c2_offset_lines(ClipperUtils::SinglePathProvider(polyline.points), delta, joinType, miterLimit, end_type); } + +Slic3r::Polygons offset(const Slic3r::Polyline3 &polyline, const float delta, JoinType joinType, double miterLimit, EndType end_type) { assert(delta > 0); - return to_polygons( - clipper_union( - raw_offset_polyline( - ClipperUtils::SinglePathProvider(polyline.to_polyline().points), - delta, - joinType, - miterLimit, - end_type))); + return c2_offset_lines(ClipperUtils::SinglePathProvider(polyline.to_polyline().points), delta, joinType, miterLimit, end_type); } -Slic3r::Polygons offset(const Slic3r::Polylines &polylines, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::EndType end_type) - { assert(delta > 0); return to_polygons(clipper_union(raw_offset_polyline(ClipperUtils::PolylinesProvider(polylines), delta, joinType, miterLimit, end_type))); } +Slic3r::Polygons offset(const Slic3r::Polylines &polylines, const float delta, JoinType joinType, double miterLimit, EndType end_type) + { assert(delta > 0); return c2_offset_lines(ClipperUtils::PolylinesProvider(polylines), delta, joinType, miterLimit, end_type); } -Polygons contour_to_polygons(const Polygon &polygon, const float line_width, ClipperLib::JoinType join_type, double miter_limit){ - assert(line_width > 1.f); return to_polygons(clipper_union( - raw_offset(ClipperUtils::SinglePathProvider(polygon.points), line_width/2, join_type, miter_limit, ClipperLib::etClosedLine)));} -Polygons contour_to_polygons(const Polygons &polygons, const float line_width, ClipperLib::JoinType join_type, double miter_limit){ - assert(line_width > 1.f); return to_polygons(clipper_union( - raw_offset(ClipperUtils::PolygonsProvider(polygons), line_width/2, join_type, miter_limit, ClipperLib::etClosedLine)));} +Polygons contour_to_polygons(const Polygon &polygon, const float line_width, JoinType join_type, double miter_limit) + { assert(line_width > 1.f); return c2_offset_lines(ClipperUtils::SinglePathProvider(polygon.points), line_width / 2, join_type, miter_limit, etClosedLine); } +Polygons contour_to_polygons(const Polygons &polygons, const float line_width, JoinType join_type, double miter_limit) + { assert(line_width > 1.f); return c2_offset_lines(ClipperUtils::PolygonsProvider(polygons), line_width / 2, join_type, miter_limit, etClosedLine); } -// returns number of expolygons collected (0 or 1). -static int offset_expolygon_inner(const Slic3r::ExPolygon &expoly, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::Paths &out) +Slic3r::Polygons offset(const Slic3r::ExPolygon &expolygon, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset(std::array{ &expolygon }, delta, joinType, miterLimit); } +Slic3r::Polygons offset(const Slic3r::ExPolygons &expolygons, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset(expolygons, delta, joinType, miterLimit); } +Slic3r::Polygons offset(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset(surfaces, delta, joinType, miterLimit); } +Slic3r::Polygons offset(const Slic3r::SurfacesPtr &surfaces, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset(surfaces, delta, joinType, miterLimit); } +Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygon &expolygon, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset_ex(std::array{ &expolygon }, delta, joinType, miterLimit); } +Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygons &expolygons, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset_ex(expolygons, delta, joinType, miterLimit); } +Slic3r::ExPolygons offset_ex(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset_ex(surfaces, delta, joinType, miterLimit); } +Slic3r::ExPolygons offset_ex(const Slic3r::SurfacesPtr &surfaces, const float delta, JoinType joinType, double miterLimit) + { return c2_expolygons_offset_ex(surfaces, delta, joinType, miterLimit); } + +Polygons offset2(const ExPolygons &expolygons, const float delta1, const float delta2, JoinType joinType, double miterLimit) { - // 1) Offset the outer contour. - ClipperLib::Paths contours; - { - ClipperLib::ClipperOffset co; - if (joinType == jtRound) - co.ArcTolerance = miterLimit; - else - co.MiterLimit = miterLimit; - co.ShortestEdgeLength = std::abs(delta * ClipperOffsetShortestEdgeFactor); - co.AddPath(expoly.contour.points, joinType, ClipperLib::etClosedPolygon); - co.Execute(contours, delta); - } - if (contours.empty()) - // No need to try to offset the holes. - return 0; - - if (expoly.holes.empty()) { - // No need to subtract holes from the offsetted expolygon, we are done. - append(out, std::move(contours)); - } else { - // 2) Offset the holes one by one, collect the offsetted holes. - ClipperLib::Paths holes; - { - for (const Polygon &hole : expoly.holes) { - ClipperLib::ClipperOffset co; - if (joinType == jtRound) - co.ArcTolerance = miterLimit; - else - co.MiterLimit = miterLimit; - co.ShortestEdgeLength = std::abs(delta * ClipperOffsetShortestEdgeFactor); - co.AddPath(hole.points, joinType, ClipperLib::etClosedPolygon); - ClipperLib::Paths out2; - // Execute reorients the contours so that the outer most contour has a positive area. Thus the output - // contours will be CCW oriented even though the input paths are CW oriented. - // Offset is applied after contour reorientation, thus the signum of the offset value is reversed. - co.Execute(out2, - delta); - append(holes, std::move(out2)); - } - } - - // 3) Subtract holes from the contours. - if (holes.empty()) { - // No hole remaining after an offset. Just copy the outer contour. - append(out, std::move(contours)); - } else if (delta < 0) { - // Negative offset. There is a chance, that the offsetted hole intersects the outer contour. - // Subtract the offsetted holes from the offsetted contours. - if (auto output = clipper_do(ClipperLib::ctDifference, contours, holes, ClipperLib::pftNonZero); ! output.empty()) { - append(out, std::move(output)); - } else { - // The offsetted holes have eaten up the offsetted outer contour. - return 0; - } - } else { - // Positive offset. As long as the Clipper offset does what one expects it to do, the offsetted hole will have a smaller - // area than the original hole or even disappear, therefore there will be no new intersections. - // Just collect the reversed holes. - out.reserve(contours.size() + holes.size()); - append(out, std::move(contours)); - // Reverse the holes in place. - for (size_t i = 0; i < holes.size(); ++ i) - std::reverse(holes[i].begin(), holes[i].end()); - append(out, std::move(holes)); - } - } - - return 1; + C2::Paths64 first, out; + c2_offset_expolygons(expolygons, delta1, joinType, miterLimit, first); + c2_offset_closed(first, delta2, joinType, miterLimit, out); + return c2_to_polygons(out); } - -static int offset_expolygon_inner(const Slic3r::Surface &surface, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::Paths &out) - { return offset_expolygon_inner(surface.expolygon, delta, joinType, miterLimit, out); } -static int offset_expolygon_inner(const Slic3r::Surface *surface, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib::Paths &out) - { return offset_expolygon_inner(surface->expolygon, delta, joinType, miterLimit, out); } - -ClipperLib::Paths expolygon_offset(const Slic3r::ExPolygon &expolygon, const float delta, ClipperLib::JoinType joinType, double miterLimit) +ExPolygons offset2_ex(const ExPolygons &expolygons, const float delta1, const float delta2, JoinType joinType, double miterLimit) { - ClipperLib::Paths out; - offset_expolygon_inner(expolygon, delta, joinType, miterLimit, out); - return out; + C2::Paths64 first; + C2::PolyTree64 out; + c2_offset_expolygons(expolygons, delta1, joinType, miterLimit, first); + c2_offset_closed(first, delta2, joinType, miterLimit, out); + return c2_to_expolygons(out); } - -// This is a safe variant of the polygons offset, tailored for multiple ExPolygons. -// It is required, that the input expolygons do not overlap and that the holes of each ExPolygon don't intersect with their respective outer contours. -// Each ExPolygon is offsetted separately. For outer offset, the offsetted ExPolygons shall be united outside of this function. -template -static std::pair expolygons_offset_raw(const ExPolygonVector &expolygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) +ExPolygons offset2_ex(const Surfaces &surfaces, const float delta1, const float delta2, JoinType joinType, double miterLimit) { - // Offsetted ExPolygons before they are united. - ClipperLib::Paths output; - output.reserve(expolygons.size()); - // How many non-empty offsetted expolygons were actually collected into output? - // If only one, then there is no need to do a final union. - size_t expolygons_collected = 0; - for (const auto &expoly : expolygons) - expolygons_collected += offset_expolygon_inner(expoly, delta, joinType, miterLimit, output); - return std::make_pair(std::move(output), expolygons_collected); -} - -// See comment on expolygon_offsets_raw. In addition, for positive offset the contours are united. -template -static ClipperLib::Paths expolygons_offset(const ExPolygonVector &expolygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) -{ - auto [output, expolygons_collected] = expolygons_offset_raw(expolygons, delta, joinType, miterLimit); - // Unite the offsetted expolygons. - return expolygons_collected > 1 && delta > 0 ? - // There is a chance that the outwards offsetted expolygons may intersect. Perform a union. - clipper_union(output) : - // Negative offset. The shrunk expolygons shall not mutually intersect. Just copy the output. - output; -} - -// See comment on expolygons_offset_raw. In addition, the polygons are always united to conver to polytree. -template -static ClipperLib::PolyTree expolygons_offset_pt(const ExPolygonVector &expolygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) -{ - auto [output, expolygons_collected] = expolygons_offset_raw(expolygons, delta, joinType, miterLimit); - // Unite the offsetted expolygons for both the - return clipper_union(output); -} - -Slic3r::Polygons offset(const Slic3r::ExPolygon &expolygon, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return to_polygons(expolygon_offset(expolygon, delta, joinType, miterLimit)); } -Slic3r::Polygons offset(const Slic3r::ExPolygons &expolygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return to_polygons(expolygons_offset(expolygons, delta, joinType, miterLimit)); } -Slic3r::Polygons offset(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return to_polygons(expolygons_offset(surfaces, delta, joinType, miterLimit)); } -Slic3r::Polygons offset(const Slic3r::SurfacesPtr &surfaces, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return to_polygons(expolygons_offset(surfaces, delta, joinType, miterLimit)); } -Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygon &expolygon, const float delta, ClipperLib::JoinType joinType, double miterLimit) - //FIXME one may spare one Clipper Union call. - { return ClipperPaths_to_Slic3rExPolygons(expolygon_offset(expolygon, delta, joinType, miterLimit)); } -Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygons &expolygons, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return PolyTreeToExPolygons(expolygons_offset_pt(expolygons, delta, joinType, miterLimit)); } -Slic3r::ExPolygons offset_ex(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return PolyTreeToExPolygons(expolygons_offset_pt(surfaces, delta, joinType, miterLimit)); } -Slic3r::ExPolygons offset_ex(const Slic3r::SurfacesPtr &surfaces, const float delta, ClipperLib::JoinType joinType, double miterLimit) - { return PolyTreeToExPolygons(expolygons_offset_pt(surfaces, delta, joinType, miterLimit)); } - -Polygons offset2(const ExPolygons &expolygons, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) -{ - return to_polygons(offset_paths(expolygons_offset(expolygons, delta1, joinType, miterLimit), delta2, joinType, miterLimit)); -} -ExPolygons offset2_ex(const ExPolygons &expolygons, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) -{ - return PolyTreeToExPolygons(offset_paths(expolygons_offset(expolygons, delta1, joinType, miterLimit), delta2, joinType, miterLimit)); -} -ExPolygons offset2_ex(const Surfaces &surfaces, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) -{ - //FIXME it may be more efficient to offset to_expolygons(surfaces) instead of to_polygons(surfaces). - return PolyTreeToExPolygons(offset_paths(expolygons_offset(surfaces, delta1, joinType, miterLimit), delta2, joinType, miterLimit)); + C2::Paths64 first; + C2::PolyTree64 out; + c2_offset_expolygons(surfaces, delta1, joinType, miterLimit, first); + c2_offset_closed(first, delta2, joinType, miterLimit, out); + return c2_to_expolygons(out); } // Offset outside, then inside produces morphological closing. All deltas should be positive. -Slic3r::Polygons closing(const Slic3r::Polygons &polygons, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) +Slic3r::Polygons closing(const Slic3r::Polygons &polygons, const float delta1, const float delta2, JoinType joinType, double miterLimit) { assert(delta1 > 0); assert(delta2 > 0); - return to_polygons(shrink_paths(expand_paths(ClipperUtils::PolygonsProvider(polygons), delta1, joinType, miterLimit), delta2, joinType, miterLimit)); + C2::Paths64 out; + c2_offset2_closed(ClipperUtils::PolygonsProvider(polygons), delta1, - delta2, joinType, miterLimit, out); + return c2_to_polygons(out); } -Slic3r::ExPolygons closing_ex(const Slic3r::Polygons &polygons, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) +Slic3r::ExPolygons closing_ex(const Slic3r::Polygons &polygons, const float delta1, const float delta2, JoinType joinType, double miterLimit) { assert(delta1 > 0); assert(delta2 > 0); - return PolyTreeToExPolygons(shrink_paths(expand_paths(ClipperUtils::PolygonsProvider(polygons), delta1, joinType, miterLimit), delta2, joinType, miterLimit)); + C2::PolyTree64 out; + c2_offset2_closed(ClipperUtils::PolygonsProvider(polygons), delta1, - delta2, joinType, miterLimit, out); + return c2_to_expolygons(out); } -Slic3r::ExPolygons closing_ex(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) +Slic3r::ExPolygons closing_ex(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, JoinType joinType, double miterLimit) { assert(delta1 > 0); assert(delta2 > 0); - //FIXME it may be more efficient to offset to_expolygons(surfaces) instead of to_polygons(surfaces). - return PolyTreeToExPolygons(shrink_paths(expand_paths(ClipperUtils::SurfacesProvider(surfaces), delta1, joinType, miterLimit), delta2, joinType, miterLimit)); + C2::PolyTree64 out; + c2_offset2_closed(ClipperUtils::SurfacesProvider(surfaces), delta1, - delta2, joinType, miterLimit, out); + return c2_to_expolygons(out); } // Offset inside, then outside produces morphological opening. All deltas should be positive. -Slic3r::Polygons opening(const Slic3r::Polygons &polygons, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) +Slic3r::Polygons opening(const Slic3r::Polygons &polygons, const float delta1, const float delta2, JoinType joinType, double miterLimit) { assert(delta1 > 0); assert(delta2 > 0); - return to_polygons(expand_paths(shrink_paths(ClipperUtils::PolygonsProvider(polygons), delta1, joinType, miterLimit), delta2, joinType, miterLimit)); + C2::Paths64 out; + c2_offset2_closed(ClipperUtils::PolygonsProvider(polygons), - delta1, delta2, joinType, miterLimit, out); + return c2_to_polygons(out); } -Slic3r::Polygons opening(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) +Slic3r::Polygons opening(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, JoinType joinType, double miterLimit) { assert(delta1 > 0); assert(delta2 > 0); - return to_polygons(expand_paths(shrink_paths(ClipperUtils::ExPolygonsProvider(expolygons), delta1, joinType, miterLimit), delta2, joinType, miterLimit)); + C2::Paths64 out; + c2_offset2_closed(ClipperUtils::ExPolygonsProvider(expolygons), - delta1, delta2, joinType, miterLimit, out); + return c2_to_polygons(out); } -Slic3r::Polygons opening(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, ClipperLib::JoinType joinType, double miterLimit) +Slic3r::Polygons opening(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, JoinType joinType, double miterLimit) { assert(delta1 > 0); assert(delta2 > 0); - //FIXME it may be more efficient to offset to_expolygons(surfaces) instead of to_polygons(surfaces). - return to_polygons(expand_paths(shrink_paths(ClipperUtils::SurfacesProvider(surfaces), delta1, joinType, miterLimit), delta2, joinType, miterLimit)); -} - -// Fix of #117: A large fractal pyramid takes ages to slice -// The Clipper library has difficulties processing overlapping polygons. -// Namely, the function ClipperLib::JoinCommonEdges() has potentially a terrible time complexity if the output -// of the operation is of the PolyTree type. -// This function implemenets a following workaround: -// 1) Peform the Clipper operation with the output to Paths. This method handles overlaps in a reasonable time. -// 2) Run Clipper Union once again to extract the PolyTree from the result of 1). -template -inline ClipperLib::PolyTree clipper_do_polytree( - const ClipperLib::ClipType clipType, - PathProvider1 &&subject, - PathProvider2 &&clip, - const ClipperLib::PolyFillType fillType) -{ - // Perform the operation with the output to input_subject. - // This pass does not generate a PolyTree, which is a very expensive operation with the current Clipper library - // if there are overapping edges. - if (auto output = clipper_do(clipType, subject, clip, fillType); ! output.empty()) - // Perform an additional Union operation to generate the PolyTree ordering. - return clipper_union(output, fillType); - return ClipperLib::PolyTree(); -} -template -inline ClipperLib::PolyTree clipper_do_polytree( - const ClipperLib::ClipType clipType, - PathProvider1 &&subject, - PathProvider2 &&clip, - const ClipperLib::PolyFillType fillType, - const ApplySafetyOffset do_safety_offset) -{ - assert(do_safety_offset == ApplySafetyOffset::No || clipType != ClipperLib::ctUnion); - return do_safety_offset == ApplySafetyOffset::Yes ? - clipper_do_polytree(clipType, std::forward(subject), safety_offset(std::forward(clip)), fillType) : - clipper_do_polytree(clipType, std::forward(subject), std::forward(clip), fillType); + C2::Paths64 out; + c2_offset2_closed(ClipperUtils::SurfacesProvider(surfaces), - delta1, delta2, joinType, miterLimit, out); + return c2_to_polygons(out); } template -static inline Polygons _clipper(ClipperLib::ClipType clipType, TSubj &&subject, TClip &&clip, ApplySafetyOffset do_safety_offset) +static inline Polygons _clipper(ClipType clipType, TSubj &&subject, TClip &&clip, ApplySafetyOffset do_safety_offset) { - return to_polygons(clipper_do(clipType, std::forward(subject), std::forward(clip), ClipperLib::pftNonZero, do_safety_offset)); + // Safety offset only allowed on intersection and difference. + assert(do_safety_offset == ApplySafetyOffset::No || clipType != ctUnion); + C2::Paths64 out; + c2_clip(to_c2(clipType), to_paths64(std::forward(subject)), c2_clip_paths(std::forward(clip), do_safety_offset), C2::FillRule::NonZero, out); + return c2_to_polygons(out); } Slic3r::Polygons diff(const Slic3r::Polygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); } + { return _clipper(ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); } Slic3r::Polygons diff(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons diff_clipped(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) { return diff(subject, ClipperUtils::clip_clipper_polygons_with_subject_bbox(clip, get_extents(subject).inflated(SCALED_EPSILON)), do_safety_offset); } Slic3r::ExPolygons diff_clipped(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) @@ -690,31 +645,37 @@ Slic3r::ExPolygons diff_clipped(const Slic3r::ExPolygons & subject, const Slic3r return diff_ex(subject, ClipperUtils::clip_clipper_polygons_with_subject_bbox(clip, get_extents(subject).inflated(SCALED_EPSILON)), do_safety_offset); } Slic3r::Polygons diff(const Slic3r::Polygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons diff(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons diff(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons diff(const Slic3r::Surfaces &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::Polygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); } Slic3r::Polygons intersection_clipped(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) { return intersection(subject, ClipperUtils::clip_clipper_polygons_with_subject_bbox(clip, get_extents(subject).inflated(SCALED_EPSILON)), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } +Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, PolyFillType fill_type) +{ + C2::Paths64 out; + c2_clip(C2::ClipType::Intersection, to_paths64(ClipperUtils::PolygonsProvider(subject)), to_paths64(ClipperUtils::PolygonsProvider(clip)), to_c2(fill_type), out); + return c2_to_polygons(out); +} Slic3r::Polygons intersection(const Slic3r::ExPolygon &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::Surfaces &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::Polygons intersection(const Slic3r::Surfaces &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper(ClipperLib::ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper(ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } // BBS Slic3r::Polygons intersection(const Slic3r::Polygons& subject, const Slic3r::Polygon& clip, ApplySafetyOffset do_safety_offset) { @@ -724,11 +685,16 @@ Slic3r::Polygons intersection(const Slic3r::Polygons& subject, const Slic3r::Pol } Slic3r::Polygons union_(const Slic3r::Polygons &subject) - { return _clipper(ClipperLib::ctUnion, ClipperUtils::PolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No); } + { return _clipper(ctUnion, ClipperUtils::PolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No); } Slic3r::Polygons union_(const Slic3r::ExPolygons &subject) - { return _clipper(ClipperLib::ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No); } -Slic3r::Polygons union_(const Slic3r::Polygons &subject, const ClipperLib::PolyFillType fillType) - { return to_polygons(clipper_do(ClipperLib::ctUnion, ClipperUtils::PolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), fillType, ApplySafetyOffset::No)); } + { return _clipper(ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No); } +Slic3r::Polygons union_(const Slic3r::Polygons &subject, const PolyFillType fillType) +{ + C2::Paths64 out; + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::PolygonsProvider(subject)), {}, to_c2(fillType), out); + return c2_to_polygons(out); +} + Slic3r::Polygons union_(const Slic3r::Polygons &subject, const Slic3r::Polygons &subject2) { // BBS @@ -738,38 +704,44 @@ Slic3r::Polygons union_(const Slic3r::Polygons &subject, const Slic3r::Polygons return union_(polys); } +// Clipper2 builds the PolyTree in one pass without Clipper1's slowdown on shared edges (#117). template -static ExPolygons _clipper_ex(ClipperLib::ClipType clipType, TSubject &&subject, TClip &&clip, ApplySafetyOffset do_safety_offset, ClipperLib::PolyFillType fill_type = ClipperLib::pftNonZero) - { return PolyTreeToExPolygons(clipper_do_polytree(clipType, std::forward(subject), std::forward(clip), fill_type, do_safety_offset)); } +static ExPolygons _clipper_ex(ClipType clipType, TSubject &&subject, TClip &&clip, ApplySafetyOffset do_safety_offset, PolyFillType fill_type = pftNonZero) +{ + assert(do_safety_offset == ApplySafetyOffset::No || clipType != ctUnion); + C2::PolyTree64 out; + c2_clip(to_c2(clipType), to_paths64(std::forward(subject)), c2_clip_paths(std::forward(clip), do_safety_offset), to_c2(fill_type), out); + return c2_to_expolygons(out); +} Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::Polygon &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::Polygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::SinglePathProvider(clip.points), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::Surfaces &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::Surfaces &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::Surfaces &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::SurfacesProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::SurfacesPtr &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::SurfacesPtrProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::SurfacesPtrProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons diff_ex(const Slic3r::SurfacesPtr &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctDifference, ClipperUtils::SurfacesPtrProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctDifference, ClipperUtils::SurfacesPtrProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } // BBS inline Slic3r::ExPolygons diff_ex(const Slic3r::Polygon& subject, const Slic3r::Polygons& clip, ApplySafetyOffset do_safety_offset) { @@ -790,38 +762,39 @@ inline Slic3r::ExPolygons diff_ex(const Slic3r::Polygon& subject, const Slic3r:: } Slic3r::ExPolygons intersection_ex(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::ExPolygon &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::ExPolygon& subject, const Slic3r::ExPolygon& clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::Polygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::ExPolygons& subject, const Slic3r::ExPolygon& clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset);} + { return _clipper_ex(ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset);} Slic3r::ExPolygons intersection_ex(const Slic3r::ExPolygon& subject, const Slic3r::ExPolygons& clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset);} + { return _clipper_ex(ctIntersection, ClipperUtils::ExPolygonProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset);} Slic3r::ExPolygons intersection_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::Surfaces &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::PolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::Surfaces &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::Surfaces &subject, const Slic3r::Surfaces &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::SurfacesProvider(subject), ClipperUtils::SurfacesProvider(clip), do_safety_offset); } Slic3r::ExPolygons intersection_ex(const Slic3r::SurfacesPtr &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) - { return _clipper_ex(ClipperLib::ctIntersection, ClipperUtils::SurfacesPtrProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } + { return _clipper_ex(ctIntersection, ClipperUtils::SurfacesPtrProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } // May be used to "heal" unusual models (3DLabPrints etc.) by providing fill_type (pftEvenOdd, pftNonZero, pftPositive, pftNegative). -Slic3r::ExPolygons union_ex(const Slic3r::Polygons &subject, ClipperLib::PolyFillType fill_type) - { return _clipper_ex(ClipperLib::ctUnion, ClipperUtils::PolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No, fill_type); } +Slic3r::ExPolygons union_ex(const Slic3r::Polygons &subject, PolyFillType fill_type) + { return _clipper_ex(ctUnion, ClipperUtils::PolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No, fill_type); } Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons &subject) - { return PolyTreeToExPolygons(clipper_do_polytree(ClipperLib::ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ClipperLib::pftNonZero)); } + { return _clipper_ex(ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No); } Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &subject2) - { return PolyTreeToExPolygons(clipper_do_polytree(ClipperLib::ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(subject2), ClipperLib::pftNonZero)); } + { return _clipper_ex(ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::PolygonsProvider(subject2), ApplySafetyOffset::No); } Slic3r::ExPolygons union_ex(const Slic3r::Surfaces &subject) - { return PolyTreeToExPolygons(clipper_do_polytree(ClipperLib::ctUnion, ClipperUtils::SurfacesProvider(subject), ClipperUtils::EmptyPathsProvider(), ClipperLib::pftNonZero)); } + { return _clipper_ex(ctUnion, ClipperUtils::SurfacesProvider(subject), ClipperUtils::EmptyPathsProvider(), ApplySafetyOffset::No); } + // BBS Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons& poly1, const Slic3r::ExPolygons& poly2, bool safety_offset_) { @@ -832,22 +805,15 @@ Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons& poly1, const Slic3r::ExPol } Slic3r::ExPolygons xor_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset) { - return _clipper_ex(ClipperLib::ctXor, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); + return _clipper_ex(ctXor, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonProvider(clip), do_safety_offset); } Slic3r::ExPolygons xor_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset) { - return _clipper_ex(ClipperLib::ctXor, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); + return _clipper_ex(ctXor, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::ExPolygonsProvider(clip), do_safety_offset); } template -Polylines _clipper_pl_open(ClipperLib::ClipType clipType, PathsProvider1 &&subject, PathsProvider2 &&clip) -{ - ClipperLib::Clipper clipper; - clipper.AddPaths(std::forward(subject), ClipperLib::ptSubject, false); - clipper.AddPaths(std::forward(clip), ClipperLib::ptClip, true); - ClipperLib::PolyTree retval; - clipper.Execute(clipType, retval, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - return PolyTreeToPolylines(std::move(retval)); -} +Polylines _clipper_pl_open(ClipType clipType, PathsProvider1 &&subject, PathsProvider2 &&clip) + { return c2_clip_open(to_c2(clipType), to_paths64(std::forward(subject)), to_paths64(std::forward(clip))); } // If the split_at_first_point() call above happens to split the polygon inside the clipping area // we would get two consecutive polylines instead of a single one, so we go through them in order @@ -888,51 +854,52 @@ static void _clipper_pl_recombine(Polylines &polylines) } template -Polylines _clipper_pl_closed(ClipperLib::ClipType clipType, PathProvider1 &&subject, PathProvider2 &&clip) +Polylines _clipper_pl_closed(ClipType clipType, PathProvider1 &&subject, PathProvider2 &&clip) { // Transform input polygons into open paths. - ClipperLib::Paths paths; + C2::Paths64 paths; paths.reserve(subject.size()); for (const Points &poly : subject) { // Emplace polygon, duplicate the 1st point. - paths.push_back({}); - ClipperLib::Path &path = paths.back(); + C2::Path64 &path = paths.emplace_back(); path.reserve(poly.size() + 1); - path = poly; - path.emplace_back(poly.front()); + for (const Point &pt : poly) + path.emplace_back(pt.x(), pt.y()); + if (! poly.empty()) + path.emplace_back(poly.front().x(), poly.front().y()); } // perform clipping - Polylines retval = _clipper_pl_open(clipType, paths, std::forward(clip)); + Polylines retval = c2_clip_open(to_c2(clipType), paths, to_paths64(std::forward(clip))); _clipper_pl_recombine(retval); return retval; } Slic3r::Polylines diff_pl(const Slic3r::Polyline& subject, const Slic3r::Polygons& clip) - { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::PolygonsProvider(clip)); } + { return _clipper_pl_open(ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::PolygonsProvider(clip)); } Slic3r::Polylines diff_pl(const Slic3r::Polylines &subject, const Slic3r::Polygons &clip) - { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::PolygonsProvider(clip)); } + { return _clipper_pl_open(ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::PolygonsProvider(clip)); } Slic3r::Polylines diff_pl(const Slic3r::Polyline &subject, const Slic3r::ExPolygon &clip) - { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonProvider(clip)); } + { return _clipper_pl_open(ctDifference, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonProvider(clip)); } Slic3r::Polylines diff_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygon &clip) - { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonProvider(clip)); } + { return _clipper_pl_open(ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonProvider(clip)); } Slic3r::Polylines diff_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygons &clip) - { return _clipper_pl_open(ClipperLib::ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonsProvider(clip)); } + { return _clipper_pl_open(ctDifference, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonsProvider(clip)); } Slic3r::Polylines diff_pl(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip) - { return _clipper_pl_closed(ClipperLib::ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip)); } + { return _clipper_pl_closed(ctDifference, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip)); } Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::Polygon &clip) - { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::SinglePathProvider(clip.points)); } + { return _clipper_pl_open(ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::SinglePathProvider(clip.points)); } Slic3r::Polylines intersection_pl(const Slic3r::Polyline &subject, const Slic3r::ExPolygon &clip) - { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonProvider(clip)); } + { return _clipper_pl_open(ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::ExPolygonProvider(clip)); } Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygon &clip) - { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonProvider(clip)); } + { return _clipper_pl_open(ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonProvider(clip)); } Slic3r::Polylines intersection_pl(const Slic3r::Polyline &subject, const Slic3r::Polygons &clip) - { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::PolygonsProvider(clip)); } + { return _clipper_pl_open(ctIntersection, ClipperUtils::SinglePathProvider(subject.points), ClipperUtils::PolygonsProvider(clip)); } Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::Polygons &clip) - { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::PolygonsProvider(clip)); } + { return _clipper_pl_open(ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::PolygonsProvider(clip)); } Slic3r::Polylines intersection_pl(const Slic3r::Polylines &subject, const Slic3r::ExPolygons &clip) - { return _clipper_pl_open(ClipperLib::ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonsProvider(clip)); } + { return _clipper_pl_open(ctIntersection, ClipperUtils::PolylinesProvider(subject), ClipperUtils::ExPolygonsProvider(clip)); } Slic3r::Polylines intersection_pl(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip) - { return _clipper_pl_closed(ClipperLib::ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip)); } + { return _clipper_pl_closed(ctIntersection, ClipperUtils::PolygonsProvider(subject), ClipperUtils::PolygonsProvider(clip)); } // Orca: Sort and orient open polyline fragments produced by clipping `source` with // intersection_pl(), so that they run in the same order and direction as the source @@ -1005,7 +972,7 @@ void restore_source_path_order(const Slic3r::Polyline &source, Slic3r::Polylines fragments = std::move(sorted); } -Lines _clipper_ln(ClipperLib::ClipType clipType, const Lines &subject, const Polygons &clip) +Lines _clipper_ln(ClipType clipType, const Lines &subject, const Polygons &clip) { // convert Lines to Polylines Polylines polylines; @@ -1025,162 +992,83 @@ Lines _clipper_ln(ClipperLib::ClipType clipType, const Lines &subject, const Pol return retval; } -// Convert polygons / expolygons into ClipperLib::PolyTree using ClipperLib::pftEvenOdd, thus union will NOT be performed. -// If the contours are not intersecting, their orientation shall not be modified by union_pt(). -ClipperLib::PolyTree union_pt(const Polygons &subject) -{ - return clipper_do(ClipperLib::ctUnion, ClipperUtils::PolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ClipperLib::pftEvenOdd); -} -ClipperLib::PolyTree union_pt(const ExPolygons &subject) -{ - return clipper_do(ClipperLib::ctUnion, ClipperUtils::ExPolygonsProvider(subject), ClipperUtils::EmptyPathsProvider(), ClipperLib::pftEvenOdd); -} - -// Simple spatial ordering of Polynodes -ClipperLib::PolyNodes order_nodes(const ClipperLib::PolyNodes &nodes) +static void traverse_pt_outside_in(const C2::PolyPath64 &parent, Polygons *retval) { // collect ordering points Points ordering_points; - ordering_points.reserve(nodes.size()); - - for (const ClipperLib::PolyNode *node : nodes) - ordering_points.emplace_back( - Point(node->Contour.front().x(), node->Contour.front().y())); - - // perform the ordering - ClipperLib::PolyNodes ordered_nodes = - chain_clipper_polynodes(ordering_points, nodes); - - return ordered_nodes; -} - -static void traverse_pt_noholes(const ClipperLib::PolyNodes &nodes, Polygons *out) -{ - foreach_node(nodes, [&out](const ClipperLib::PolyNode *node) - { - traverse_pt_noholes(node->Childs, out); - out->emplace_back(node->Contour); - if (node->IsHole()) out->back().reverse(); // ccw - }); -} - -static void traverse_pt_outside_in(ClipperLib::PolyNodes &&nodes, Polygons *retval) -{ - // collect ordering points - Points ordering_points; - ordering_points.reserve(nodes.size()); - for (const ClipperLib::PolyNode *node : nodes) - ordering_points.emplace_back(node->Contour.front().x(), node->Contour.front().y()); + ordering_points.reserve(parent.Count()); + for (const auto &node : parent) + ordering_points.emplace_back(node->Polygon().front().x, node->Polygon().front().y); // Perform the ordering, push results recursively. - //FIXME pass the last point to chain_clipper_polynodes? - for (ClipperLib::PolyNode *node : chain_clipper_polynodes(ordering_points, nodes)) { - retval->emplace_back(std::move(node->Contour)); - if (node->IsHole()) + //FIXME pass the last point to chain_points? + for (size_t idx : chain_points(ordering_points)) { + const C2::PolyPath64 &node = *parent.Child(idx); + retval->emplace_back().points = c2_to_points(node.Polygon()); + if (node.IsHole()) // Orient a hole, which is clockwise oriented, to CCW. retval->back().reverse(); // traverse the next depth - traverse_pt_outside_in(std::move(node->Childs), retval); + traverse_pt_outside_in(node, retval); } } Polygons union_pt_chained_outside_in(const Polygons &subject) { + C2::PolyTree64 tree; + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::PolygonsProvider(subject)), {}, C2::FillRule::EvenOdd, tree); Polygons retval; - traverse_pt_outside_in(union_pt(subject).Childs, &retval); + traverse_pt_outside_in(tree, &retval); return retval; } +// Clipper2 unions are strictly simple, like Clipper1's with StrictlySimple(true). Polygons simplify_polygons(const Polygons &subject) { - ClipperLib::Paths output; - ClipperLib::Clipper c; -// c.PreserveCollinear(true); - //FIXME StrictlySimple is very expensive! Is it needed? - c.StrictlySimple(true); - c.AddPaths(ClipperUtils::PolygonsProvider(subject), ClipperLib::ptSubject, true); - c.Execute(ClipperLib::ctUnion, output, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - - // convert into Slic3r polygons - return to_polygons(std::move(output)); + C2::Paths64 out; + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::PolygonsProvider(subject)), {}, C2::FillRule::NonZero, out); + return c2_to_polygons(out); } ExPolygons simplify_polygons_ex(const Polygons &subject) { - ClipperLib::PolyTree polytree; - ClipperLib::Clipper c; -// c.PreserveCollinear(true); - //FIXME StrictlySimple is very expensive! Is it needed? - c.StrictlySimple(true); - c.AddPaths(ClipperUtils::PolygonsProvider(subject), ClipperLib::ptSubject, true); - c.Execute(ClipperLib::ctUnion, polytree, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - - // convert into ExPolygons - return PolyTreeToExPolygons(std::move(polytree)); + C2::PolyTree64 out; + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::PolygonsProvider(subject)), {}, C2::FillRule::NonZero, out); + return c2_to_expolygons(out); } Polygons top_level_islands(const Slic3r::Polygons &polygons) { - // init Clipper - ClipperLib::Clipper clipper; - clipper.Clear(); - // perform union - clipper.AddPaths(ClipperUtils::PolygonsProvider(polygons), ClipperLib::ptSubject, true); - ClipperLib::PolyTree polytree; - clipper.Execute(ClipperLib::ctUnion, polytree, ClipperLib::pftEvenOdd, ClipperLib::pftEvenOdd); + C2::PolyTree64 tree; + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::PolygonsProvider(polygons)), {}, C2::FillRule::EvenOdd, tree); // Convert only the top level islands to the output. Polygons out; - out.reserve(polytree.ChildCount()); - for (int i = 0; i < polytree.ChildCount(); ++i) - out.emplace_back(std::move(polytree.Childs[i]->Contour)); + out.reserve(tree.Count()); + for (const auto &island : tree) + out.emplace_back().points = c2_to_points(island->Polygon()); return out; } -// Outer offset shall not split the input contour into multiples. It is expected, that the solution will be non empty and it will contain just a single polygon. -ClipperLib::Paths fix_after_outer_offset( - const ClipperLib::Path &input, - // combination of default prameters to correspond to void ClipperOffset::Execute(Paths& solution, double delta) - // to produce a CCW output contour from CCW input contour for a positive offset. - ClipperLib::PolyFillType filltype, // = ClipperLib::pftPositive - bool reverse_result) // = false +ExPolygons top_level_expolygons(const ExPolygons &expolygons, ExPolygons *nested) { - ClipperLib::Paths solution; - if (! input.empty()) { - ClipperLib::Clipper clipper; - clipper.AddPath(input, ClipperLib::ptSubject, true); - clipper.ReverseSolution(reverse_result); - clipper.Execute(ClipperLib::ctUnion, solution, filltype, filltype); - } - return solution; + C2::PolyTree64 tree; + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::ExPolygonsProvider(expolygons)), {}, C2::FillRule::EvenOdd, tree); + ExPolygons out; + out.reserve(tree.Count()); + for (const auto &outer : tree) { + ExPolygon &expoly = out.emplace_back(); + expoly.contour.points = c2_to_points(outer->Polygon()); + for (const auto &hole : *outer) { + expoly.holes.emplace_back().points = c2_to_points(hole->Polygon()); + if (nested) + for (const auto &island : *hole) + c2_append_expolygons(*island, *nested); + } + } + return out; } -// Inner offset may split the source contour into multiple contours, but one resulting contour shall not lie inside the other. -ClipperLib::Paths fix_after_inner_offset( - const ClipperLib::Path &input, - // combination of default prameters to correspond to void ClipperOffset::Execute(Paths& solution, double delta) - // to produce a CCW output contour from CCW input contour for a negative offset. - ClipperLib::PolyFillType filltype, // = ClipperLib::pftNegative - bool reverse_result) // = true -{ - ClipperLib::Paths solution; - if (! input.empty()) { - ClipperLib::Clipper clipper; - clipper.AddPath(input, ClipperLib::ptSubject, true); - ClipperLib::IntRect r = clipper.GetBounds(); - r.left -= 10; r.top -= 10; r.right += 10; r.bottom += 10; - if (filltype == ClipperLib::pftPositive) - clipper.AddPath({ ClipperLib::IntPoint(r.left, r.bottom), ClipperLib::IntPoint(r.left, r.top), ClipperLib::IntPoint(r.right, r.top), ClipperLib::IntPoint(r.right, r.bottom) }, ClipperLib::ptSubject, true); - else - clipper.AddPath({ ClipperLib::IntPoint(r.left, r.bottom), ClipperLib::IntPoint(r.right, r.bottom), ClipperLib::IntPoint(r.right, r.top), ClipperLib::IntPoint(r.left, r.top) }, ClipperLib::ptSubject, true); - clipper.ReverseSolution(reverse_result); - clipper.Execute(ClipperLib::ctUnion, solution, filltype, filltype); - if (! solution.empty()) - solution.erase(solution.begin()); - } - return solution; -} - -ClipperLib::Path mittered_offset_path_scaled(const Points &contour, const std::vector &deltas, double miter_limit) +Points mittered_offset_path_scaled(const Points &contour, const std::vector &deltas, double miter_limit) { assert(contour.size() == deltas.size()); @@ -1196,7 +1084,7 @@ ClipperLib::Path mittered_offset_path_scaled(const Points &contour, const std::v assert(! (negative && positive)); #endif /* NDEBUG */ - ClipperLib::Path out; + Points out; if (deltas.size() > 2) { @@ -1208,10 +1096,10 @@ ClipperLib::Path mittered_offset_path_scaled(const Points &contour, const std::v // perpenduclar vector auto perp = [](const Vec2d &v) -> Vec2d { return Vec2d(v.y(), - v.x()); }; - // Add a new point to the output, scale by CLIPPER_OFFSET_SCALE and round to ClipperLib::cInt. + // Add a new point to the output, rounded to coord_t. auto add_offset_point = [&out](Vec2d pt) { pt += Vec2d(0.5 - (pt.x() < 0), 0.5 - (pt.y() < 0)); - out.emplace_back(ClipperLib::cInt(pt.x()), ClipperLib::cInt(pt.y())); + out.emplace_back(coord_t(pt.x()), coord_t(pt.y())); }; // Minimum edge length, squared. @@ -1301,25 +1189,41 @@ ClipperLib::Path mittered_offset_path_scaled(const Points &contour, const std::v } } -#if 0 - { - ClipperLib::Path polytmp(out); - unscaleClipperPolygon(polytmp); - Slic3r::Polygon offsetted(std::move(polytmp)); - BoundingBox bbox = get_extents(contour); - bbox.merge(get_extents(offsetted)); - static int iRun = 0; - SVG svg(debug_out_path("mittered_offset_path_scaled-%d.svg", iRun ++).c_str(), bbox); - svg.draw_outline(Polygon(contour), "blue", scale_(0.01)); - svg.draw_outline(offsetted, "red", scale_(0.01)); - svg.draw(contour, "blue", scale_(0.03)); - svg.draw((Points)offsetted, "blue", scale_(0.03)); - } -#endif - return out; } +// Clipper1 united the raw contour offsets with the positive rule and the raw hole offsets with the negative rule. +template +static void variable_offset(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit, TOut &out) +{ + auto unite = [](const Points &raw, C2::FillRule fill) { + C2::Paths64 united; + if (! raw.empty()) + c2_clip(C2::ClipType::Union, to_paths64(ClipperUtils::SinglePathProvider(raw)), {}, fill, united); + return united; + }; + + // 1) Offset the outer contour. + C2::Paths64 contours = unite(mittered_offset_path_scaled(expoly.contour.points, deltas.front(), miter_limit), C2::FillRule::Positive); +#ifndef NDEBUG + for (auto &c : contours) + assert(C2::Area(c) > 0.); +#endif /* NDEBUG */ + + // 2) Offset the holes one by one, collect the results. + C2::Paths64 holes; + holes.reserve(expoly.holes.size()); + for (const Polygon& hole : expoly.holes) + append(holes, unite(mittered_offset_path_scaled(hole.points, deltas[1 + &hole - expoly.holes.data()], miter_limit), C2::FillRule::Negative)); +#ifndef NDEBUG + for (auto &c : holes) + assert(C2::Area(c) > 0.); +#endif /* NDEBUG */ + + // 3) Subtract holes from the contours. + c2_clip(C2::ClipType::Difference, contours, holes, C2::FillRule::NonZero, out); +} + Polygons variable_offset_inner(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit) { #ifndef NDEBUG @@ -1330,126 +1234,41 @@ Polygons variable_offset_inner(const ExPolygon &expoly, const std::vector 0.); -#endif /* NDEBUG */ - - // 2) Offset the holes one by one, collect the results. - ClipperLib::Paths holes; - holes.reserve(expoly.holes.size()); - for (const Polygon& hole : expoly.holes) - append(holes, fix_after_outer_offset(mittered_offset_path_scaled(hole.points, deltas[1 + &hole - expoly.holes.data()], miter_limit), ClipperLib::pftNegative, false)); -#ifndef NDEBUG - for (auto &c : holes) - assert(ClipperLib::Area(c) > 0.); -#endif /* NDEBUG */ - - // 3) Subtract holes from the contours. - ClipperLib::Paths output; - if (holes.empty()) - output = std::move(contours); - else { - ClipperLib::Clipper clipper; - clipper.Clear(); - clipper.AddPaths(contours, ClipperLib::ptSubject, true); - clipper.AddPaths(holes, ClipperLib::ptClip, true); - clipper.Execute(ClipperLib::ctDifference, output, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - } - - return to_polygons(std::move(output)); + C2::Paths64 out; + variable_offset(expoly, deltas, miter_limit, out); + return c2_to_polygons(out); } Polygons variable_offset_outer(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit) { #ifndef NDEBUG - // Verify that the deltas are all non positive. -for (const std::vector& ds : deltas) + // Verify that the deltas are all non negative. + for (const std::vector& ds : deltas) for (float delta : ds) assert(delta >= 0.); assert(expoly.holes.size() + 1 == deltas.size()); #endif /* NDEBUG */ - // 1) Offset the outer contour. - ClipperLib::Paths contours = fix_after_outer_offset(mittered_offset_path_scaled(expoly.contour.points, deltas.front(), miter_limit), ClipperLib::pftPositive, false); -#ifndef NDEBUG - for (auto &c : contours) - assert(ClipperLib::Area(c) > 0.); -#endif /* NDEBUG */ - - // 2) Offset the holes one by one, collect the results. - ClipperLib::Paths holes; - holes.reserve(expoly.holes.size()); - for (const Polygon& hole : expoly.holes) - append(holes, fix_after_inner_offset(mittered_offset_path_scaled(hole.points, deltas[1 + &hole - expoly.holes.data()], miter_limit), ClipperLib::pftPositive, true)); -#ifndef NDEBUG - for (auto &c : holes) - assert(ClipperLib::Area(c) > 0.); -#endif /* NDEBUG */ - - // 3) Subtract holes from the contours. - ClipperLib::Paths output; - if (holes.empty()) - output = std::move(contours); - else { - ClipperLib::Clipper clipper; - clipper.Clear(); - clipper.AddPaths(contours, ClipperLib::ptSubject, true); - clipper.AddPaths(holes, ClipperLib::ptClip, true); - clipper.Execute(ClipperLib::ctDifference, output, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - } - - return to_polygons(std::move(output)); + C2::Paths64 out; + variable_offset(expoly, deltas, miter_limit, out); + return c2_to_polygons(out); } ExPolygons variable_offset_outer_ex(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit) { #ifndef NDEBUG - // Verify that the deltas are all non positive. -for (const std::vector& ds : deltas) + // Verify that the deltas are all non negative. + for (const std::vector& ds : deltas) for (float delta : ds) assert(delta >= 0.); assert(expoly.holes.size() + 1 == deltas.size()); #endif /* NDEBUG */ - // 1) Offset the outer contour. - ClipperLib::Paths contours = fix_after_outer_offset(mittered_offset_path_scaled(expoly.contour.points, deltas.front(), miter_limit), ClipperLib::pftPositive, false); -#ifndef NDEBUG - for (auto &c : contours) - assert(ClipperLib::Area(c) > 0.); -#endif /* NDEBUG */ - - // 2) Offset the holes one by one, collect the results. - ClipperLib::Paths holes; - holes.reserve(expoly.holes.size()); - for (const Polygon& hole : expoly.holes) - append(holes, fix_after_inner_offset(mittered_offset_path_scaled(hole.points, deltas[1 + &hole - expoly.holes.data()], miter_limit), ClipperLib::pftPositive, true)); -#ifndef NDEBUG - for (auto &c : holes) - assert(ClipperLib::Area(c) > 0.); -#endif /* NDEBUG */ - - // 3) Subtract holes from the contours. - ExPolygons output; - if (holes.empty()) { - output.reserve(contours.size()); - for (ClipperLib::Path &path : contours) - output.emplace_back(std::move(path)); - } else { - ClipperLib::Clipper clipper; - clipper.AddPaths(contours, ClipperLib::ptSubject, true); - clipper.AddPaths(holes, ClipperLib::ptClip, true); - ClipperLib::PolyTree polytree; - clipper.Execute(ClipperLib::ctDifference, polytree, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - output = PolyTreeToExPolygons(std::move(polytree)); - } - - return output; + C2::PolyTree64 out; + variable_offset(expoly, deltas, miter_limit, out); + return c2_to_expolygons(out); } - ExPolygons variable_offset_inner_ex(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit) { #ifndef NDEBUG @@ -1460,39 +1279,9 @@ ExPolygons variable_offset_inner_ex(const ExPolygon &expoly, const std::vector 0.); -#endif /* NDEBUG */ - - // 2) Offset the holes one by one, collect the results. - ClipperLib::Paths holes; - holes.reserve(expoly.holes.size()); - for (const Polygon& hole : expoly.holes) - append(holes, fix_after_outer_offset(mittered_offset_path_scaled(hole.points, deltas[1 + &hole - expoly.holes.data()], miter_limit), ClipperLib::pftNegative, false)); -#ifndef NDEBUG - for (auto &c : holes) - assert(ClipperLib::Area(c) > 0.); -#endif /* NDEBUG */ - - // 3) Subtract holes from the contours. - ExPolygons output; - if (holes.empty()) { - output.reserve(contours.size()); - for (ClipperLib::Path &path : contours) - output.emplace_back(std::move(path)); - } else { - ClipperLib::Clipper clipper; - clipper.AddPaths(contours, ClipperLib::ptSubject, true); - clipper.AddPaths(holes, ClipperLib::ptClip, true); - ClipperLib::PolyTree polytree; - clipper.Execute(ClipperLib::ctDifference, polytree, ClipperLib::pftNonZero, ClipperLib::pftNonZero); - output = PolyTreeToExPolygons(std::move(polytree)); - } - - return output; + C2::PolyTree64 out; + variable_offset(expoly, deltas, miter_limit, out); + return c2_to_expolygons(out); } Pointfs make_counter_clockwise(const Pointfs& pointfs) diff --git a/src/libslic3r/ClipperUtils.hpp b/src/libslic3r/ClipperUtils.hpp index 5ed161c27a..5f05c8e3c4 100644 --- a/src/libslic3r/ClipperUtils.hpp +++ b/src/libslic3r/ClipperUtils.hpp @@ -2,23 +2,32 @@ #define slic3r_ClipperUtils_hpp_ #include "libslic3r.h" -#include "clipper.hpp" #include "ExPolygon.hpp" #include "Polygon.hpp" #include "Surface.hpp" +namespace Slic3r { + +// Offset joins and ends, fill rules and boolean operations, named as in Clipper1. +enum JoinType { jtSquare, jtRound, jtMiter }; +enum EndType { etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound }; +enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }; +enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }; + +} // namespace Slic3r + // import these wherever we're included -using Slic3r::ClipperLib::jtMiter; -using Slic3r::ClipperLib::jtRound; -using Slic3r::ClipperLib::jtSquare; +using Slic3r::jtMiter; +using Slic3r::jtRound; +using Slic3r::jtSquare; namespace Slic3r { static constexpr const float ClipperSafetyOffset = 10.f; -static constexpr const Slic3r::ClipperLib::JoinType DefaultJoinType = Slic3r::ClipperLib::jtMiter; +static constexpr const JoinType DefaultJoinType = jtMiter; -static constexpr const Slic3r::ClipperLib::EndType DefaultEndType = Slic3r::ClipperLib::etOpenButt; +static constexpr const EndType DefaultEndType = etOpenButt; //FIXME evaluate the default miter limit. 3 seems to be extreme, Cura uses 1.2. // Mitter Limit 3 is useful for perimeter generator, where sharp corners are extruded without needing a gap fill. @@ -26,7 +35,7 @@ static constexpr const Slic3r::ClipperLib::EndType DefaultEndType = Sl // is extended excessively. static constexpr const double DefaultMiterLimit = 3.; -static constexpr const Slic3r::ClipperLib::JoinType DefaultLineJoinType = Slic3r::ClipperLib::jtSquare; +static constexpr const JoinType DefaultLineJoinType = jtSquare; // Miter limit is ignored for jtSquare. static constexpr const double DefaultLineMiterLimit = 0.; @@ -304,12 +313,12 @@ namespace ClipperUtils { }; - // For ClipperLib with Z coordinates. + // Points with a Z coordinate. using ZPoint = Vec3i32; using ZPoints = std::vector; // Clip source polygon to be used as a clipping polygon with a bouding box around the source (to be clipped) polygon. - // Useful as an optimization for expensive ClipperLib operations, for example when clipping source polygons one by one + // Useful as an optimization for expensive Clipper operations, for example when clipping source polygons one by one // with a set of polygons covering the whole layer below. void clip_clipper_polygon_with_subject_bbox(const Points &src, const BoundingBox &bbox, Points &out, const bool get_entire_polygons = false); void clip_clipper_polygon_with_subject_bbox(const ZPoints &src, const BoundingBox &bbox, ZPoints &out); @@ -323,31 +332,28 @@ namespace ClipperUtils { } -// Perform union of input polygons using the non-zero rule, convert to ExPolygons. -ExPolygons ClipperPaths_to_Slic3rExPolygons(const ClipperLib::Paths &input, bool do_union = false); - // offset Polygons // Wherever applicable, please use the expand() / shrink() variants instead, they convey their purpose better. -Slic3r::Polygons offset(const Slic3r::Polygon &polygon, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset(const Slic3r::Polygon &polygon, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); // offset Polylines // Wherever applicable, please use the expand() / shrink() variants instead, they convey their purpose better. // Input polygons for negative offset shall be "normalized": There must be no overlap / intersections between the input polygons. -Slic3r::Polygons offset(const Slic3r::Polyline &polyline, const float delta, ClipperLib::JoinType joinType = DefaultLineJoinType, double miterLimit = DefaultLineMiterLimit, ClipperLib::EndType end_type = DefaultEndType); -Slic3r::Polygons offset(const Slic3r::Polyline3 &polyline, const float delta, ClipperLib::JoinType joinType = DefaultLineJoinType, double miterLimit = DefaultLineMiterLimit, ClipperLib::EndType end_type = DefaultEndType); -Slic3r::Polygons offset(const Slic3r::Polylines &polylines, const float delta, ClipperLib::JoinType joinType = DefaultLineJoinType, double miterLimit = DefaultLineMiterLimit, ClipperLib::EndType end_type = DefaultEndType); -Slic3r::Polygons offset(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::Polygons offset(const Slic3r::ExPolygon &expolygon, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::Polygons offset(const Slic3r::ExPolygons &expolygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::Polygons offset(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::Polygons offset(const Slic3r::SurfacesPtr &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset_ex(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygon &expolygon, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygons &expolygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset_ex(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset_ex(const Slic3r::SurfacesPtr &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset(const Slic3r::Polyline &polyline, const float delta, JoinType joinType = DefaultLineJoinType, double miterLimit = DefaultLineMiterLimit, EndType end_type = DefaultEndType); +Slic3r::Polygons offset(const Slic3r::Polyline3 &polyline, const float delta, JoinType joinType = DefaultLineJoinType, double miterLimit = DefaultLineMiterLimit, EndType end_type = DefaultEndType); +Slic3r::Polygons offset(const Slic3r::Polylines &polylines, const float delta, JoinType joinType = DefaultLineJoinType, double miterLimit = DefaultLineMiterLimit, EndType end_type = DefaultEndType); +Slic3r::Polygons offset(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset(const Slic3r::ExPolygon &expolygon, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset(const Slic3r::ExPolygons &expolygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset(const Slic3r::SurfacesPtr &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset_ex(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygon &expolygon, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset_ex(const Slic3r::ExPolygons &expolygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset_ex(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset_ex(const Slic3r::SurfacesPtr &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); // BBS -inline Slic3r::ExPolygons offset_ex(const Slic3r::Polygon &polygon, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons offset_ex(const Slic3r::Polygon &polygon, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { Slic3r::Polygons temp; temp.push_back(polygon); @@ -356,8 +362,8 @@ inline Slic3r::ExPolygons offset_ex(const Slic3r::Polygon &polygon, const float } // convert stroke to path by offsetting of contour -Polygons contour_to_polygons(const Polygon &polygon, const float line_width, ClipperLib::JoinType join_type = DefaultJoinType, double miter_limit = DefaultMiterLimit); -Polygons contour_to_polygons(const Polygons &polygon, const float line_width, ClipperLib::JoinType join_type = DefaultJoinType, double miter_limit = DefaultMiterLimit); +Polygons contour_to_polygons(const Polygon &polygon, const float line_width, JoinType join_type = DefaultJoinType, double miter_limit = DefaultMiterLimit); +Polygons contour_to_polygons(const Polygons &polygon, const float line_width, JoinType join_type = DefaultJoinType, double miter_limit = DefaultMiterLimit); inline Slic3r::Polygons union_safety_offset (const Slic3r::Polygons &polygons) { return offset (polygons, ClipperSafetyOffset); } inline Slic3r::Polygons union_safety_offset (const Slic3r::ExPolygons &expolygons) { return offset (expolygons, ClipperSafetyOffset); } @@ -370,62 +376,62 @@ Slic3r::ExPolygons union_safety_offset_ex(const Slic3r::Polygons &polygons); Slic3r::ExPolygons union_safety_offset_ex(const Slic3r::ExPolygons &expolygons); // Aliases for the various offset(...) functions, conveying the purpose of the offset. -inline Slic3r::Polygons expand(const Slic3r::Polygon &polygon, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::Polygons expand(const Slic3r::Polygon &polygon, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset(polygon, delta, joinType, miterLimit); } -inline Slic3r::Polygons expand(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::Polygons expand(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset(polygons, delta, joinType, miterLimit); } -inline Slic3r::Polygons expand(const Slic3r::ExPolygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::Polygons expand(const Slic3r::ExPolygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset(polygons, delta, joinType, miterLimit); } -inline Slic3r::ExPolygons expand_ex(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons expand_ex(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset_ex(polygons, delta, joinType, miterLimit); } // Input polygons for shrinking shall be "normalized": There must be no overlap / intersections between the input polygons. -inline Slic3r::Polygons shrink(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::Polygons shrink(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset(polygons, -delta, joinType, miterLimit); } -inline Slic3r::ExPolygons shrink_ex(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons shrink_ex(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset_ex(polygons, -delta, joinType, miterLimit); } -inline Slic3r::ExPolygons shrink_ex(const Slic3r::ExPolygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons shrink_ex(const Slic3r::ExPolygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset_ex(polygons, -delta, joinType, miterLimit); } // Wherever applicable, please use the opening() / closing() variants instead, they convey their purpose better. // Input polygons for negative offset shall be "normalized": There must be no overlap / intersections between the input polygons. -Slic3r::Polygons offset2(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset2_ex(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::ExPolygons offset2_ex(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons offset2(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset2_ex(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::ExPolygons offset2_ex(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); // BBS -Slic3r::ExPolygons _clipper_ex(ClipperLib::ClipType clipType, +Slic3r::ExPolygons _clipper_ex(ClipType clipType, const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, bool safety_offset_ = false); // Offset outside, then inside produces morphological closing. All deltas should be positive. -Slic3r::Polygons closing(const Slic3r::Polygons &polygons, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -inline Slic3r::Polygons closing(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +Slic3r::Polygons closing(const Slic3r::Polygons &polygons, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +inline Slic3r::Polygons closing(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { return closing(polygons, delta, delta, joinType, miterLimit); } -Slic3r::ExPolygons closing_ex(const Slic3r::Polygons &polygons, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -inline Slic3r::ExPolygons closing_ex(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +Slic3r::ExPolygons closing_ex(const Slic3r::Polygons &polygons, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +inline Slic3r::ExPolygons closing_ex(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { return closing_ex(polygons, delta, delta, joinType, miterLimit); } -inline Slic3r::ExPolygons closing_ex(const Slic3r::ExPolygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons closing_ex(const Slic3r::ExPolygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset2_ex(polygons, delta, - delta, joinType, miterLimit); } -inline Slic3r::ExPolygons closing_ex(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons closing_ex(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset2_ex(surfaces, delta, - delta, joinType, miterLimit); } // Offset inside, then outside produces morphological opening. All deltas should be positive. // Input polygons for opening shall be "normalized": There must be no overlap / intersections between the input polygons. -Slic3r::Polygons opening(const Slic3r::Polygons &polygons, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::Polygons opening(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -Slic3r::Polygons opening(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); -inline Slic3r::Polygons opening(const Slic3r::Polygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +Slic3r::Polygons opening(const Slic3r::Polygons &polygons, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons opening(const Slic3r::ExPolygons &expolygons, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +Slic3r::Polygons opening(const Slic3r::Surfaces &surfaces, const float delta1, const float delta2, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit); +inline Slic3r::Polygons opening(const Slic3r::Polygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { return opening(polygons, delta, delta, joinType, miterLimit); } -inline Slic3r::Polygons opening(const Slic3r::ExPolygons &expolygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::Polygons opening(const Slic3r::ExPolygons &expolygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { return opening(expolygons, delta, delta, joinType, miterLimit); } -inline Slic3r::Polygons opening(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::Polygons opening(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { return opening(surfaces, delta, delta, joinType, miterLimit); } -inline Slic3r::ExPolygons opening_ex(const Slic3r::ExPolygons &polygons, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons opening_ex(const Slic3r::ExPolygons &polygons, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset2_ex(polygons, - delta, delta, joinType, miterLimit); } -inline Slic3r::ExPolygons opening_ex(const Slic3r::Surfaces &surfaces, const float delta, ClipperLib::JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) +inline Slic3r::ExPolygons opening_ex(const Slic3r::Surfaces &surfaces, const float delta, JoinType joinType = DefaultJoinType, double miterLimit = DefaultMiterLimit) { assert(delta > 0); return offset2_ex(surfaces, - delta, delta, joinType, miterLimit); } -Slic3r::Lines _clipper_ln(ClipperLib::ClipType clipType, const Slic3r::Lines &subject, const Slic3r::Polygons &clip); +Slic3r::Lines _clipper_ln(ClipType clipType, const Slic3r::Lines &subject, const Slic3r::Polygons &clip); // Safety offset is applied to the clipping polygons only. Slic3r::Polygons diff(const Slic3r::Polygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); @@ -489,13 +495,14 @@ inline Slic3r::ExPolygons diff_ex(const Slic3r::ExPolygons& subject, const Slic3 inline Slic3r::Lines diff_ln(const Slic3r::Lines &subject, const Slic3r::Polygons &clip) { - return _clipper_ln(ClipperLib::ctDifference, subject, clip); + return _clipper_ln(ctDifference, subject, clip); } // Safety offset is applied to the clipping polygons only. Slic3r::Polygons intersection(const Slic3r::Polygon &subject, const Slic3r::Polygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); +Slic3r::Polygons intersection(const Slic3r::Polygons &subject, const Slic3r::Polygons &clip, PolyFillType fill_type); Slic3r::Polygons intersection(const Slic3r::ExPolygon &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); // Optimized version clipping the "clipping" polygon using clip_clipper_polygon_with_subject_bbox(). // To be used with complex clipping polygons, where majority of the clipping polygons are outside of the source polygon. @@ -534,135 +541,42 @@ void restore_source_path_order(const Slic3r::Polyline &source, Slic3r::Polylines inline Slic3r::Lines intersection_ln(const Slic3r::Lines &subject, const Slic3r::Polygons &clip) { - return _clipper_ln(ClipperLib::ctIntersection, subject, clip); + return _clipper_ln(ctIntersection, subject, clip); } inline Slic3r::Lines intersection_ln(const Slic3r::Line &subject, const Slic3r::Polygons &clip) { Slic3r::Lines lines; lines.emplace_back(subject); - return _clipper_ln(ClipperLib::ctIntersection, lines, clip); + return _clipper_ln(ctIntersection, lines, clip); } Slic3r::Polygons union_(const Slic3r::Polygons &subject); Slic3r::Polygons union_(const Slic3r::ExPolygons &subject); -Slic3r::Polygons union_(const Slic3r::Polygons &subject, const ClipperLib::PolyFillType fillType); +Slic3r::Polygons union_(const Slic3r::Polygons &subject, const PolyFillType fillType); Slic3r::Polygons union_(const Slic3r::Polygons &subject, const Slic3r::Polygons &subject2); // May be used to "heal" unusual models (3DLabPrints etc.) by providing fill_type (pftEvenOdd, pftNonZero, pftPositive, pftNegative). -Slic3r::ExPolygons union_ex(const Slic3r::Polygons &subject, ClipperLib::PolyFillType fill_type = ClipperLib::pftNonZero); +Slic3r::ExPolygons union_ex(const Slic3r::Polygons &subject, PolyFillType fill_type = pftNonZero); Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons &subject); Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons &subject, const Slic3r::Polygons &subject2); Slic3r::ExPolygons union_ex(const Slic3r::Surfaces &subject); Slic3r::ExPolygons union_ex(const Slic3r::ExPolygons& poly1, const Slic3r::ExPolygons& poly2, bool safety_offset_ = false); -// Convert polygons / expolygons into ClipperLib::PolyTree using ClipperLib::pftEvenOdd, thus union will NOT be performed. -// If the contours are not intersecting, their orientation shall not be modified by union_pt(). -ClipperLib::PolyTree union_pt(const Slic3r::Polygons &subject); -ClipperLib::PolyTree union_pt(const Slic3r::ExPolygons &subject); - Slic3r::ExPolygons xor_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygon &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); Slic3r::ExPolygons xor_ex(const Slic3r::ExPolygons &subject, const Slic3r::ExPolygons &clip, ApplySafetyOffset do_safety_offset = ApplySafetyOffset::No); Slic3r::Polygons union_pt_chained_outside_in(const Slic3r::Polygons &subject); -ClipperLib::PolyNodes order_nodes(const ClipperLib::PolyNodes &nodes); - -// Implementing generalized loop (foreach) over a list of nodes which can be -// ordered or unordered (performance gain) based on template parameter -enum class e_ordering { - ON, - OFF -}; - -// Create a template struct, template functions can not be partially specialized -template struct _foreach_node { - void operator()(const ClipperLib::PolyNodes &nodes, Fn &&fn); -}; - -// Specialization with NO ordering -template struct _foreach_node { - void operator()(const ClipperLib::PolyNodes &nodes, Fn &&fn) - { - for (auto &n : nodes) fn(n); - } -}; - -// Specialization with ordering -template struct _foreach_node { - void operator()(const ClipperLib::PolyNodes &nodes, Fn &&fn) - { - auto ordered_nodes = order_nodes(nodes); - for (auto &n : nodes) fn(n); - } -}; - -// Wrapper function for the foreach_node which can deduce arguments automatically -template -void foreach_node(const ClipperLib::PolyNodes &nodes, Fn &&fn) -{ - _foreach_node()(nodes, std::forward(fn)); -} - -// Collecting polygons of the tree into a list of Polygons, holes have clockwise -// orientation. -template -void traverse_pt(const ClipperLib::PolyNode *tree, Polygons *out) -{ - if (!tree) return; // terminates recursion - - // Push the contour of the current level - out->emplace_back(tree->Contour); - - // Do the recursion for all the children. - traverse_pt(tree->Childs, out); -} - -// Collecting polygons of the tree into a list of ExPolygons. -template -void traverse_pt(const ClipperLib::PolyNode *tree, ExPolygons *out) -{ - if (!tree) return; - else if(tree->IsHole()) { - // Levels of holes are skipped and handled together with the - // contour levels. - traverse_pt(tree->Childs, out); - return; - } - - ExPolygon level; - level.contour.points = tree->Contour; - - foreach_node(tree->Childs, - [out, &level] (const ClipperLib::PolyNode *node) { - - // Holes are collected here. - level.holes.emplace_back(node->Contour); - - // By doing a recursion, a new level expoly is created with the contour - // and holes of the lower level. Doing this for all the childs. - traverse_pt(node->Childs, out); - }); - - out->emplace_back(level); -} - -template -void traverse_pt(const ClipperLib::PolyNodes &nodes, ExOrJustPolygons *retval) -{ - foreach_node(nodes, [&retval](const ClipperLib::PolyNode *node) { - traverse_pt(node, retval); - }); -} - - /* OTHER */ Slic3r::Polygons simplify_polygons(const Slic3r::Polygons &subject); Slic3r::ExPolygons simplify_polygons_ex(const Slic3r::Polygons &subject); Polygons top_level_islands(const Slic3r::Polygons &polygons); +// Top level expolygons of the even-odd union, the ones nested in their holes go to `nested`. +ExPolygons top_level_expolygons(const ExPolygons &expolygons, ExPolygons *nested = nullptr); -ClipperLib::Path mittered_offset_path_scaled(const Points &contour, const std::vector &deltas, double miter_limit); +Points mittered_offset_path_scaled(const Points &contour, const std::vector &deltas, double miter_limit); Polygons variable_offset_inner(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit = 2.); Polygons variable_offset_outer(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit = 2.); ExPolygons variable_offset_outer_ex(const ExPolygon &expoly, const std::vector> &deltas, double miter_limit = 2.); diff --git a/src/libslic3r/ClipperZUtils.cpp b/src/libslic3r/ClipperZUtils.cpp new file mode 100644 index 0000000000..f7a4b79b0d --- /dev/null +++ b/src/libslic3r/ClipperZUtils.cpp @@ -0,0 +1,77 @@ +#include "ClipperZUtils.hpp" + +#include + +namespace Slic3r { +namespace ClipperZUtils { + +namespace C2 = Clipper2Lib_Z; + +static C2::Paths64 to_paths64(const ZPaths &paths) +{ + C2::Paths64 out; + out.reserve(paths.size()); + for (const ZPath &path : paths) { + C2::Path64 &dst = out.emplace_back(); + dst.reserve(path.size()); + for (const ZPoint &pt : path) + dst.emplace_back(pt.x(), pt.y(), pt.z()); + } + return out; +} + +static void append_zpaths(const C2::Paths64 &paths, ZPaths &out) +{ + out.reserve(out.size() + paths.size()); + for (const C2::Path64 &path : paths) { + ZPath &dst = out.emplace_back(); + dst.reserve(path.size()); + for (const C2::Point64 &pt : path) + dst.emplace_back(pt.x, pt.y, pt.z); + } +} + +double area(const ZPath &path) +{ + const size_t size = path.size(); + if (size < 3) + return 0.; + double a = 0.; + for (size_t i = 0, j = size - 1; i < size; j = i ++) + a += (double(path[j].x()) + path[i].x()) * (double(path[j].y()) - path[i].y()); + return -a * 0.5; +} + +ZPaths clip_zpaths(ClipType clip_type, const ZPaths &subject, bool subject_open, const ZPaths &clip, const ZFillCallback &zfill, bool preserve_collinear) +{ + C2::Clipper64 clipper; + clipper.PreserveCollinear(preserve_collinear); + if (zfill) + clipper.SetZCallback([&zfill](const C2::Point64 &e1bot, const C2::Point64 &e1top, const C2::Point64 &e2bot, const C2::Point64 &e2top, C2::Point64 &pt) { + // Clipper2 already copied Z from a coincident input vertex. + auto coincident = [&pt](const C2::Point64 &p) { return p.x == pt.x && p.y == pt.y; }; + if (coincident(e1bot) || coincident(e1top) || coincident(e2bot) || coincident(e2top)) + return; + ZPoint zpt(pt.x, pt.y, pt.z); + zfill(ZPoint(e1bot.x, e1bot.y, e1bot.z), ZPoint(e1top.x, e1top.y, e1top.z), + ZPoint(e2bot.x, e2bot.y, e2bot.z), ZPoint(e2top.x, e2top.y, e2top.z), zpt); + pt.z = zpt.z(); + }); + if (subject_open) + clipper.AddOpenSubject(to_paths64(subject)); + else + clipper.AddSubject(to_paths64(subject)); + clipper.AddClip(to_paths64(clip)); + const C2::ClipType type = clip_type == ctIntersection ? C2::ClipType::Intersection : + clip_type == ctUnion ? C2::ClipType::Union : + clip_type == ctDifference ? C2::ClipType::Difference : C2::ClipType::Xor; + C2::Paths64 closed, open; + clipper.Execute(type, C2::FillRule::NonZero, closed, open); + ZPaths out; + append_zpaths(closed, out); + append_zpaths(open, out); + return out; +} + +} // namespace ClipperZUtils +} // namespace Slic3r diff --git a/src/libslic3r/ClipperZUtils.hpp b/src/libslic3r/ClipperZUtils.hpp index 7465bd31a4..159a4e81b3 100644 --- a/src/libslic3r/ClipperZUtils.hpp +++ b/src/libslic3r/ClipperZUtils.hpp @@ -1,10 +1,11 @@ #ifndef slic3r_ClipperZUtils_hpp_ #define slic3r_ClipperZUtils_hpp_ +#include #include #include -#include +#include #include #include @@ -12,10 +13,13 @@ namespace Slic3r { namespace ClipperZUtils { -using ZPoint = ClipperLib_Z::IntPoint; -using ZPoints = ClipperLib_Z::Path; -using ZPath = ClipperLib_Z::Path; -using ZPaths = ClipperLib_Z::Paths; +using ZPoint = Vec3crd; +using ZPoints = std::vector>; +using ZPath = ZPoints; +using ZPaths = std::vector>; + +// Sets Z of an intersection point from the edges crossing there. +using ZFillCallback = std::function; inline bool zpoint_lower(const ZPoint &l, const ZPoint &r) { @@ -101,6 +105,12 @@ inline VecOfPoints from_zpaths(const ZPaths &paths) return out; } +// Signed area, positive for a CCW path. +double area(const ZPath &path); + +// Non-zero rule boolean, the subject may be open. zfill only sees intersections off the input vertices. +ZPaths clip_zpaths(ClipType clip_type, const ZPaths &subject, bool subject_open, const ZPaths &clip, const ZFillCallback &zfill, bool preserve_collinear = false); + class ClipperZIntersectionVisitor { public: using Intersection = std::pair; @@ -126,8 +136,8 @@ public: } } } - ClipperLib_Z::ZFillCallback clipper_callback() { - return [this](const ZPoint &e1bot, const ZPoint &e1top, + ZFillCallback clipper_callback() { + return [this](const ZPoint &e1bot, const ZPoint &e1top, const ZPoint &e2bot, const ZPoint &e2top, ZPoint &pt) { return (*this)(e1bot, e1top, e2bot, e2top, pt); }; } diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp index 606a5b8aaa..dbf737e3ed 100644 --- a/src/libslic3r/CutSurface.cpp +++ b/src/libslic3r/CutSurface.cpp @@ -3519,7 +3519,7 @@ ExPolygon priv::to_expoly(const SurfacePatch &patch, const Project &projection, { Polygons polys = unproject_loops(patch, projection, depth_range); // should not be used when no opposit triangle are counted so should not create overlaps - ClipperLib::PolyFillType fill_type = ClipperLib::PolyFillType::pftEvenOdd; + PolyFillType fill_type = pftEvenOdd; ExPolygons expolys = Slic3r::union_ex(polys, fill_type); if (expolys.size() == 1) return expolys.front(); diff --git a/src/libslic3r/ElephantFootCompensation.cpp b/src/libslic3r/ElephantFootCompensation.cpp index 0adff1ba4e..aaf18608ee 100644 --- a/src/libslic3r/ElephantFootCompensation.cpp +++ b/src/libslic3r/ElephantFootCompensation.cpp @@ -1,5 +1,3 @@ -#include "clipper/clipper_z.hpp" - #include "libslic3r.h" #include "ClipperUtils.hpp" #include "EdgeGrid.hpp" diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp index 38c035806c..80a9274fd0 100644 --- a/src/libslic3r/Emboss.cpp +++ b/src/libslic3r/Emboss.cpp @@ -404,18 +404,89 @@ bool Emboss::divide_segments_for_close_point(ExPolygons &expolygons, double dist return true; } +// Clipper1's CleanPolygon(): removes vertices closer than `distance` to a neighbour or to the line through their neighbours. +static void clean_polygon(Points &points, double distance) +{ + auto points_are_close = [](const Point &a, const Point &b, double dist2) { + const double dx = double(a.x() - b.x()), dy = double(a.y() - b.y()); + return dx * dx + dy * dy <= dist2; + }; + auto distance_from_line2 = [](const Point &pt, const Point &ln1, const Point &ln2) { + const double A = double(ln1.y() - ln2.y()); + const double B = double(ln2.x() - ln1.x()); + const double C = A * pt.x() + B * pt.y() - (A * ln1.x() + B * ln1.y()); + return (C * C) / (A * A + B * B); + }; + auto slopes_near_collinear = [&distance_from_line2](const Point &pt1, const Point &pt2, const Point &pt3, double dist2) { + if (std::abs(pt1.x() - pt2.x()) > std::abs(pt1.y() - pt2.y())) { + if ((pt1.x() > pt2.x()) == (pt1.x() < pt3.x())) + return distance_from_line2(pt1, pt2, pt3) < dist2; + if ((pt2.x() > pt1.x()) == (pt2.x() < pt3.x())) + return distance_from_line2(pt2, pt1, pt3) < dist2; + return distance_from_line2(pt3, pt1, pt2) < dist2; + } + if ((pt1.y() > pt2.y()) == (pt1.y() < pt3.y())) + return distance_from_line2(pt1, pt2, pt3) < dist2; + if ((pt2.y() > pt1.y()) == (pt2.y() < pt3.y())) + return distance_from_line2(pt2, pt1, pt3) < dist2; + return distance_from_line2(pt3, pt1, pt2) < dist2; + }; + + size_t size = points.size(); + if (size == 0) + return; + std::vector next(size), prev(size); + std::vector done(size, 0); + for (size_t i = 0; i < size; ++i) { + next[i] = (i + 1) % size; + prev[next[i]] = i; + } + auto exclude = [&next, &prev, &done](size_t op) { + const size_t result = prev[op]; + next[result] = next[op]; + prev[next[op]] = result; + done[result] = 0; + return result; + }; + const double dist2 = distance * distance; + size_t op = 0; + while (! done[op] && next[op] != prev[op]) { + if (points_are_close(points[op], points[prev[op]], dist2)) { + op = exclude(op); + -- size; + } else if (points_are_close(points[prev[op]], points[next[op]], dist2)) { + exclude(next[op]); + op = exclude(op); + size -= 2; + } else if (slopes_near_collinear(points[prev[op]], points[op], points[next[op]], dist2)) { + op = exclude(op); + -- size; + } else { + done[op] = 1; + op = next[op]; + } + } + if (size < 3) + size = 0; + Points out; + out.reserve(size); + for (size_t i = 0; i < size; ++i) { + out.emplace_back(points[op]); + op = next[op]; + } + points = std::move(out); +} + HealedExPolygons Emboss::heal_polygons(const Polygons &shape, bool is_non_zero, unsigned int max_iteration) { const double clean_distance = 1.415; // little grater than sqrt(2) - ClipperLib::PolyFillType fill_type = is_non_zero ? - ClipperLib::pftNonZero : ClipperLib::pftEvenOdd; + PolyFillType fill_type = is_non_zero ? pftNonZero : pftEvenOdd; // When edit this code check that font 'ALIENATE.TTF' and glyph 'i' still work // fix of self intersections - // http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Functions/SimplifyPolygon.htm - ClipperLib::Paths paths = ClipperLib::SimplifyPolygons(ClipperUtils::PolygonsProvider(shape), fill_type); - ClipperLib::CleanPolygons(paths, clean_distance); - Polygons polygons = to_polygons(paths); + Polygons polygons = union_(shape, fill_type); + for (Polygon &polygon : polygons) + clean_polygon(polygon.points, clean_distance); polygons.erase(std::remove_if(polygons.begin(), polygons.end(), [](const Polygon &p) { return p.size() < 3; }), polygons.end()); diff --git a/src/libslic3r/Emboss.hpp b/src/libslic3r/Emboss.hpp index 506e703b2a..2d445fcc6c 100644 --- a/src/libslic3r/Emboss.hpp +++ b/src/libslic3r/Emboss.hpp @@ -165,7 +165,7 @@ namespace Emboss /// Fix duplicit points and self intersections in polygons. /// Also try to reduce amount of points and remove useless polygon parts /// - /// Fill type ClipperLib::pftNonZero for overlapping otherwise + /// Fill type pftNonZero for overlapping otherwise /// Look at heal_expolygon()::max_iteration /// Healed shapes with flag is fully healed HealedExPolygons heal_polygons(const Polygons &shape, bool is_non_zero = true, unsigned max_iteration = 10); diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index f4615dc640..d0126e9cb8 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -3,7 +3,6 @@ #include #include "../ClipperUtils.hpp" -#include "../Clipper2Utils.hpp" #include "../EdgeGrid.hpp" #include "../Geometry.hpp" #include "../Geometry/Circle.hpp" @@ -2734,11 +2733,8 @@ void multiline_fill(Polylines& polylines, const FillParams& params, float spacin if (polylines.empty()) return; - // Convert source polylines to Clipper2 paths - Clipper2Lib::Paths64 subject_paths = Slic3rPolylines_to_Paths64(polylines); - const double miter_limit = 2.0; - const int rings = n_lines / 2; + const int rings = n_lines / 2; // Compute offsets (in units of spacing) std::vector offsets; @@ -2757,10 +2753,6 @@ void multiline_fill(Polylines& polylines, const FillParams& params, float spacin offsets.push_back(start + i * spacing); } - // Process each offset - Clipper2Lib::ClipperOffset offsetter(miter_limit); - offsetter.AddPaths(subject_paths, Clipper2Lib::JoinType::Round, Clipper2Lib::EndType::Round); - for (double t : offsets) { if (t == 0.0) { // Center line (only applies when n_lines is odd) @@ -2768,22 +2760,11 @@ void multiline_fill(Polylines& polylines, const FillParams& params, float spacin continue; } - // ClipperOffset with current offset distance (union is not needed here) - Clipper2Lib::Paths64 offset_paths; - offsetter.Execute(scale_(t), offset_paths); - if (offset_paths.empty()) - continue; - - // Convert back to polylines - Polylines new_polylines = Paths64_to_polylines(offset_paths); - - for (Polyline& pl : new_polylines) { - if (pl.points.size() < 3) - continue; - if (pl.points.front() != pl.points.back()) - pl.points.push_back(pl.points.front()); - all_polylines.emplace_back(std::move(pl)); - } + const float delta = float(scale_(t)); + // Arc tolerance of 1/500 of the offset, Clipper2's default. + for (const Polygon &ring : offset(polylines, delta, jtRound, 0.002 * delta, etOpenRound)) + if (ring.size() >= 3) + all_polylines.emplace_back(ring.split_at_first_point()); } polylines = std::move(all_polylines); diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp index 998cfd9a7e..b4373d3ea6 100644 --- a/src/libslic3r/Fill/FillRectilinear.cpp +++ b/src/libslic3r/Fill/FillRectilinear.cpp @@ -417,9 +417,9 @@ public: // bool sticks_removed = remove_sticks(polygons_src); // if (sticks_removed) BOOST_LOG_TRIVIAL(error) << "Sticks removed!"; - polygons_outer = aoffset1 == 0 ? to_polygons(polygons_src) : offset(polygons_src, float(aoffset1), ClipperLib::jtMiter, miterLimit); + polygons_outer = aoffset1 == 0 ? to_polygons(polygons_src) : offset(polygons_src, float(aoffset1), jtMiter, miterLimit); if (aoffset2 < 0) - polygons_inner = shrink(polygons_outer, float(aoffset1 - aoffset2), ClipperLib::jtMiter, miterLimit); + polygons_inner = shrink(polygons_outer, float(aoffset1 - aoffset2), jtMiter, miterLimit); // Filter out contours with zero area or small area, contours with 2 points only. const double min_area_threshold = 0.01 * aoffset2 * aoffset2; remove_small(polygons_outer, min_area_threshold); diff --git a/src/libslic3r/Fill/Lightning/TreeNode.cpp b/src/libslic3r/Fill/Lightning/TreeNode.cpp index 3d57ebae4a..c57180e530 100644 --- a/src/libslic3r/Fill/Lightning/TreeNode.cpp +++ b/src/libslic3r/Fill/Lightning/TreeNode.cpp @@ -143,14 +143,7 @@ NodeSPtr Node::closestNode(const Point& loc) bool inside(const Polygons &polygons, const Point &p) { - int poly_count_inside = 0; - for (const Polygon &poly : polygons) { - const int is_inside_this_poly = ClipperLib::PointInPolygon(p, poly.points); - if (is_inside_this_poly == -1) - return true; - poly_count_inside += is_inside_this_poly; - } - return (poly_count_inside % 2) == 1; + return contains(polygons, p, true); } bool lineSegmentPolygonsIntersection(const Point& a, const Point& b, const EdgeGrid::Grid& outline_locator, Point& result, const coord_t within_max_dist) diff --git a/src/libslic3r/Format/svg.cpp b/src/libslic3r/Format/svg.cpp index 7b720e62ef..c9738c8058 100644 --- a/src/libslic3r/Format/svg.cpp +++ b/src/libslic3r/Format/svg.cpp @@ -20,7 +20,6 @@ #include "TopExp_Explorer.hxx" #include "TopoDS.hxx" #include "BRepExtrema_SelfIntersection.hxx" -#include "libslic3r/clipper.hpp" #include "libslic3r/Polygon.hpp" namespace Slic3r { @@ -211,26 +210,15 @@ bool get_svg_profile(const char *path, std::vector &element_infos, Polygons polygons; bool close_polygon = false; for (int i = 0; i < path_line_points.size(); ++i) { - ClipperLib::Path pt_path; - for (auto line_point : path_line_points[i]) { - pt_path.push_back(ClipperLib::IntPoint(line_point.first.X() * scale_size, line_point.first.Y() * scale_size)); + Polyline pt_path; + for (auto line_point : path_line_points[i]) { + pt_path.points.push_back(Point(line_point.first.X() * scale_size, line_point.first.Y() * scale_size)); } - pt_path.push_back(ClipperLib::IntPoint(path_line_points[i].back().second.X() * scale_size, path_line_points[i].back().second.Y() * scale_size)); + pt_path.points.push_back(Point(path_line_points[i].back().second.X() * scale_size, path_line_points[i].back().second.Y() * scale_size)); - ClipperLib::Paths out_paths; - ClipperLib::ClipperOffset co; - if (pt_path.front() == pt_path.back()) { - co.AddPath(pt_path, ClipperLib::jtMiter, ClipperLib::etClosedLine); - close_polygon = true; - } else { - co.AddPath(pt_path, ClipperLib::jtMiter, ClipperLib::etOpenSquare); - close_polygon = false; - } - co.Execute(out_paths, stroke_width / 2); - - for (auto out_path : out_paths) { - polygons.emplace_back(Polygon(out_path)); - } + close_polygon = pt_path.points.front() == pt_path.points.back(); + if (stroke_width > 0) + append(polygons, offset(pt_path, stroke_width / 2, jtMiter, 2., close_polygon ? etClosedLine : etOpenSquare)); } if (!close_polygon) diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp index 69aff57c9a..1c775be3a8 100644 --- a/src/libslic3r/Geometry.cpp +++ b/src/libslic3r/Geometry.cpp @@ -4,7 +4,6 @@ #include "ClipperUtils.hpp" #include "ExPolygon.hpp" #include "Line.hpp" -#include "clipper.hpp" #include #include #include diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp index 6f868ba095..ab2096184b 100644 --- a/src/libslic3r/LayerRegion.cpp +++ b/src/libslic3r/LayerRegion.cpp @@ -627,9 +627,9 @@ void LayerRegion::process_external_surfaces(const Layer *lower_layer, const Poly } #else -//#define EXTERNAL_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 3. -//#define EXTERNAL_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 1.5 -#define EXTERNAL_SURFACES_OFFSET_PARAMETERS ClipperLib::jtSquare, 0. +//#define EXTERNAL_SURFACES_OFFSET_PARAMETERS jtMiter, 3. +//#define EXTERNAL_SURFACES_OFFSET_PARAMETERS jtMiter, 1.5 +#define EXTERNAL_SURFACES_OFFSET_PARAMETERS jtSquare, 0. void LayerRegion::process_external_surfaces(const Layer *lower_layer, const Polygons *lower_layer_covered) { diff --git a/src/libslic3r/NSVGUtils.cpp b/src/libslic3r/NSVGUtils.cpp index e27a6738e2..d12a866b3d 100644 --- a/src/libslic3r/NSVGUtils.cpp +++ b/src/libslic3r/NSVGUtils.cpp @@ -500,26 +500,26 @@ Polylines to_dashes(const Polyline &polyline, const DashesParam& param) HealedExPolygons stroke_to_expolygons(const LinesPath &lines_path, const NSVGshape &shape, const NSVGLineParams ¶m) { // convert stroke to polygon - ClipperLib::JoinType join_type = ClipperLib::JoinType::jtSquare; + JoinType join_type = jtSquare; switch (static_cast(shape.strokeLineJoin)) { - case NSVGlineJoin::NSVG_JOIN_BEVEL: join_type = ClipperLib::JoinType::jtSquare; break; - case NSVGlineJoin::NSVG_JOIN_MITER: join_type = ClipperLib::JoinType::jtMiter; break; - case NSVGlineJoin::NSVG_JOIN_ROUND: join_type = ClipperLib::JoinType::jtRound; break; + case NSVGlineJoin::NSVG_JOIN_BEVEL: join_type = jtSquare; break; + case NSVGlineJoin::NSVG_JOIN_MITER: join_type = jtMiter; break; + case NSVGlineJoin::NSVG_JOIN_ROUND: join_type = jtRound; break; } double mitter = shape.miterLimit * param.scale; - if (join_type == ClipperLib::JoinType::jtRound) { + if (join_type == jtRound) { // mitter is used as ArcTolerance // http://www.angusj.com/delphi/clipper/documentation/Docs/Units/ClipperLib/Classes/ClipperOffset/Properties/ArcTolerance.htm mitter = std::pow(param.tesselation_tolerance, 1/3.); } float stroke_width = static_cast(shape.strokeWidth * param.scale); - ClipperLib::EndType end_type = ClipperLib::EndType::etOpenButt; + EndType end_type = etOpenButt; switch (static_cast(shape.strokeLineCap)) { - case NSVGlineCap::NSVG_CAP_BUTT: end_type = ClipperLib::EndType::etOpenButt; break; - case NSVGlineCap::NSVG_CAP_ROUND: end_type = ClipperLib::EndType::etOpenRound; break; - case NSVGlineCap::NSVG_CAP_SQUARE: end_type = ClipperLib::EndType::etOpenSquare; break; + case NSVGlineCap::NSVG_CAP_BUTT: end_type = etOpenButt; break; + case NSVGlineCap::NSVG_CAP_ROUND: end_type = etOpenRound; break; + case NSVGlineCap::NSVG_CAP_SQUARE: end_type = etOpenSquare; break; } Polygons result; diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp index 1f1f1289e5..2f8e29c237 100644 --- a/src/libslic3r/PerimeterGenerator.cpp +++ b/src/libslic3r/PerimeterGenerator.cpp @@ -2,6 +2,7 @@ #include "AABBTreeLines.hpp" #include "BridgeDetector.hpp" #include "ClipperUtils.hpp" +#include "ClipperZUtils.hpp" #include "ExtrusionEntity.hpp" #include "ExtrusionEntityCollection.hpp" #include "Feature/FuzzySkin/FuzzySkin.hpp" @@ -296,13 +297,12 @@ static ExtrusionEntityCollection traverse_loops(const PerimeterGenerator &perime return out; } -static ClipperLib_Z::Paths clip_extrusion(const ClipperLib_Z::Path& subject, const ClipperLib_Z::Paths& clip, ClipperLib_Z::ClipType clipType) +static ClipperZUtils::ZPaths clip_extrusion(const ClipperZUtils::ZPath& subject, const ClipperZUtils::ZPaths& clip, ClipType clipType) { - ClipperLib_Z::Clipper clipper; - clipper.ZFillFunction([](const ClipperLib_Z::IntPoint& e1bot, const ClipperLib_Z::IntPoint& e1top, const ClipperLib_Z::IntPoint& e2bot, - const ClipperLib_Z::IntPoint& e2top, ClipperLib_Z::IntPoint& pt) { - ClipperLib_Z::IntPoint start = e1bot; - ClipperLib_Z::IntPoint end = e1top; + auto zfill = [](const ClipperZUtils::ZPoint& e1bot, const ClipperZUtils::ZPoint& e1top, const ClipperZUtils::ZPoint& e2bot, + const ClipperZUtils::ZPoint& e2top, ClipperZUtils::ZPoint& pt) { + ClipperZUtils::ZPoint start = e1bot; + ClipperZUtils::ZPoint end = e1top; if (start.z() <= 0 && end.z() <= 0) { start = e2bot; @@ -317,23 +317,15 @@ static ClipperLib_Z::Paths clip_extrusion(const ClipperLib_Z::Path& subject, con double t = std::sqrt(dist_sqr / length_sqr); pt.z() = start.z() + coord_t((end.z() - start.z()) * t); - }); + }; - clipper.AddPath(subject, ClipperLib_Z::ptSubject, false); - clipper.AddPaths(clip, ClipperLib_Z::ptClip, true); - - ClipperLib_Z::Paths clipped_paths; - { - ClipperLib_Z::PolyTree clipped_polytree; - clipper.Execute(clipType, clipped_polytree, ClipperLib_Z::pftNonZero, ClipperLib_Z::pftNonZero); - ClipperLib_Z::PolyTreeToPaths(std::move(clipped_polytree), clipped_paths); - } + ClipperZUtils::ZPaths clipped_paths = ClipperZUtils::clip_zpaths(clipType, ClipperZUtils::ZPaths{ subject }, true, clip, zfill); // Clipped path could contain vertices from the clip with a Z coordinate equal to zero. // For those vertices, we must assign value based on the subject. // This happens only in sporadic cases. - for (ClipperLib_Z::Path& path : clipped_paths) - for (ClipperLib_Z::IntPoint& c_pt : path) + for (ClipperZUtils::ZPath& path : clipped_paths) + for (ClipperZUtils::ZPoint& c_pt : path) if (c_pt.z() == 0) { // Now we must find the corresponding line on with this point is located and compute line width (Z coordinate). if (subject.size() <= 2) @@ -366,8 +358,8 @@ static ClipperLib_Z::Paths clip_extrusion(const ClipperLib_Z::Path& subject, con } assert([&clipped_paths = std::as_const(clipped_paths)]() -> bool { - for (const ClipperLib_Z::Path& path : clipped_paths) - for (const ClipperLib_Z::IntPoint& pt : path) + for (const ClipperZUtils::ZPath& path : clipped_paths) + for (const ClipperZUtils::ZPoint& pt : path) if (pt.z() <= 0) return false; return true; @@ -376,7 +368,7 @@ static ClipperLib_Z::Paths clip_extrusion(const ClipperLib_Z::Path& subject, con return clipped_paths; } -static double clipper_z_path_length(const ClipperLib_Z::Path &path) +static double clipper_z_path_length(const ClipperZUtils::ZPath &path) { double len = 0.; for (size_t i = 1; i < path.size(); ++ i) @@ -413,7 +405,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p ExtrusionPaths paths; // detect overhanging/bridging perimeters if (perimeter_generator.config->detect_overhang_wall && perimeter_generator.layer_id > perimeter_generator.object_config->raft_layers) { - ClipperLib_Z::Path extrusion_path; + ClipperZUtils::ZPath extrusion_path; extrusion_path.reserve(extrusion->size()); BoundingBox extrusion_path_bbox; for (const Arachne::ExtrusionJunction &ej : extrusion->junctions) { @@ -421,7 +413,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p extrusion_path_bbox.merge(Point(ej.p.x(), ej.p.y())); } - ClipperLib_Z::Paths lower_slices_paths; + ClipperZUtils::ZPaths lower_slices_paths; { lower_slices_paths.reserve(perimeter_generator.lower_slices_polygons().size()); Points clipped; @@ -431,7 +423,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p ClipperUtils::clip_clipper_polygon_with_subject_bbox(poly.points, extrusion_path_bbox, clipped); if (!clipped.empty()) { lower_slices_paths.emplace_back(); - ClipperLib_Z::Path &out = lower_slices_paths.back(); + ClipperZUtils::ZPath &out = lower_slices_paths.back(); out.reserve(clipped.size()); for (const Point &pt : clipped) out.emplace_back(pt.x(), pt.y(), 0); @@ -440,7 +432,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p } // get non-overhang paths by intersecting this loop with the grown lower slices - extrusion_paths_append(paths, clip_extrusion(extrusion_path, lower_slices_paths, ClipperLib_Z::ctIntersection), role, + extrusion_paths_append(paths, clip_extrusion(extrusion_path, lower_slices_paths, ctIntersection), role, is_external ? perimeter_generator.ext_perimeter_flow : perimeter_generator.perimeter_flow); // Always reverse extrusion if use fuzzy skin: https://github.com/OrcaSlicer/OrcaSlicer/pull/2413#issuecomment-1769735357 @@ -481,7 +473,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p // get overhang paths by checking what parts of this loop fall // outside the grown lower slices (thus where the distance between // the loop centerline and original lower slices is >= half nozzle diameter - extrusion_paths_append(paths, clip_extrusion(extrusion_path, lower_slices_paths, ClipperLib_Z::ctDifference), erOverhangPerimeter, + extrusion_paths_append(paths, clip_extrusion(extrusion_path, lower_slices_paths, ctDifference), erOverhangPerimeter, perimeter_generator.overhang_flow); // Reapply the nearest point search for starting point. @@ -674,10 +666,10 @@ static void clip_inner_walls_over_top(std::vector & }; // Pull the cut back by half a wall width: the clip severs the centerline, but the bead's rounded end // extends half a width past its endpoint and would otherwise overlap the top fill. - ClipperLib_Z::Paths top_paths_z; + ClipperZUtils::ZPaths top_paths_z; for (const Polygon &poly : to_polygons(offset_ex(top_region, float(perimeter_width) / 2.f))) { top_paths_z.emplace_back(); - ClipperLib_Z::Path &out = top_paths_z.back(); + ClipperZUtils::ZPath &out = top_paths_z.back(); out.reserve(poly.points.size()); for (const Point &pt : poly.points) out.emplace_back(pt.x(), pt.y(), 0); @@ -695,21 +687,21 @@ static void clip_inner_walls_over_top(std::vector & } if (overlap == TopOverlap::Full) continue; // the clip below would return nothing anyway - ClipperLib_Z::Path subject; + ClipperZUtils::ZPath subject; subject.reserve(el.size()); for (const Arachne::ExtrusionJunction &j : el.junctions) subject.emplace_back(j.p.x(), j.p.y(), j.w); - ClipperLib_Z::Paths pieces = clip_extrusion(subject, top_paths_z, ClipperLib_Z::ctDifference); + ClipperZUtils::ZPaths pieces = clip_extrusion(subject, top_paths_z, ctDifference); // Clipper treats the subject as an open polyline, so it also cuts a closed loop at its (arbitrary) // start vertex and may reverse pieces. Stitch pieces sharing an endpoint back together. - auto same_pt = [](const ClipperLib_Z::IntPoint &p, const ClipperLib_Z::IntPoint &q) { + auto same_pt = [](const ClipperZUtils::ZPoint &p, const ClipperZUtils::ZPoint &q) { return std::abs(p.x() - q.x()) <= SCALED_EPSILON && std::abs(p.y() - q.y()) <= SCALED_EPSILON; }; for (size_t i = 0; i < pieces.size(); ++ i) { for (size_t j = i + 1; j < pieces.size();) { - ClipperLib_Z::Path &a = pieces[i]; - ClipperLib_Z::Path &b = pieces[j]; + ClipperZUtils::ZPath &a = pieces[i]; + ClipperZUtils::ZPath &b = pieces[j]; if (same_pt(a.front(), b.front()) || same_pt(a.front(), b.back())) std::reverse(a.begin(), a.end()); if (same_pt(a.back(), b.back())) @@ -726,7 +718,7 @@ static void clip_inner_walls_over_top(std::vector & // If the clip removed next to nothing, keep the loop untouched instead of slitting it open. The // half-width pull-back above already costs about one width per crossing, hence two widths. double kept_length = 0.; - for (const ClipperLib_Z::Path &path : pieces) + for (const ClipperZUtils::ZPath &path : pieces) kept_length += clipper_z_path_length(path); if (clipper_z_path_length(subject) - kept_length < 2. * double(perimeter_width)) { append(kept_over_top, covered_by(el)); @@ -734,10 +726,10 @@ static void clip_inner_walls_over_top(std::vector & continue; } - for (const ClipperLib_Z::Path &path : pieces) { + for (const ClipperZUtils::ZPath &path : pieces) { Arachne::ExtrusionLine clipped(el.inset_idx, el.is_odd); clipped.junctions.reserve(path.size()); - for (const ClipperLib_Z::IntPoint &pt : path) + for (const ClipperZUtils::ZPoint &pt : path) clipped.junctions.emplace_back(Point(pt.x(), pt.y()), coord_t(pt.z()), el.inset_idx); // Discard tiny leftovers that would print as zits. if (clipped.size() >= 2 && clipped.getLength() >= perimeter_width) @@ -1056,7 +1048,7 @@ ExtrusionPaths sort_extra_perimeters(const ExtrusionPaths& extra_perims, int ind return filtered; } -#define EXTRA_PERIMETER_OFFSET_PARAMETERS ClipperLib::jtSquare, 0. +#define EXTRA_PERIMETER_OFFSET_PARAMETERS jtSquare, 0. // #define EXTRA_PERIM_DEBUG_FILES // Function will generate extra perimeters clipped over nonbridgeable areas of the provided surface and returns both the new perimeters and // Polygons filled by those clipped perimeters diff --git a/src/libslic3r/Polygon.cpp b/src/libslic3r/Polygon.cpp index 77ff30fb40..b2e2888111 100644 --- a/src/libslic3r/Polygon.cpp +++ b/src/libslic3r/Polygon.cpp @@ -70,7 +70,7 @@ double Polygon::area() const bool Polygon::is_counter_clockwise() const { - return ClipperLib::Orientation(this->points); + return this->area() >= 0.; } bool Polygon::is_clockwise() const @@ -678,7 +678,7 @@ void remove_collinear(Polygons &polys) remove_collinear(poly); } -Polygons polygons_simplify(const Polygons &source_polygons, double tolerance, bool strictly_simple /* = true */) +Polygons polygons_simplify(const Polygons &source_polygons, double tolerance) { Polygons out; out.reserve(source_polygons.size()); @@ -687,13 +687,15 @@ Polygons polygons_simplify(const Polygons &source_polygons, double tolerance, bo Points simplified = MultiPoint::_douglas_peucker(to_polyline(source_polygon).points, tolerance); // then remove the last (repeated) point. simplified.pop_back(); - // Simplify the decimated contour by ClipperLib. - bool ccw = ClipperLib::Area(simplified) > 0.; - for (Points &path : ClipperLib::SimplifyPolygons(ClipperUtils::SinglePathProvider(simplified), ClipperLib::pftNonZero, strictly_simple)) { + // Simplify the decimated contour by a union. + bool ccw = Polygon::area(simplified) > 0.; + Polygons decimated(1); + decimated.front().points = std::move(simplified); + for (Polygon &polygon : union_(decimated)) { if (! ccw) - // ClipperLib likely reoriented negative area contours to become positive. Reverse holes back to CW. - std::reverse(path.begin(), path.end()); - out.emplace_back(std::move(path)); + // The union reorients negative area contours to become positive. Reverse holes back to CW. + polygon.reverse(); + out.emplace_back(std::move(polygon)); } } return out; @@ -728,9 +730,40 @@ bool overlaps(const Polygons& polys1, const Polygons& polys2) return false; } +// Clipper1's PointInPolygon(): 1 inside, 0 outside, -1 on the boundary. +static int point_in_polygon(const Point &pt, const Points &path) +{ + int result = 0; + size_t cnt = path.size(); + if (cnt < 3) return 0; + Point ip = path[0]; + for (size_t i = 1; i <= cnt; ++i) { + Point ipNext = (i == cnt ? path[0] : path[i]); + if (ipNext.y() == pt.y() && ((ipNext.x() == pt.x()) || (ip.y() == pt.y() && ((ipNext.x() > pt.x()) == (ip.x() < pt.x()))))) + return -1; + if ((ip.y() < pt.y()) != (ipNext.y() < pt.y())) { + if (ip.x() >= pt.x()) { + if (ipNext.x() > pt.x()) + result = 1 - result; + else { + int64_t d = int64_t(ip.x() - pt.x()) * int64_t(ipNext.y() - pt.y()) - int64_t(ipNext.x() - pt.x()) * int64_t(ip.y() - pt.y()); + if (! d) return -1; + if ((d > 0) == (ipNext.y() > ip.y())) result = 1 - result; + } + } else if (ipNext.x() > pt.x()) { + int64_t d = int64_t(ip.x() - pt.x()) * int64_t(ipNext.y() - pt.y()) - int64_t(ipNext.x() - pt.x()) * int64_t(ip.y() - pt.y()); + if (! d) return -1; + if ((d > 0) == (ipNext.y() > ip.y())) result = 1 - result; + } + } + ip = ipNext; + } + return result; +} + bool contains(const Polygon &polygon, const Point &p, bool border_result) { - if (const int poly_count_inside = ClipperLib::PointInPolygon(p, polygon.points); + if (const int poly_count_inside = point_in_polygon(p, polygon.points); poly_count_inside == -1) return border_result; else @@ -741,7 +774,7 @@ bool contains(const Polygons &polygons, const Point &p, bool border_result) { int poly_count_inside = 0; for (const Polygon &poly : polygons) { - const int is_inside_this_poly = ClipperLib::PointInPolygon(p, poly.points); + const int is_inside_this_poly = point_in_polygon(p, poly.points); if (is_inside_this_poly == -1) return border_result; poly_count_inside += is_inside_this_poly; diff --git a/src/libslic3r/Polygon.hpp b/src/libslic3r/Polygon.hpp index 34ca214cf3..146491e281 100644 --- a/src/libslic3r/Polygon.hpp +++ b/src/libslic3r/Polygon.hpp @@ -159,7 +159,7 @@ inline void polygons_append(Polygons &dst, Polygons &&src) } } -Polygons polygons_simplify(const Polygons &polys, double tolerance, bool strictly_simple = true); +Polygons polygons_simplify(const Polygons &polys, double tolerance); inline void polygons_rotate(Polygons &polys, double angle) { diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 5f5592cfce..6d60874c18 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -3489,7 +3489,7 @@ void Print::_make_skirt() Polygon loop; { // Orca: the hull already represents the occupied outline used for this skirt. - Polygons loops = offset(hull, distance, ClipperLib::jtRound, float(scale_(0.1))); + Polygons loops = offset(hull, distance, jtRound, float(scale_(0.1))); Geometry::simplify_polygons(loops, scale_(0.05), &loops); if (loops.empty()) break; @@ -3526,7 +3526,7 @@ void Print::_make_skirt() } if (collect_skirt_hull) - for (Polygon &poly : offset(hull, distance + 0.5f * float(scale_(spacing)), ClipperLib::jtRound, float(scale_(0.1)))) + for (Polygon &poly : offset(hull, distance + 0.5f * float(scale_(spacing)), jtRound, float(scale_(0.1)))) append(m_skirt_convex_hull, std::move(poly.points)); }; @@ -3632,7 +3632,7 @@ void Print::_make_skirt() if (group.emits_skirt) { // Orca: If the expanded skirt outline touches another group // or obstacle, merge them and run the pass again. - Polygons envelopes = offset(envelope, grouping_offset, ClipperLib::jtRound, float(scale_(0.1))); + Polygons envelopes = offset(envelope, grouping_offset, jtRound, float(scale_(0.1))); if (envelopes.empty()) continue; envelope = std::move(envelopes.front()); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index b1c407e3b6..f2c7b2810a 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -251,9 +251,9 @@ enum class PrintOrder enum class SlicingMode { - // Regular, applying ClipperLib::pftNonZero rule when creating ExPolygons. + // Regular, applying pftNonZero rule when creating ExPolygons. Regular, - // Compatible with 3DLabPrint models, applying ClipperLib::pftEvenOdd rule when creating ExPolygons. + // Compatible with 3DLabPrint models, applying pftEvenOdd rule when creating ExPolygons. EvenOdd, // Orienting all contours CCW, thus closing all holes. CloseHoles, diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 3b7e889472..699bbb99b2 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -4,7 +4,6 @@ #include "Print.hpp" #include "BoundingBox.hpp" #include "ClipperUtils.hpp" -#include "Clipper2Utils.hpp" #include "ElephantFootCompensation.hpp" #include "Geometry.hpp" #include "I18N.hpp" @@ -56,7 +55,7 @@ using namespace std::literals; // #define PRINT_OBJECT_TIMING #ifdef PRINT_OBJECT_TIMING - // time limit for one ClipperLib operation (union / diff / offset), in ms + // time limit for one Clipper operation (union / diff / offset), in ms #define PRINT_OBJECT_TIME_LIMIT_DEFAULT 50 #include #include "Timer.hpp" @@ -1851,7 +1850,7 @@ void PrintObject::detect_surfaces_type() // Grow, then keep only what the configured direction allows, using the top's own filled // outline (same outer edge, holes closed) to tell the two apart. - ExPolygons expanded = offset_ex_2(island_top, d, Clipper2Lib::JoinType::Miter); + ExPolygons expanded = offset_ex(island_top, float(d), jtMiter, 2.); if (direction != TopSurfaceExpansionDirection::InwardAndOutward) { ExPolygons outline; outline.reserve(island_top.size()); @@ -2558,9 +2557,9 @@ void PrintObject::discover_vertical_shells() // Open to remove (filter out) regions narrower than an infill extrusion line width. -narrow_ensure_vertical_wall_thickness_region_radius, // Then close gaps narrower than 1.2 * line width, such gaps are difficult to fill in with sparse infill. - narrow_ensure_vertical_wall_thickness_region_radius + narrow_sparse_infill_region_radius, ClipperLib::jtSquare), + narrow_ensure_vertical_wall_thickness_region_radius + narrow_sparse_infill_region_radius, jtSquare), // Finally expand the infill a bit to remove tiny gaps between solid infill and the other regions. - narrow_sparse_infill_region_radius - tiny_overlap_radius, ClipperLib::jtSquare); + narrow_sparse_infill_region_radius - tiny_overlap_radius, jtSquare); Polygons object_volume; Polygons internal_volume; @@ -4170,7 +4169,7 @@ void PrintObject::clip_fill_surfaces() upper_internal = intersection( // Regularize the overhang regions, so that the infill areas will not become excessively jagged. smooth_outward( - closing(upper_internal, closing_radius, ClipperLib::jtSquare, 0.), + closing(upper_internal, closing_radius, jtSquare, 0.), scaled(0.1)), lower_layer_internal_surfaces); // Apply new internal infill to regions. @@ -4341,7 +4340,7 @@ void PrintObject::discover_horizontal_shells() // have the same angle, so the next shell would be grown even more and so on. Polygons too_narrow = diff( new_internal_solid, - opening(new_internal_solid, margin, margin + ClipperSafetyOffset, ClipperLib::jtMiter, 5)); + opening(new_internal_solid, margin, margin + ClipperSafetyOffset, jtMiter, 5)); if (! too_narrow.empty()) { // grow the collapsing parts and add the extra area to the neighbor layer // as well as to our original surfaces so that we support this @@ -4543,7 +4542,7 @@ void PrintObject::_generate_support_material() } // BBS -#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtSquare, 0. +#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtSquare, 0. #define SUPPORT_MATERIAL_MARGIN 1.2 template void PrintObject::remove_bridges_from_contacts( diff --git a/src/libslic3r/SLA/ConcaveHull.cpp b/src/libslic3r/SLA/ConcaveHull.cpp index f657fce746..2484fda2ff 100644 --- a/src/libslic3r/SLA/ConcaveHull.cpp +++ b/src/libslic3r/SLA/ConcaveHull.cpp @@ -135,7 +135,7 @@ ExPolygons offset_waffle_style_ex(const ConcaveHull &hull, coord_t delta) Polygons offset_waffle_style(const ConcaveHull &hull, coord_t delta) { auto arc_tolerance = scaled(0.01); - Polygons res = closing(hull.polygons(), 2 * delta, delta, ClipperLib::jtRound, arc_tolerance); + Polygons res = closing(hull.polygons(), 2 * delta, delta, jtRound, arc_tolerance); auto it = std::remove_if(res.begin(), res.end(), [](Polygon &p) { return p.is_clockwise(); }); res.erase(it, res.end()); diff --git a/src/libslic3r/SLA/Pad.cpp b/src/libslic3r/SLA/Pad.cpp index 447a416341..8726dfa55b 100644 --- a/src/libslic3r/SLA/Pad.cpp +++ b/src/libslic3r/SLA/Pad.cpp @@ -171,24 +171,8 @@ struct PadSkeleton { ExPolygons inner, outer; }; PadSkeleton divide_blueprint(const ExPolygons &bp) { - ClipperLib::PolyTree ptree = union_pt(bp); - PadSkeleton ret; - ret.inner.reserve(size_t(ptree.Total())); - ret.outer.reserve(size_t(ptree.Total())); - - for (ClipperLib::PolyTree::PolyNode *node : ptree.Childs) { - ExPolygon poly; - poly.contour.points = std::move(node->Contour); - for (ClipperLib::PolyTree::PolyNode *child : node->Childs) { - poly.holes.emplace_back(std::move(child->Contour)); - - traverse_pt(child->Childs, &ret.inner); - } - - ret.outer.emplace_back(poly); - } - + ret.outer = top_level_expolygons(bp, &ret.inner); return ret; } @@ -257,7 +241,7 @@ public: auto model_bp_offs = offset_ex(model_blueprint, scaled(cfg.embed_object.object_gap_mm), - ClipperLib::jtMiter, 1); + jtMiter, 1); ExPolygons fullcvh = wafflized_concave_hull(support_blueprint, model_bp_offs, cfg, thr); diff --git a/src/libslic3r/SLA/SupportPointGenerator.cpp b/src/libslic3r/SLA/SupportPointGenerator.cpp index 7c6c8d1f6b..e3cca1324f 100644 --- a/src/libslic3r/SLA/SupportPointGenerator.cpp +++ b/src/libslic3r/SLA/SupportPointGenerator.cpp @@ -186,8 +186,8 @@ static std::vector make_layers( // Produce 2 bands around the island, a safe band for dangling overhangs // and an unsafe band for sloped overhangs. // These masks include the original island - auto dangl_mask = expand(bottom_polygons, between_layers_offset, ClipperLib::jtSquare); - auto overh_mask = expand(bottom_polygons, slope_offset, ClipperLib::jtSquare); + auto dangl_mask = expand(bottom_polygons, between_layers_offset, jtSquare); + auto overh_mask = expand(bottom_polygons, slope_offset, jtSquare); // Absolutely hopeless overhangs are those outside the unsafe band top.overhangs = diff_ex(*top.polygon, overh_mask); diff --git a/src/libslic3r/SVG.cpp b/src/libslic3r/SVG.cpp index 9ccddcd4f2..206158edd7 100644 --- a/src/libslic3r/SVG.cpp +++ b/src/libslic3r/SVG.cpp @@ -230,15 +230,15 @@ void SVG::draw(const Points &points, std::string fill, coord_t radius) this->draw(*it, fill, radius); } -void SVG::draw(const ClipperLib::Path &polygon, double scale, std::string stroke, coordf_t stroke_width) +void SVG::draw(const Points &polygon, double scale, std::string stroke, coordf_t stroke_width) { this->stroke = stroke; this->path(this->get_path_d(polygon, scale, true), false, stroke_width, 1.f); } -void SVG::draw(const ClipperLib::Paths &polygons, double scale, std::string stroke, coordf_t stroke_width) +void SVG::draw(const VecOfPoints &polygons, double scale, std::string stroke, coordf_t stroke_width) { - for (ClipperLib::Paths::const_iterator it = polygons.begin(); it != polygons.end(); ++ it) + for (VecOfPoints::const_iterator it = polygons.begin(); it != polygons.end(); ++ it) draw(*it, scale, stroke, stroke_width); } @@ -284,11 +284,11 @@ std::string SVG::get_path_d(const MultiPoint &mp, bool closed) const return d.str(); } -std::string SVG::get_path_d(const ClipperLib::Path &path, double scale, bool closed) const +std::string SVG::get_path_d(const Points &path, double scale, bool closed) const { std::ostringstream d; d << "M "; - for (ClipperLib::Path::const_iterator p = path.begin(); p != path.end(); ++p) { + for (Points::const_iterator p = path.begin(); p != path.end(); ++p) { d << to_svg_x(scale * p->x() - origin(0)) << " "; d << to_svg_y(scale * p->y() - origin(1)) << " "; } diff --git a/src/libslic3r/SVG.hpp b/src/libslic3r/SVG.hpp index 5f57961053..d677f48375 100644 --- a/src/libslic3r/SVG.hpp +++ b/src/libslic3r/SVG.hpp @@ -2,7 +2,6 @@ #define slic3r_SVG_hpp_ #include "libslic3r.h" -#include "clipper.hpp" #include "ExPolygon.hpp" #include "Line.hpp" #include "TriangleMesh.hpp" @@ -70,9 +69,9 @@ public: void draw(const Point &point, std::string fill = "black", coord_t radius = 0); void draw(const Points &points, std::string fill = "black", coord_t radius = 0); - // Support for rendering the ClipperLib paths - void draw(const ClipperLib::Path &polygon, double scale, std::string fill = "grey", coordf_t stroke_width = 0); - void draw(const ClipperLib::Paths &polygons, double scale, std::string fill = "grey", coordf_t stroke_width = 0); + // Paths drawn with their coordinates multiplied by scale. + void draw(const Points &polygon, double scale, std::string fill = "grey", coordf_t stroke_width = 0); + void draw(const VecOfPoints &polygons, double scale, std::string fill = "grey", coordf_t stroke_width = 0); void draw_text(const Point &pt, const char *text, const char *color, int font_size = 20); void draw_legend(const Point &pt, const char *text, const char *color); @@ -88,7 +87,7 @@ public: void path(const std::string &d, bool fill, coordf_t stroke_width, const float fill_opacity); std::string get_path_d(const MultiPoint &mp, bool closed = false) const; - std::string get_path_d(const ClipperLib::Path &mp, double scale, bool closed = false) const; + std::string get_path_d(const Points &mp, double scale, bool closed = false) const; public: static void export_expolygons(const char *path, const BoundingBox &bbox, const Slic3r::ExPolygons &expolygons, std::string stroke_outer = "black", std::string stroke_holes = "blue", coordf_t stroke_width = 0); diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp index 08f973e20b..301a804753 100644 --- a/src/libslic3r/ShortestPath.cpp +++ b/src/libslic3r/ShortestPath.cpp @@ -4,7 +4,6 @@ #undef assert #endif -#include "clipper.hpp" #include "ShortestPath.hpp" #include "ExtrusionEntityCollection.hpp" #include "KDTreeIndirect.hpp" @@ -2041,22 +2040,6 @@ Polylines chain_polylines(Polylines &&polylines, const Point *start_near) return out; } -template static inline T chain_path_items(const Points &points, const T &items) -{ - auto segment_end_point = [&points](size_t idx, bool /* first_point */) -> const Point& { return points[idx]; }; - std::vector> ordered = chain_segments_greedy(segment_end_point, points.size(), nullptr); - T out; - out.reserve(items.size()); - for (auto &segment_and_reversal : ordered) - out.emplace_back(items[segment_and_reversal.first]); - return out; -} - -ClipperLib::PolyNodes chain_clipper_polynodes(const Points &points, const ClipperLib::PolyNodes &items) -{ - return chain_path_items(points, items); -} - // BBS std::vector chain_print_object_instances(const std::vector& print_objects, const Point* start_near) { diff --git a/src/libslic3r/ShortestPath.hpp b/src/libslic3r/ShortestPath.hpp index c7a61d99ee..f4ce89a16b 100644 --- a/src/libslic3r/ShortestPath.hpp +++ b/src/libslic3r/ShortestPath.hpp @@ -11,11 +11,6 @@ namespace Slic3r { - namespace ClipperLib { - class PolyNode; - using PolyNodes = std::vector>; - } - std::vector chain_points(const Points &points, const Point *start_near = nullptr); // Variant with post-processing (crossing removal + 2-opt) for object ordering. std::vector chain_points_with_postprocessing(const Points &points, const Point *start_near = nullptr); @@ -49,7 +44,6 @@ template inline void reorder_by_shortest_traverse(std::vector &po for (size_t i:order) polylines_out.emplace_back(std::move(Temp[i])); } -ClipperLib::PolyNodes chain_clipper_polynodes(const Points &points, const ClipperLib::PolyNodes &items); // Chain instances of print objects by an approximate shortest path. // Returns pairs of PrintObject idx and instance of that PrintObject. diff --git a/src/libslic3r/Support/SupportCommon.cpp b/src/libslic3r/Support/SupportCommon.cpp index e734608803..d4495cf4a2 100644 --- a/src/libslic3r/Support/SupportCommon.cpp +++ b/src/libslic3r/Support/SupportCommon.cpp @@ -1,5 +1,5 @@ #include "../ClipperUtils.hpp" -// #include "../ClipperZUtils.hpp" +#include "../ClipperZUtils.hpp" #include "../ExtrusionEntityCollection.hpp" #include "../Layer.hpp" #include "../Print.hpp" @@ -7,7 +7,6 @@ #include "../MutablePolygon.hpp" #include "../Geometry.hpp" #include "../Point.hpp" -#include "clipper/clipper_z.hpp" #include #include @@ -39,9 +38,9 @@ namespace Slic3r { //FIXME this should be dependent on the nozzle diameter! #define SUPPORT_MATERIAL_MARGIN 1.5 -//#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 3. -//#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 1.5 -#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtSquare, 0. +//#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtMiter, 3. +//#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtMiter, 1.5 +#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtSquare, 0. // Convert some of the intermediate layers into top/bottom interface layers as well as base interface layers. std::pair generate_interface_layers( @@ -280,13 +279,13 @@ SupportGeneratorLayersPtr generate_raft_base( polygons_append(brim, offset(ex, brim_object_gap)); else { if (brim_outer) - polygons_append(brim, offset(ex.contour, brim_object_gap, ClipperLib::jtRound, float(scale_(0.1)))); + polygons_append(brim, offset(ex.contour, brim_object_gap, jtRound, float(scale_(0.1)))); else brim.emplace_back(ex.contour); if (brim_inner) { Polygons holes = ex.holes; polygons_reverse(holes); - holes = shrink(holes, brim_object_gap, ClipperLib::jtRound, float(scale_(0.1))); + holes = shrink(holes, brim_object_gap, jtRound, float(scale_(0.1))); polygons_reverse(holes); polygons_append(brim, std::move(holes)); } else @@ -493,32 +492,25 @@ void tree_supports_generate_paths( // Offset expolygon inside, returns number of expolygons collected (0 or 1). // Vertices of output paths are marked with Z = source contour index of the expoly. // Vertices at the intersection of source contours are marked with Z = -1. - auto shrink_expolygon_with_contour_idx = [](const Slic3r::ExPolygon &expoly, const float delta, ClipperLib::JoinType joinType, double miterLimit, ClipperLib_Z::Paths &out) -> int + auto shrink_expolygon_with_contour_idx = [](const Slic3r::ExPolygon &expoly, const float delta, JoinType joinType, double miterLimit, ClipperZUtils::ZPaths &out) -> int { assert(delta > 0); - auto append_paths_with_z = [](ClipperLib::Paths &src, coord_t contour_idx, ClipperLib_Z::Paths &dst) { + auto append_paths_with_z = [](const Polygons &src, coord_t contour_idx, ClipperZUtils::ZPaths &dst) { dst.reserve(next_highest_power_of_2(dst.size() + src.size())); - for (const ClipperLib::Path &contour : src) { - ClipperLib_Z::Path tmp; - tmp.reserve(contour.size()); - for (const Point &p : contour) - tmp.emplace_back(p.x(), p.y(), contour_idx); - dst.emplace_back(std::move(tmp)); - } + for (const Polygon &contour : src) + dst.emplace_back(ClipperZUtils::to_zpath(contour.points, contour_idx)); + }; + // Oriented CCW, the sign of d alone decides between growing and shrinking. + auto offset_ccw = [joinType, miterLimit](Polygon polygon, float d) { + if (! polygon.is_counter_clockwise()) + polygon.reverse(); + return offset(polygon, d, joinType, miterLimit); }; // 1) Offset the outer contour. - ClipperLib_Z::Paths contours; + ClipperZUtils::ZPaths contours; { - ClipperLib::ClipperOffset co; - if (joinType == jtRound) - co.ArcTolerance = miterLimit; - else - co.MiterLimit = miterLimit; - co.ShortestEdgeLength = double(delta * 0.005); - co.AddPath(expoly.contour.points, joinType, ClipperLib::etClosedPolygon); - ClipperLib::Paths contours_raw; - co.Execute(contours_raw, - delta); + Polygons contours_raw = offset_ccw(expoly.contour, - delta); if (contours_raw.empty()) // No need to try to offset the holes. return 0; @@ -530,24 +522,9 @@ void tree_supports_generate_paths( append(out, std::move(contours)); } else { // 2) Offset the holes one by one, collect the offsetted holes. - ClipperLib_Z::Paths holes; - { - for (const Polygon &hole : expoly.holes) { - ClipperLib::ClipperOffset co; - if (joinType == jtRound) - co.ArcTolerance = miterLimit; - else - co.MiterLimit = miterLimit; - co.ShortestEdgeLength = double(delta * 0.005); - co.AddPath(hole.points, joinType, ClipperLib::etClosedPolygon); - ClipperLib::Paths out2; - // Execute reorients the contours so that the outer most contour has a positive area. Thus the output - // contours will be CCW oriented even though the input paths are CW oriented. - // Offset is applied after contour reorientation, thus the signum of the offset value is reversed. - co.Execute(out2, delta); - append_paths_with_z(out2, 1 + (&hole - expoly.holes.data()), holes); - } - } + ClipperZUtils::ZPaths holes; + for (const Polygon &hole : expoly.holes) + append_paths_with_z(offset_ccw(hole, delta), 1 + (&hole - expoly.holes.data()), holes); // 3) Subtract holes from the contours. if (holes.empty()) { @@ -556,16 +533,11 @@ void tree_supports_generate_paths( } else { // Negative offset. There is a chance, that the offsetted hole intersects the outer contour. // Subtract the offsetted holes from the offsetted contours. - ClipperLib_Z::Clipper clipper; - clipper.ZFillFunction([](const ClipperLib_Z::IntPoint &e1bot, const ClipperLib_Z::IntPoint &e1top, const ClipperLib_Z::IntPoint &e2bot, const ClipperLib_Z::IntPoint &e2top, ClipperLib_Z::IntPoint &pt) { - //pt.z() = std::max(std::max(e1bot.z(), e1top.z()), std::max(e2bot.z(), e2top.z())); + ClipperZUtils::ZPaths output = ClipperZUtils::clip_zpaths(ctDifference, contours, false, holes, + [](const ClipperZUtils::ZPoint &, const ClipperZUtils::ZPoint &, const ClipperZUtils::ZPoint &, const ClipperZUtils::ZPoint &, ClipperZUtils::ZPoint &pt) { // Just mark the intersection. pt.z() = -1; }); - clipper.AddPaths(contours, ClipperLib_Z::ptSubject, true); - clipper.AddPaths(holes, ClipperLib_Z::ptClip, true); - ClipperLib_Z::Paths output; - clipper.Execute(ClipperLib_Z::ctDifference, output, ClipperLib_Z::pftNonZero, ClipperLib_Z::pftNonZero); if (! output.empty()) { append(out, std::move(output)); } else { @@ -582,7 +554,7 @@ void tree_supports_generate_paths( // Clip the sheath path to avoid the extruder to get exactly on the first point of the loop. const double clip_length = spacing * 0.15; const double anchor_length = spacing * 6.; - ClipperLib_Z::Paths anchor_candidates; + ClipperZUtils::ZPaths anchor_candidates; for (ExPolygon& expoly : closing_ex(polygons, float(SCALED_EPSILON), float(SCALED_EPSILON + 0.5 * flow.scaled_width()))) { std::unique_ptr eec; ExPolygons regions_to_draw_inner_wall{expoly}; @@ -608,10 +580,10 @@ void tree_supports_generate_paths( // First genrate a 2nd perimeter loop as a source for anchor candidates. // The anchor candidate points are annotated with an index of the source contour or with -1 if on intersection. anchor_candidates.clear(); - shrink_expolygon_with_contour_idx(expoly, flow.scaled_width(), DefaultJoinType, 1.2, anchor_candidates); + shrink_expolygon_with_contour_idx(expoly, flow.scaled_width(), jtMiter, 1.2, anchor_candidates); // Orient all contours CW. for (auto &path : anchor_candidates) - if (ClipperLib_Z::Area(path) > 0) std::reverse(path.begin(), path.end()); + if (ClipperZUtils::area(path) > 0) std::reverse(path.begin(), path.end()); // Draw the perimeters. Polylines polylines; @@ -628,13 +600,13 @@ void tree_supports_generate_paths( pl.clip_end(clip_length); if (pl.size() < 2) continue; // Find the foot of the seam point on anchor_candidates. Only pick an anchor point that was created by offsetting the source contour. - ClipperLib_Z::Path *closest_contour = nullptr; - Vec2d closest_point; - int closest_point_idx = -1; - double closest_point_t = 0.; - double d2min = std::numeric_limits::max(); - Vec2d seam_pt = pl.back().cast(); - for (ClipperLib_Z::Path &path : anchor_candidates) + ClipperZUtils::ZPath *closest_contour = nullptr; + Vec2d closest_point; + int closest_point_idx = -1; + double closest_point_t = 0.; + double d2min = std::numeric_limits::max(); + Vec2d seam_pt = pl.back().cast(); + for (ClipperZUtils::ZPath &path : anchor_candidates) for (int i = 0; i < int(path.size()); ++i) { int j = next_idx_modulo(i, path); if (path[i].z() == idx_loop || path[j].z() == idx_loop) { @@ -662,14 +634,14 @@ void tree_supports_generate_paths( // Try to cut an anchor from the closest_contour. // Both closest_contour and pl are CW oriented. pl.points.emplace_back(closest_point.cast()); - const ClipperLib_Z::Path &path = *closest_contour; - double remaining_length = anchor_length - (seam_pt - closest_point).norm(); - int i = closest_point_idx; - int j = next_idx_modulo(i, *closest_contour); - Vec2d pi(path[i].x(), path[i].y()); - Vec2d pj(path[j].x(), path[j].y()); - Vec2d v = pj - pi; - double l = v.norm(); + const ClipperZUtils::ZPath &path = *closest_contour; + double remaining_length = anchor_length - (seam_pt - closest_point).norm(); + int i = closest_point_idx; + int j = next_idx_modulo(i, *closest_contour); + Vec2d pi(path[i].x(), path[i].y()); + Vec2d pj(path[j].x(), path[j].y()); + Vec2d v = pj - pi; + double l = v.norm(); if (remaining_length < (1. - closest_point_t) * l) { // Just trim the current line. pl.points.emplace_back((closest_point + v * (remaining_length / l)).cast()); diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp index a955eb5ca7..2850160d91 100644 --- a/src/libslic3r/Support/SupportMaterial.cpp +++ b/src/libslic3r/Support/SupportMaterial.cpp @@ -63,9 +63,9 @@ namespace Slic3r { #define PILLAR_SIZE (2.5) #define PILLAR_SPACING 10 -//#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 3. -//#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtMiter, 1.5 -#define SUPPORT_SURFACES_OFFSET_PARAMETERS ClipperLib::jtSquare, 0. +//#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtMiter, 3. +//#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtMiter, 1.5 +#define SUPPORT_SURFACES_OFFSET_PARAMETERS jtSquare, 0. static constexpr bool support_with_sheath = false; @@ -1634,7 +1634,7 @@ static inline std::tuple detect_contacts( offset( diff_polygons, scaled(SUPPORT_MATERIAL_MARGIN / NUM_MARGIN_STEPS), - ClipperLib::jtRound, + jtRound, // round mitter limit scale_(0.05)), slices_margin.polygons); diff --git a/src/libslic3r/Support/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp index 70c33aab0d..e933ac3c1b 100644 --- a/src/libslic3r/Support/TreeModelVolumes.cpp +++ b/src/libslic3r/Support/TreeModelVolumes.cpp @@ -112,7 +112,7 @@ TreeModelVolumes::TreeModelVolumes( tbb::parallel_for(tbb::blocked_range(num_raft_layers, num_layers, std::min(1, std::max(16, num_layers / (8 * tbb::this_task_arena::max_concurrency())))), [&](const tbb::blocked_range &range) { for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) - outlines[layer_idx] = polygons_simplify(to_polygons(print_object.get_layer(layer_idx - num_raft_layers)->lslices), mesh_settings.resolution, polygons_strictly_simple); + outlines[layer_idx] = polygons_simplify(to_polygons(print_object.get_layer(layer_idx - num_raft_layers)->lslices), mesh_settings.resolution); }); } #endif @@ -462,7 +462,7 @@ void TreeModelVolumes::calculateCollision(const coord_t radius, const LayerIndex // if a key does not exist when it is accessed it is added! collision_areas_offsetted[layer_idx] = offset_value == 0 ? union_(collision_areas) : - offset(union_ex(collision_areas), offset_value, ClipperLib::jtMiter, 1.2); + offset(union_ex(collision_areas), offset_value, jtMiter, 1.2); if(throw_on_cancel) throw_on_cancel(); } @@ -515,16 +515,16 @@ void TreeModelVolumes::calculateCollision(const coord_t radius, const LayerIndex // the conditional -0.5 ensures that plastic can never touch on the diagonal // downward when the z_distance_top_layers = 1. It is assumed to be better to // not support an overhang<90 degree than to risk fusing to it. - append(collisions, offset(union_ex(collision_areas_original), radius + required_range_x, ClipperLib::jtMiter, 1.2)); + append(collisions, offset(union_ex(collision_areas_original), radius + required_range_x, jtMiter, 1.2)); } collisions = processing_last_mesh && layer_idx < int(anti_overhang.size()) ? - union_(collisions, offset(union_ex(anti_overhang[layer_idx]), radius, ClipperLib::jtMiter, 1.2)) : + union_(collisions, offset(union_ex(anti_overhang[layer_idx]), radius, jtMiter, 1.2)) : union_(collisions); auto &dst = data[layer_idx]; if (processing_last_mesh) { if (! dst.empty()) collisions = union_(collisions, dst); - dst = polygons_simplify(collisions, min_resolution, polygons_strictly_simple); + dst = polygons_simplify(collisions, min_resolution); } else append(dst, std::move(collisions)); if (throw_on_cancel) @@ -552,7 +552,7 @@ void TreeModelVolumes::calculateCollision(const coord_t radius, const LayerIndex if (processing_last_mesh) { if (! dst.empty()) placable = union_(placable, dst); - dst = polygons_simplify(placable, min_resolution, polygons_strictly_simple); + dst = polygons_simplify(placable, min_resolution); } else append(dst, placable); if (throw_on_cancel) @@ -601,8 +601,8 @@ void TreeModelVolumes::calculateCollisionHolefree(const std::vectorgetCollision(m_increase_until_radius, layer_idx, false)), - 5 - increase_radius_ceil, ClipperLib::jtRound, m_min_resolution), - m_min_resolution, polygons_strictly_simple)); + 5 - increase_radius_ceil, jtRound, m_min_resolution), + m_min_resolution)); if (throw_on_cancel) throw_on_cancel(); } @@ -689,10 +689,10 @@ void TreeModelVolumes::calculateAvoidance(const std::vector &ke latest_avoidance = union_(current_layer_collisions, offset(latest_avoidance, istep + 1 == move_steps ? - last_move_step : - move_step, - ClipperLib::jtRound, m_min_resolution)); + jtRound, m_min_resolution)); if (task.to_model) latest_avoidance = diff(latest_avoidance, getPlaceableAreas(task.radius, layer_idx, throw_on_cancel)); - latest_avoidance = polygons_simplify(latest_avoidance, m_min_resolution, polygons_strictly_simple); + latest_avoidance = polygons_simplify(latest_avoidance, m_min_resolution); data.emplace_back(RadiusLayerPair{task.radius, layer_idx}, latest_avoidance); if (throw_on_cancel) throw_on_cancel(); @@ -815,12 +815,12 @@ void TreeModelVolumes::calculateWallRestrictions(const std::vectorenable_support.value && is_tree(m_object_config->support_type.value); @@ -2571,7 +2571,7 @@ void TreeSupport::draw_circles() Point direction = normal(pt_on_expoly - pt_on_poly, line_width_scaled / 2); hole_lower.translate(direction); // note to expand a hole, we need to do negative offset - auto hole_expanded = offset(hole_lower, -line_width_scaled / 4, ClipperLib::JoinType::jtSquare); + auto hole_expanded = offset(hole_lower, -line_width_scaled / 4, jtSquare); if (!hole_expanded.empty()) { base_area_lower.holes.push_back(std::move(hole_expanded[0])); holePropagationInfos.insert({ &base_area_lower.holes.back(), {25, direction, pt_far_on_poly} }); @@ -2584,7 +2584,7 @@ void TreeSupport::draw_circles() auto&& direction = std::get<1>(holePropagationInfos[&hole]); hole_lower.translate(direction); // note to shrink a hole, we need to do positive offset - auto hole_expanded = offset(hole_lower, line_width_scaled / 2, ClipperLib::JoinType::jtSquare); + auto hole_expanded = offset(hole_lower, line_width_scaled / 2, jtSquare); Point farPoint = std::get<2>(holePropagationInfos[&hole]) + direction * 2; if (!hole_expanded.empty()) { base_area_lower.holes.push_back(std::move(hole_expanded[0])); diff --git a/src/libslic3r/Support/TreeSupport3D.cpp b/src/libslic3r/Support/TreeSupport3D.cpp index 3cd3f4110d..c9fceabaea 100644 --- a/src/libslic3r/Support/TreeSupport3D.cpp +++ b/src/libslic3r/Support/TreeSupport3D.cpp @@ -68,7 +68,7 @@ static inline void validate_range(const Point &pt) { static constexpr const int32_t hi = 65536 * 16384; if (pt.x() > hi || pt.y() > hi || -pt.x() > hi || -pt.y() > hi) - throw ClipperLib::clipperException("Coordinate outside allowed range"); + throw RuntimeError("Coordinate outside allowed range"); } static inline void validate_range(const Points &points) @@ -832,16 +832,16 @@ static std::optional> polyline_sample_next_point_at_dis } // offset in steps for (int i = 0; i < steps; ++ i) { - ret = diff(offset(ret, step_size, ClipperLib::jtRound, scaled(0.01)), collision_trimmed()); + ret = diff(offset(ret, step_size, jtRound, scaled(0.01)), collision_trimmed()); // ensure that if many offsets are done the performance does not suffer extremely by the new vertices of jtRound. if (i % 10 == 7) - ret = polygons_simplify(ret, scaled(0.015), polygons_strictly_simple); + ret = polygons_simplify(ret, scaled(0.015)); } // offset the remainder float last_offset = distance - steps * step_size; if (last_offset > SCALED_EPSILON) - ret = offset(ret, distance - steps * step_size, ClipperLib::jtRound, scaled(0.01)); - ret = polygons_simplify(ret, scaled(0.015), polygons_strictly_simple); + ret = offset(ret, distance - steps * step_size, jtRound, scaled(0.01)); + ret = polygons_simplify(ret, scaled(0.015)); if (do_final_difference) ret = diff(ret, collision_trimmed()); @@ -1622,8 +1622,8 @@ static Point move_inside_if_outside(const Polygons &polygons, Point from, int di safe_movement_distance, safe_movement_distance + radius, 1); } if (settings.no_error && settings.move) - // as ClipperLib::jtRound has to be used for offsets this simplify is VERY important for performance. - polygons_simplify(increased, scaled(0.025), polygons_strictly_simple); + // as jtRound has to be used for offsets this simplify is VERY important for performance. + polygons_simplify(increased, scaled(0.025)); } else // if no movement is done the areas keep parent area as no move == offset(0) increased = parent.influence_area; @@ -4145,7 +4145,7 @@ void organic_draw_branches( base_layer_polygons = smooth_outward(union_(base_layer_polygons), config.support_line_width); //FIXME was .smooth(50); //smooth_outward(closing(std::move(bottom), closing_distance + minimum_island_radius, closing_distance, SUPPORT_SURFACES_OFFSET_PARAMETERS), smoothing_distance) : // simplify a bit, to ensure the output does not contain outrageous amounts of vertices. Should not be necessary, just a precaution. - base_layer_polygons = polygons_simplify(base_layer_polygons, std::min(scaled(0.03), double(config.resolution)), polygons_strictly_simple); + base_layer_polygons = polygons_simplify(base_layer_polygons, std::min(scaled(0.03), double(config.resolution))); } // Subtract top contact layer polygons from support base. diff --git a/src/libslic3r/Support/TreeSupportCommon.hpp b/src/libslic3r/Support/TreeSupportCommon.hpp index 07dcb324b8..fb08a1a928 100644 --- a/src/libslic3r/Support/TreeSupportCommon.hpp +++ b/src/libslic3r/Support/TreeSupportCommon.hpp @@ -588,8 +588,6 @@ private: // std::vector known_z; }; -static constexpr const bool polygons_strictly_simple = false; - inline double tiny_area_threshold() { return sqr(scaled(0.001)); } inline void tree_supports_show_error(std::string_view message, bool critical) diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp index a08ea6b55d..444f33c296 100644 --- a/src/libslic3r/TriangleMeshSlicer.cpp +++ b/src/libslic3r/TriangleMeshSlicer.cpp @@ -1856,7 +1856,7 @@ static ExPolygons make_expolygons_simple(std::vector &lines) return slices; } -static void make_expolygons(const Polygons &loops, const float closing_radius, const float extra_offset, ClipperLib::PolyFillType fill_type, ExPolygons* slices) +static void make_expolygons(const Polygons &loops, const float closing_radius, const float extra_offset, PolyFillType fill_type, ExPolygons* slices) { /* Input loops are not suitable for evenodd nor nonzero fill types, as we might get @@ -2156,8 +2156,8 @@ std::vector slice_mesh_ex( const auto this_mode = layer_id < params.slicing_mode_normal_below_layer ? params.mode_below : params.mode; Slic3r::make_expolygons( layers_p[layer_id], params.closing_radius, params.extra_offset, - this_mode == MeshSlicingParams::SlicingMode::EvenOdd ? ClipperLib::pftEvenOdd : - this_mode == MeshSlicingParams::SlicingMode::PositiveLargestContour ? ClipperLib::pftPositive : ClipperLib::pftNonZero, + this_mode == MeshSlicingParams::SlicingMode::EvenOdd ? pftEvenOdd : + this_mode == MeshSlicingParams::SlicingMode::PositiveLargestContour ? pftPositive : pftNonZero, &expolygons); //FIXME simplify if (this_mode == MeshSlicingParams::SlicingMode::PositiveLargestContour) diff --git a/src/libslic3r/TriangleMeshSlicer.hpp b/src/libslic3r/TriangleMeshSlicer.hpp index 1f7bba9d27..1a78e5b7d0 100644 --- a/src/libslic3r/TriangleMeshSlicer.hpp +++ b/src/libslic3r/TriangleMeshSlicer.hpp @@ -12,13 +12,13 @@ struct MeshSlicingParams { enum class SlicingMode : uint32_t { // Regular slicing, maintain all contours and their orientation. - // slice_mesh_ex() applies ClipperLib::pftNonZero rule to the result of slice_mesh(). + // slice_mesh_ex() applies pftNonZero rule to the result of slice_mesh(). Regular, // For slicing 3DLabPrints plane models (aka to be compatible with S3D default strategy). - // slice_mesh_ex() applies ClipperLib::pftEvenOdd rule. slice_mesh() slices EvenOdd as Regular. + // slice_mesh_ex() applies pftEvenOdd rule. slice_mesh() slices EvenOdd as Regular. EvenOdd, // Maintain all contours, orient all contours CCW. - // slice_mesh_ex() applies ClipperLib::pftNonZero rule, thus holes will be closed. + // slice_mesh_ex() applies pftNonZero rule, thus holes will be closed. Positive, // Orient all contours CCW and keep only the contour with the largest area. // This mode is useful for slicing complex objects in vase mode. diff --git a/src/libslic3r/clipper.cpp b/src/libslic3r/clipper.cpp deleted file mode 100644 index 8f38ba6215..0000000000 --- a/src/libslic3r/clipper.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// Hackish wrapper around the ClipperLib library to compile the Clipper library using Slic3r::Point. - -#include "clipper.hpp" - -// Don't include for the second time. -#define clipper_hpp - -// Override ClipperLib namespace to Slic3r::ClipperLib -#define CLIPPERLIB_NAMESPACE_PREFIX Slic3r -// Override Slic3r::ClipperLib::IntPoint to Slic3r::Point -#define CLIPPERLIB_INTPOINT_TYPE Slic3r::Point - -#include diff --git a/src/libslic3r/clipper.hpp b/src/libslic3r/clipper.hpp deleted file mode 100644 index b0dd51a4f7..0000000000 --- a/src/libslic3r/clipper.hpp +++ /dev/null @@ -1,26 +0,0 @@ -// Hackish wrapper around the ClipperLib library to compile the Clipper library using Slic3r's own Point type. - -#ifndef slic3r_clipper_hpp - -#ifdef clipper_hpp -#error "You should include the libslic3r/clipper.hpp before clipper/clipper.hpp" -#endif - -#ifdef CLIPPERLIB_USE_XYZ -#error "Something went wrong. Using clipper.hpp with Slic3r Point type, but CLIPPERLIB_USE_XYZ is defined." -#endif - -#define slic3r_clipper_hpp - -#include "Point.hpp" - -#define CLIPPERLIB_NAMESPACE_PREFIX Slic3r -#define CLIPPERLIB_INTPOINT_TYPE Slic3r::Point - -#include - -#undef clipper_hpp -#undef CLIPPERLIB_NAMESPACE_PREFIX -#undef CLIPPERLIB_INTPOINT_TYPE - -#endif // slic3r_clipper_hpp diff --git a/src/libslic3r/pchheader.hpp b/src/libslic3r/pchheader.hpp index 1bedfb482a..401e9b1145 100644 --- a/src/libslic3r/pchheader.hpp +++ b/src/libslic3r/pchheader.hpp @@ -110,8 +110,6 @@ #include #include -#include -#include "clipper.hpp" #include "BoundingBox.hpp" #include "ClipperUtils.hpp" #include "Config.hpp" diff --git a/tests/fff_print/test_fill.cpp b/tests/fff_print/test_fill.cpp index 1d5a3bd345..0efaba023d 100644 --- a/tests/fff_print/test_fill.cpp +++ b/tests/fff_print/test_fill.cpp @@ -1671,24 +1671,32 @@ TEST_CASE("Smoothing multiline lightning infill keeps its outlines connected", " // and the outlines of branches that run close to each other merge into one. Rounding the branches // before those outlines are built moves them apart, which breaks the merged outlines up into // separate loops - many more of them, each needing its own travel move. + // A micron change of the cube moves the loop count of a single slice by several percent, so the + // shapes of a few nearly equal cubes are added up. auto shape_for = [](const std::string &smooth_factor) { - Print print; - Slic3r::Test::init_and_process_print({Slic3r::Test::cube(20)}, print, - {{"sparse_infill_pattern", "lightning"}, - {"sparse_infill_density", "50%"}, - {"fill_multiline", 2}, - {"sparse_infill_smooth_factor", smooth_factor}, - {"layer_height", 0.2}}); - return sparse_infill_shape(print); + SparseInfillShape sum; + for (const double size : {20., 20.001, 20.002, 20.003}) { + Print print; + Slic3r::Test::init_and_process_print({Slic3r::Test::cube(size)}, print, + {{"sparse_infill_pattern", "lightning"}, + {"sparse_infill_density", "50%"}, + {"fill_multiline", 2}, + {"sparse_infill_smooth_factor", smooth_factor}, + {"layer_height", 0.2}}); + const SparseInfillShape shape = sparse_infill_shape(print); + sum.path_count += shape.path_count; + sum.point_count += shape.point_count; + sum.sharp_turns += shape.sharp_turns; + } + return sum; }; const SparseInfillShape sharp = shape_for("0%"); const SparseInfillShape smooth = shape_for("100%"); REQUIRE(sharp.path_count > 0); - // The loop count varies by a loop or two between platforms and between runs, so this is not an - // exact comparison. Smoothing should leave it about where it was; uncapping the smoothing - // reach, the regression this guards against, adds about 10%. + // Smoothing should leave the loop count about where it was; uncapping the smoothing reach, the + // regression this guards against, adds about 10%. const size_t allowed_extra = sharp.path_count / 50; // 2% REQUIRE(smooth.path_count <= sharp.path_count + allowed_extra); // The outlines are still rounded. diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp index dc46df965d..f371fcb7f4 100644 --- a/tests/fff_print/test_gcodewriter.cpp +++ b/tests/fff_print/test_gcodewriter.cpp @@ -23,10 +23,7 @@ using namespace Slic3r; using namespace Slic3r::Test; -// Arrange on a finite bed, not an unbounded InfiniteBed: the latter places items -// near INT64_MIN/4 (~2.3e18), which reaches ClipperLib's coordinate limit and throws -// "Coordinate outside allowed range" on Windows/arm64. A 500x500 bed keeps coordinates -// small while still covering large printers. +// Arrange on a 500x500 bed, which keeps coordinates small while still covering large printers. static void arrange_objects_on_test_bed(Model &model, const DynamicPrintConfig &config) { const BoundingBox bed{Point::new_scale(0., 0.), Point::new_scale(500., 500.)}; diff --git a/tests/libslic3r/test_clipper_offset.cpp b/tests/libslic3r/test_clipper_offset.cpp index 3b855130be..ecf14a60c8 100644 --- a/tests/libslic3r/test_clipper_offset.cpp +++ b/tests/libslic3r/test_clipper_offset.cpp @@ -22,7 +22,7 @@ SCENARIO("Constant offset", "[ClipperUtils]") { WHEN("Slic3r::offset()") { for (double miter : { 2.0, 1.5, 1.2 }) { DYNAMIC_SECTION("plus 1mm, miter " << miter << "x") { - output = Slic3r::offset(box20mm, 1. * s, ClipperLib::jtMiter, miter); + output = Slic3r::offset(box20mm, 1. * s, jtMiter, miter); #ifdef TESTS_EXPORT_SVGS { SVG svg(debug_out_path("constant_offset_box20mm_plus1mm_miter%lf.svg", miter).c_str(), get_extents(output)); @@ -36,7 +36,7 @@ SCENARIO("Constant offset", "[ClipperUtils]") { } } DYNAMIC_SECTION("minus 1mm, miter " << miter << "x") { - output = Slic3r::offset(box20mm, - 1. * s, ClipperLib::jtMiter, miter); + output = Slic3r::offset(box20mm, - 1. * s, jtMiter, miter); #ifdef TESTS_EXPORT_SVGS { SVG svg(debug_out_path("constant_offset_box20mm_minus1mm_miter%lf.svg", miter).c_str(), get_extents(output)); @@ -96,7 +96,7 @@ SCENARIO("Constant offset", "[ClipperUtils]") { for (double miter : { 2.0, 1.5, 1.2 }) { DYNAMIC_SECTION("miter " << miter << "x") { WHEN("plus 1mm") { - output = Slic3r::offset_ex(box20mm, 1. * s, ClipperLib::jtMiter, miter); + output = Slic3r::offset_ex(box20mm, 1. * s, jtMiter, miter); #ifdef TESTS_EXPORT_SVGS { SVG svg(debug_out_path("constant_offset_box20mm_10mm_hole_plus1mm_miter%lf.svg", miter).c_str(), get_extents(output)); @@ -110,7 +110,7 @@ SCENARIO("Constant offset", "[ClipperUtils]") { } } WHEN("minus 1mm") { - output = Slic3r::offset_ex(box20mm, - 1. * s, ClipperLib::jtMiter, miter); + output = Slic3r::offset_ex(box20mm, - 1. * s, jtMiter, miter); #ifdef TESTS_EXPORT_SVGS { SVG svg(debug_out_path("constant_offset_box20mm_10mm_hole_minus1mm_miter%lf.svg", miter).c_str(), get_extents(output)); @@ -176,7 +176,7 @@ SCENARIO("Constant offset", "[ClipperUtils]") { SECTION("Slic3r::offset()") { for (double miter : { 2.0, 1.5, 1.2 }) { DYNAMIC_SECTION("Outer offset 1mm, miter " << miter << "x") { - output = Slic3r::offset(triangle20mm, offset * s, ClipperLib::jtMiter, 2.0); + output = Slic3r::offset(triangle20mm, offset * s, jtMiter, 2.0); #ifdef TESTS_EXPORT_SVGS { SVG svg(debug_out_path("constant_offset_triangle20mm_plus1mm_miter%lf.svg", miter).c_str(), get_extents(output)); diff --git a/tests/libslic3r/test_clipper_utils.cpp b/tests/libslic3r/test_clipper_utils.cpp index fe9961a771..ddec07089b 100644 --- a/tests/libslic3r/test_clipper_utils.cpp +++ b/tests/libslic3r/test_clipper_utils.cpp @@ -10,6 +10,27 @@ using namespace Slic3r; +// Clipper may start an output polygon at any of its vertices. +static Polygon start_at_min(Polygon polygon) +{ + std::rotate(polygon.points.begin(), std::min_element(polygon.points.begin(), polygon.points.end()), polygon.points.end()); + return polygon; +} +static Polygons start_at_min(Polygons polygons) +{ + for (Polygon &polygon : polygons) + polygon = start_at_min(std::move(polygon)); + return polygons; +} +static ExPolygons start_at_min(ExPolygons expolygons) +{ + for (ExPolygon &expolygon : expolygons) { + expolygon.contour = start_at_min(std::move(expolygon.contour)); + expolygon.holes = start_at_min(std::move(expolygon.holes)); + } + return expolygons; +} + SCENARIO("Various Clipper operations - xs/t/11_clipper.t", "[ClipperUtils]") { // CCW oriented contour Slic3r::Polygon square{ { 200, 100 }, {200, 200}, {100, 200}, {100, 100} }; @@ -20,25 +41,25 @@ SCENARIO("Various Clipper operations - xs/t/11_clipper.t", "[ClipperUtils]") { WHEN("offset") { Polygons result = Slic3r::offset(square_with_hole, 5.f); THEN("offset matches") { - REQUIRE(result == Polygons { + REQUIRE(start_at_min(result) == start_at_min(Polygons { { { 205, 205 }, { 95, 205 }, { 95, 95 }, { 205, 95 }, }, - { { 155, 145 }, { 145, 145 }, { 145, 155 }, { 155, 155 } } }); + { { 155, 145 }, { 145, 145 }, { 145, 155 }, { 155, 155 } } })); } } WHEN("offset_ex") { ExPolygons result = Slic3r::offset_ex(square_with_hole, 5.f); THEN("offset matches") { - REQUIRE(result == ExPolygons { { + REQUIRE(start_at_min(result) == start_at_min(ExPolygons { { { { 205, 205 }, { 95, 205 }, { 95, 95 }, { 205, 95 }, }, - { { 145, 145 }, { 145, 155 }, { 155, 155 }, { 155, 145 } } } } ); + { { 145, 145 }, { 145, 155 }, { 155, 155 }, { 155, 145 } } } })); } } WHEN("offset2_ex") { ExPolygons result = Slic3r::offset2_ex({ square_with_hole }, 5.f, -2.f); THEN("offset matches") { - REQUIRE(result == ExPolygons { { + REQUIRE(start_at_min(result) == start_at_min(ExPolygons { { { { 203, 203 }, { 97, 203 }, { 97, 97 }, { 203, 97 } }, - { { 143, 143 }, { 143, 157 }, { 157, 157 }, { 157, 143 } } } } ); + { { 143, 143 }, { 143, 157 }, { 157, 157 }, { 157, 143 } } } })); } } } @@ -225,24 +246,7 @@ SCENARIO("Various Clipper operations - t/clipper.t", "[ClipperUtils]") { } } -template -double polytree_area(const Tree &tree, std::vector *out) -{ - traverse_pt(tree, out); - - return std::accumulate(out->begin(), out->end(), 0.0, - [](double a, const P &p) { return a + p.area(); }); -} - -size_t count_polys(const ExPolygons& expolys) -{ - size_t c = 0; - for (auto &ep : expolys) c += ep.holes.size() + 1; - - return c; -} - -TEST_CASE("Traversing Clipper PolyTree", "[ClipperUtils]") { +TEST_CASE("Top level expolygons of an even-odd union", "[ClipperUtils]") { // Create a polygon representing unit box Polygon unitbox; const auto UNIT = coord_t(1. / SCALING_FACTOR); @@ -266,36 +270,24 @@ TEST_CASE("Traversing Clipper PolyTree", "[ClipperUtils]") { Polygon inner_right = inner_left; inner_right.translate(UNIT * 10, 0); - Polygons reference = union_({box_frame, hole_left, hole_right, inner_left, inner_right}); + ExPolygons reference; + for (const Polygon &polygon : union_({box_frame, hole_left, hole_right, inner_left, inner_right})) + reference.emplace_back(polygon); - ClipperLib::PolyTree tree = union_pt(reference); double area_sum = box_frame.area() + hole_left.area() + hole_right.area() + inner_left.area() + inner_right.area(); REQUIRE(area_sum > 0); - SECTION("Traverse into Polygons WITHOUT spatial ordering") { - Polygons output; - REQUIRE(area_sum == Catch::Approx(polytree_area(tree.GetFirst(), &output))); - REQUIRE(output.size() == reference.size()); - } - - SECTION("Traverse into ExPolygons WITHOUT spatial ordering") { - ExPolygons output; - REQUIRE(area_sum == Catch::Approx(polytree_area(tree.GetFirst(), &output))); - REQUIRE(count_polys(output) == reference.size()); - } - - SECTION("Traverse into Polygons WITH spatial ordering") { - Polygons output; - REQUIRE(area_sum == Catch::Approx(polytree_area(tree.GetFirst(), &output))); - REQUIRE(output.size() == reference.size()); - } - - SECTION("Traverse into ExPolygons WITH spatial ordering") { - ExPolygons output; - REQUIRE(area_sum == Catch::Approx(polytree_area(tree.GetFirst(), &output))); - REQUIRE(count_polys(output) == reference.size()); - } + ExPolygons nested; + ExPolygons top_level = top_level_expolygons(reference, &nested); + auto area = [](const ExPolygons &expolys) { + return std::accumulate(expolys.begin(), expolys.end(), 0.0, [](double a, const ExPolygon &e) { return a + e.area(); }); + }; + REQUIRE(top_level.size() == 1); + REQUIRE(top_level.front().holes.size() == 2); + REQUIRE(nested.size() == 2); + REQUIRE(area_sum == Catch::Approx(area(top_level) + area(nested))); + REQUIRE(top_level_expolygons(reference).size() == 1); } diff --git a/tests/libslic3r/test_elephant_foot_compensation.cpp b/tests/libslic3r/test_elephant_foot_compensation.cpp index f509c6c0dd..ab9700a305 100644 --- a/tests/libslic3r/test_elephant_foot_compensation.cpp +++ b/tests/libslic3r/test_elephant_foot_compensation.cpp @@ -14,7 +14,7 @@ using namespace Slic3r; // #define TESTS_EXPORT_SVGS namespace Slic3r { - ClipperLib::Path mittered_offset_path_scaled(const Points& contour, const std::vector& deltas, double miter_limit); + Points mittered_offset_path_scaled(const Points& contour, const std::vector& deltas, double miter_limit); } static ExPolygon spirograph_gear_1mm() diff --git a/tests/sla_print/sla_test_utils.cpp b/tests/sla_print/sla_test_utils.cpp index a74bad09e4..8951bb3853 100644 --- a/tests/sla_print/sla_test_utils.cpp +++ b/tests/sla_print/sla_test_utils.cpp @@ -261,7 +261,8 @@ static void _test_concave_hull(const Polygons &hull, const ExPolygons &polys) REQUIRE(cchull_holes == 0); - Polygons intr = diff(to_polygons(polys), hull); + // Hull vertices where the connectors cross the input are rounded, so the hull may miss the input by a unit or two. + Polygons intr = diff(to_polygons(polys), offset(hull, float(SCALED_EPSILON))); REQUIRE(intr.empty()); }