From c883d7627a479c8c5b6a9f77b9841fa5631572ad Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Mon, 27 Apr 2015 19:39:29 -0400 Subject: 2Geom sync - initial commit (bzr r14059.2.1) --- src/2geom/intersection-graph.h | 106 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 src/2geom/intersection-graph.h (limited to 'src/2geom/intersection-graph.h') diff --git a/src/2geom/intersection-graph.h b/src/2geom/intersection-graph.h new file mode 100644 index 000000000..2fe858c5d --- /dev/null +++ b/src/2geom/intersection-graph.h @@ -0,0 +1,106 @@ +/** + * \file + * \brief Path intersection graph + *//* + * Authors: + * Krzysztof Kosiński + * + * Copyright 2015 Authors + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + */ + +#ifndef SEEN_LIB2GEOM_INTERSECTION_GRAPH_H +#define SEEN_LIB2GEOM_INTERSECTION_GRAPH_H + +#include +#include +#include +#include +#include <2geom/forward.h> +#include <2geom/pathvector.h> + +namespace Geom { + +enum InOutFlag { + POINT_INSIDE, + POINT_OUTSIDE, + POINT_ON_EDGE +}; + +struct IntersectionVertex { + boost::intrusive::list_member_hook<> _hook; + PathVectorPosition pos; + Point p; // guarantees that endpoints are exact + IntersectionVertex *neighbor; + bool entry; // going in +t direction enters the other path + InOutFlag previous; + InOutFlag next; + bool processed; // TODO: use intrusive unprocessed list instead +}; + +typedef boost::intrusive::list + < IntersectionVertex + , boost::intrusive::member_hook + < IntersectionVertex + , boost::intrusive::list_member_hook<> + , &IntersectionVertex::_hook + > + > IntersectionList; + + +class PathIntersectionGraph +{ + // this is called PathIntersectionGraph so that we can also have a class for polygons, + // e.g. PolygonIntersectionGraph, which is going to be significantly faster +public: + PathIntersectionGraph(PathVector const &a, PathVector const &b, Coord precision = EPSILON); + + PathVector getUnion(); + PathVector getIntersection(); + +private: + PathVector _getResult(bool enter_a, bool enter_b); + void _handleNonintersectingPaths(PathVector &result, int which, bool inside); + bool _findUnprocessed(IntersectionList::iterator &result); + + PathVector _a, _b; + boost::ptr_vector _xs; + boost::ptr_vector _xalists; + boost::ptr_vector _xblists; +}; + +} // namespace Geom + +#endif // SEEN_LIB2GEOM_PATH_GRAPH_H +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : -- cgit v1.2.3 From 6a9762c7603a32c7ec5cc0aaed8048d84daee6e8 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Thu, 30 Apr 2015 11:17:07 +0200 Subject: Update 2Geom to r2347 (bzr r14059.2.3) --- src/2geom/intersection-graph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/2geom/intersection-graph.h') diff --git a/src/2geom/intersection-graph.h b/src/2geom/intersection-graph.h index 2fe858c5d..dd70d3d5b 100644 --- a/src/2geom/intersection-graph.h +++ b/src/2geom/intersection-graph.h @@ -51,7 +51,7 @@ enum InOutFlag { struct IntersectionVertex { boost::intrusive::list_member_hook<> _hook; - PathVectorPosition pos; + PathVectorTime pos; Point p; // guarantees that endpoints are exact IntersectionVertex *neighbor; bool entry; // going in +t direction enters the other path -- cgit v1.2.3 From 25fa09178b7d0d0befa708e93ea5316ef381caa0 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Fri, 22 May 2015 10:23:27 +0200 Subject: Update to 2Geom revision 2396 (bzr r14059.2.16) --- src/2geom/intersection-graph.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/2geom/intersection-graph.h') diff --git a/src/2geom/intersection-graph.h b/src/2geom/intersection-graph.h index dd70d3d5b..44beaf46b 100644 --- a/src/2geom/intersection-graph.h +++ b/src/2geom/intersection-graph.h @@ -79,6 +79,11 @@ public: PathVector getUnion(); PathVector getIntersection(); + PathVector getAminusB(); + PathVector getBminusA(); + PathVector getXOR(); + + std::vector intersectionPoints() const; private: PathVector _getResult(bool enter_a, bool enter_b); -- cgit v1.2.3 From 60437ac397d41678daba5daece227240e8ddd364 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 4 Jul 2015 17:25:59 +0200 Subject: Upgrade to 2Geom r2413 (bzr r14059.2.18) --- src/2geom/intersection-graph.h | 75 ++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 29 deletions(-) (limited to 'src/2geom/intersection-graph.h') diff --git a/src/2geom/intersection-graph.h b/src/2geom/intersection-graph.h index 44beaf46b..bd9aaee81 100644 --- a/src/2geom/intersection-graph.h +++ b/src/2geom/intersection-graph.h @@ -43,33 +43,6 @@ namespace Geom { -enum InOutFlag { - POINT_INSIDE, - POINT_OUTSIDE, - POINT_ON_EDGE -}; - -struct IntersectionVertex { - boost::intrusive::list_member_hook<> _hook; - PathVectorTime pos; - Point p; // guarantees that endpoints are exact - IntersectionVertex *neighbor; - bool entry; // going in +t direction enters the other path - InOutFlag previous; - InOutFlag next; - bool processed; // TODO: use intrusive unprocessed list instead -}; - -typedef boost::intrusive::list - < IntersectionVertex - , boost::intrusive::member_hook - < IntersectionVertex - , boost::intrusive::list_member_hook<> - , &IntersectionVertex::_hook - > - > IntersectionList; - - class PathIntersectionGraph { // this is called PathIntersectionGraph so that we can also have a class for polygons, @@ -83,19 +56,63 @@ public: PathVector getBminusA(); PathVector getXOR(); + /// Returns the number of intersections used when computing Boolean operations. + std::size_t size() const; std::vector intersectionPoints() const; private: + enum InOutFlag { + POINT_INSIDE, + POINT_OUTSIDE + }; + + struct IntersectionVertex { + boost::intrusive::list_member_hook<> _hook; + PathVectorTime pos; + Point p; // guarantees that endpoints are exact + IntersectionVertex *neighbor; + bool entry; // going in +t direction enters the other path + InOutFlag previous; + InOutFlag next; + bool processed; // TODO: use intrusive unprocessed list instead + }; + + typedef boost::intrusive::list + < IntersectionVertex + , boost::intrusive::member_hook + < IntersectionVertex + , boost::intrusive::list_member_hook<> + , &IntersectionVertex::_hook + > + > IntersectionList; + + struct PathData { + IntersectionList xlist; + unsigned removed_in; + unsigned removed_out; + + PathData() + : removed_in(0) + , removed_out(0) + {} + }; + + struct IntersectionVertexLess; + PathVector _getResult(bool enter_a, bool enter_b); void _handleNonintersectingPaths(PathVector &result, int which, bool inside); bool _findUnprocessed(IntersectionList::iterator &result); PathVector _a, _b; boost::ptr_vector _xs; - boost::ptr_vector _xalists; - boost::ptr_vector _xblists; + boost::ptr_vector _apaths; + boost::ptr_vector _bpaths; + + friend std::ostream &operator<<(std::ostream &, PathIntersectionGraph const &); }; +std::ostream &operator<<(std::ostream &os, PathIntersectionGraph const &pig); + } // namespace Geom #endif // SEEN_LIB2GEOM_PATH_GRAPH_H -- cgit v1.2.3