Merge pull request #2882 from mapnik/remove_clipper
Removed angus clipper library from code and updated all visual tests …
This commit is contained in:
Artem Pavlenko
commit
bd4504331d
8 changed files with 6 additions and 5018 deletions
|
|
@ -1593,7 +1593,6 @@ if not preconfigured:
|
||||||
# prepend to make sure we link locally
|
# prepend to make sure we link locally
|
||||||
env.Prepend(CPPPATH = '#deps/agg/include')
|
env.Prepend(CPPPATH = '#deps/agg/include')
|
||||||
env.Prepend(LIBPATH = '#deps/agg')
|
env.Prepend(LIBPATH = '#deps/agg')
|
||||||
env.Prepend(CPPPATH = '#deps/clipper/include')
|
|
||||||
# prepend deps dir for auxillary headers
|
# prepend deps dir for auxillary headers
|
||||||
env.Prepend(CPPPATH = '#deps')
|
env.Prepend(CPPPATH = '#deps')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@
|
||||||
// agg
|
// agg
|
||||||
#include "agg_conv_clip_polygon.h"
|
#include "agg_conv_clip_polygon.h"
|
||||||
// clipper
|
// clipper
|
||||||
#include "clipper.hpp"
|
|
||||||
#include "agg_path_storage.h"
|
#include "agg_path_storage.h"
|
||||||
// rendering
|
// rendering
|
||||||
#include "agg_basics.h"
|
#include "agg_basics.h"
|
||||||
|
|
@ -307,6 +306,8 @@ public:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
Commented out section because clipper moved out of mapnik core.
|
||||||
inline void process_polynode_branch(ClipperLib::PolyNode* polynode,
|
inline void process_polynode_branch(ClipperLib::PolyNode* polynode,
|
||||||
mapnik::geometry::multi_polygon<double> & mp)
|
mapnik::geometry::multi_polygon<double> & mp)
|
||||||
{
|
{
|
||||||
|
|
@ -491,6 +492,7 @@ public:
|
||||||
return valid;
|
return valid;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
|
@ -518,9 +520,11 @@ int main(int argc, char** argv)
|
||||||
test3 test_runner(params,wkt_in,clipping_box);
|
test3 test_runner(params,wkt_in,clipping_box);
|
||||||
run(test_runner,"clipping polygon with boost");
|
run(test_runner,"clipping polygon with boost");
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
{
|
{
|
||||||
test4 test_runner(params,wkt_in,clipping_box);
|
test4 test_runner(params,wkt_in,clipping_box);
|
||||||
run(test_runner,"clipping polygon with clipper_tree");
|
run(test_runner,"clipping polygon with clipper_tree");
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
26
deps/clipper/build.py
vendored
26
deps/clipper/build.py
vendored
|
|
@ -1,26 +0,0 @@
|
||||||
# This file is part of Mapnik (c++ mapping toolkit)
|
|
||||||
# Copyright (C) 2013 Artem Pavlenko
|
|
||||||
#
|
|
||||||
# Mapnik is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU General Public License
|
|
||||||
# as published by the Free Software Foundation; either version 2
|
|
||||||
# of the License, or any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
import os
|
|
||||||
from glob import glob
|
|
||||||
|
|
||||||
Import('env')
|
|
||||||
lib_env = env.Clone()
|
|
||||||
lib_env.Append(CXXFLAGS='-fPIC')
|
|
||||||
lib_env.StaticLibrary('clipper', ['./src/clipper.cpp',], LIBS=[])
|
|
||||||
411
deps/clipper/include/clipper.hpp
vendored
411
deps/clipper/include/clipper.hpp
vendored
|
|
@ -1,411 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
* *
|
|
||||||
* Author : Angus Johnson *
|
|
||||||
* Version : 6.2.9 *
|
|
||||||
* Date : 16 February 2015 *
|
|
||||||
* Website : http://www.angusj.com *
|
|
||||||
* Copyright : Angus Johnson 2010-2015 *
|
|
||||||
* *
|
|
||||||
* 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 <mapnik/config.hpp>
|
|
||||||
#include <mapnik/geometry.hpp>
|
|
||||||
|
|
||||||
#define CLIPPER_VERSION "6.2.6"
|
|
||||||
|
|
||||||
//use_int32: When enabled 32bit ints are used instead of 64bit ints. This
|
|
||||||
//improve performance but coordinate values are limited to the range +/- 46340
|
|
||||||
//#define use_int32
|
|
||||||
|
|
||||||
//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance.
|
|
||||||
//#define 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 <vector>
|
|
||||||
#include <list>
|
|
||||||
#include <set>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <cstring>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <ostream>
|
|
||||||
#include <functional>
|
|
||||||
#include <queue>
|
|
||||||
|
|
||||||
namespace ClipperLib {
|
|
||||||
|
|
||||||
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 };
|
|
||||||
|
|
||||||
#ifdef use_int32
|
|
||||||
typedef int cInt;
|
|
||||||
static cInt const loRange = 0x7FFF;
|
|
||||||
static cInt const hiRange = 0x7FFF;
|
|
||||||
#else
|
|
||||||
typedef std::int64_t cInt;
|
|
||||||
static cInt const loRange = 0x3FFFFFFF;
|
|
||||||
static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL;
|
|
||||||
typedef std::int64_t long64; //used by Int128 class
|
|
||||||
typedef std::uint64_t ulong64;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
/*
|
|
||||||
struct IntPoint {
|
|
||||||
cInt x;
|
|
||||||
cInt y;
|
|
||||||
#ifdef use_xyz
|
|
||||||
cInt z;
|
|
||||||
IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {};
|
|
||||||
#else
|
|
||||||
IntPoint(cInt x_ = 0, cInt y_ = 0): x(x_), y(y_) {};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
friend inline bool operator== (const IntPoint& a, const IntPoint& b)
|
|
||||||
{
|
|
||||||
return a.x == b.x && a.y == b.y;
|
|
||||||
}
|
|
||||||
friend inline bool operator!= (const IntPoint& a, const IntPoint& b)
|
|
||||||
{
|
|
||||||
return a.x != b.x || a.y != b.y;
|
|
||||||
}
|
|
||||||
};*/
|
|
||||||
|
|
||||||
typedef mapnik::geometry::point<cInt> IntPoint;
|
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
//typedef std::vector< IntPoint > Path;
|
|
||||||
typedef mapnik::geometry::line_string<cInt> Path;
|
|
||||||
typedef mapnik::geometry::multi_line_string<cInt> Paths;
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
struct DoublePoint
|
|
||||||
{
|
|
||||||
double x;
|
|
||||||
double y;
|
|
||||||
DoublePoint(double x_ = 0, double y_ = 0) : x(x_), y(y_) {}
|
|
||||||
DoublePoint(IntPoint ip) : x((double)ip.x), y((double)ip.y) {}
|
|
||||||
};
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#ifdef use_xyz
|
|
||||||
typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt);
|
|
||||||
#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< PolyNode* > PolyNodes;
|
|
||||||
|
|
||||||
class MAPNIK_DECL PolyNode
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
PolyNode();
|
|
||||||
virtual ~PolyNode(){};
|
|
||||||
Path Contour;
|
|
||||||
PolyNodes Childs;
|
|
||||||
PolyNode* Parent;
|
|
||||||
PolyNode* GetNext() const;
|
|
||||||
bool IsHole() const;
|
|
||||||
bool IsOpen() const;
|
|
||||||
int ChildCount() const;
|
|
||||||
private:
|
|
||||||
unsigned Index; //node index in Parent.Childs
|
|
||||||
bool m_IsOpen;
|
|
||||||
JoinType m_jointype;
|
|
||||||
EndType m_endtype;
|
|
||||||
PolyNode* GetNextSiblingUp() const;
|
|
||||||
void AddChild(PolyNode& child);
|
|
||||||
friend class MAPNIK_DECL Clipper; //to access Index
|
|
||||||
friend class MAPNIK_DECL ClipperOffset;
|
|
||||||
};
|
|
||||||
|
|
||||||
class MAPNIK_DECL PolyTree: public PolyNode
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
~PolyTree(){Clear();};
|
|
||||||
PolyNode* GetFirst() const;
|
|
||||||
void Clear();
|
|
||||||
int Total() const;
|
|
||||||
private:
|
|
||||||
PolyNodes AllNodes;
|
|
||||||
friend class MAPNIK_DECL Clipper; //to access AllNodes
|
|
||||||
};
|
|
||||||
|
|
||||||
MAPNIK_DECL bool Orientation(const Path &poly);
|
|
||||||
MAPNIK_DECL double Area(const Path &poly);
|
|
||||||
MAPNIK_DECL int PointInPolygon(const IntPoint &pt, const Path &path);
|
|
||||||
|
|
||||||
MAPNIK_DECL void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
|
|
||||||
MAPNIK_DECL void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
|
|
||||||
MAPNIK_DECL void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
|
|
||||||
|
|
||||||
MAPNIK_DECL void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415);
|
|
||||||
MAPNIK_DECL void CleanPolygon(Path& poly, double distance = 1.415);
|
|
||||||
MAPNIK_DECL void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415);
|
|
||||||
MAPNIK_DECL 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 ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths);
|
|
||||||
MAPNIK_DECL 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};
|
|
||||||
|
|
||||||
//forward declarations (for stuff used internally) ...
|
|
||||||
struct TEdge;
|
|
||||||
struct IntersectNode;
|
|
||||||
struct LocalMinimum;
|
|
||||||
struct OutPt;
|
|
||||||
struct OutRec;
|
|
||||||
struct Join;
|
|
||||||
|
|
||||||
typedef std::vector < OutRec* > PolyOutList;
|
|
||||||
typedef std::vector < TEdge* > EdgeList;
|
|
||||||
typedef std::vector < Join* > JoinList;
|
|
||||||
typedef std::vector < IntersectNode* > IntersectList;
|
|
||||||
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
//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 MAPNIK_DECL ClipperBase
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
ClipperBase();
|
|
||||||
virtual ~ClipperBase();
|
|
||||||
bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed);
|
|
||||||
bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed);
|
|
||||||
virtual void Clear();
|
|
||||||
IntRect GetBounds();
|
|
||||||
bool PreserveCollinear() {return m_PreserveCollinear;};
|
|
||||||
void PreserveCollinear(bool value) {m_PreserveCollinear = value;};
|
|
||||||
protected:
|
|
||||||
void DisposeLocalMinimaList();
|
|
||||||
TEdge* AddBoundsToLML(TEdge *e, bool IsClosed);
|
|
||||||
void PopLocalMinima();
|
|
||||||
virtual void Reset();
|
|
||||||
TEdge* ProcessBound(TEdge* E, bool IsClockwise);
|
|
||||||
TEdge* DescendToMin(TEdge *&E);
|
|
||||||
void AscendToMax(TEdge *&E, bool Appending, bool IsClosed);
|
|
||||||
|
|
||||||
typedef std::vector<LocalMinimum> MinimaList;
|
|
||||||
MinimaList::iterator m_CurrentLM;
|
|
||||||
MinimaList m_MinimaList;
|
|
||||||
|
|
||||||
bool m_UseFullRange;
|
|
||||||
EdgeList m_edges;
|
|
||||||
bool m_PreserveCollinear;
|
|
||||||
bool m_HasOpenPaths;
|
|
||||||
};
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
class MAPNIK_DECL Clipper : public virtual ClipperBase
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
Clipper(int initOptions = 0);
|
|
||||||
~Clipper();
|
|
||||||
bool Execute(ClipType clipType,
|
|
||||||
Paths &solution,
|
|
||||||
PolyFillType fillType = pftEvenOdd);
|
|
||||||
bool Execute(ClipType clipType,
|
|
||||||
Paths &solution,
|
|
||||||
PolyFillType subjFillType,
|
|
||||||
PolyFillType clipFillType);
|
|
||||||
bool Execute(ClipType clipType,
|
|
||||||
PolyTree &polytree,
|
|
||||||
PolyFillType fillType = pftEvenOdd);
|
|
||||||
bool Execute(ClipType clipType,
|
|
||||||
PolyTree &polytree,
|
|
||||||
PolyFillType subjFillType,
|
|
||||||
PolyFillType clipFillType);
|
|
||||||
bool ReverseSolution() { return m_ReverseOutput; };
|
|
||||||
void ReverseSolution(bool value) {m_ReverseOutput = value;};
|
|
||||||
bool StrictlySimple() {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 use_xyz
|
|
||||||
void ZFillFunction(ZFillCallback zFillFunc);
|
|
||||||
#endif
|
|
||||||
protected:
|
|
||||||
void Reset();
|
|
||||||
virtual bool ExecuteInternal();
|
|
||||||
private:
|
|
||||||
PolyOutList m_PolyOuts;
|
|
||||||
JoinList m_Joins;
|
|
||||||
JoinList m_GhostJoins;
|
|
||||||
IntersectList m_IntersectList;
|
|
||||||
ClipType m_ClipType;
|
|
||||||
typedef std::priority_queue<cInt> ScanbeamList;
|
|
||||||
ScanbeamList m_Scanbeam;
|
|
||||||
typedef std::list<cInt> MaximaList;
|
|
||||||
MaximaList m_Maxima;
|
|
||||||
TEdge *m_ActiveEdges;
|
|
||||||
TEdge *m_SortedEdges;
|
|
||||||
bool m_ExecuteLocked;
|
|
||||||
PolyFillType m_ClipFillType;
|
|
||||||
PolyFillType m_SubjFillType;
|
|
||||||
bool m_ReverseOutput;
|
|
||||||
bool m_UsingPolyTree;
|
|
||||||
bool m_StrictSimple;
|
|
||||||
#ifdef use_xyz
|
|
||||||
ZFillCallback m_ZFill; //custom callback
|
|
||||||
#endif
|
|
||||||
void SetWindingCount(TEdge& edge);
|
|
||||||
bool IsEvenOddFillType(const TEdge& edge) const;
|
|
||||||
bool IsEvenOddAltFillType(const TEdge& edge) const;
|
|
||||||
void InsertScanbeam(const cInt Y);
|
|
||||||
cInt PopScanbeam();
|
|
||||||
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);
|
|
||||||
void DisposeAllOutRecs();
|
|
||||||
void DisposeOutRec(PolyOutList::size_type index);
|
|
||||||
bool ProcessIntersections(const cInt topY);
|
|
||||||
void BuildIntersectList(const cInt topY);
|
|
||||||
void ProcessIntersectList();
|
|
||||||
void ProcessEdgesAtTopOfScanbeam(const cInt topY);
|
|
||||||
void BuildResult(Paths& polys);
|
|
||||||
void BuildResult2(PolyTree& polytree);
|
|
||||||
void SetHoleState(TEdge *e, OutRec *outrec);
|
|
||||||
void DisposeIntersectNodes();
|
|
||||||
bool FixupIntersectionOrder();
|
|
||||||
void FixupOutPolygon(OutRec &outrec);
|
|
||||||
void FixupOutPolyline(OutRec &outrec);
|
|
||||||
bool IsHole(TEdge *e);
|
|
||||||
bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl);
|
|
||||||
void FixHoleLinkage(OutRec &outrec);
|
|
||||||
void AddJoin(OutPt *op1, OutPt *op2, const IntPoint offPt);
|
|
||||||
void ClearJoins();
|
|
||||||
void ClearGhostJoins();
|
|
||||||
void AddGhostJoin(OutPt *op, const IntPoint offPt);
|
|
||||||
bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2);
|
|
||||||
void JoinCommonEdges();
|
|
||||||
void DoSimplePolygons();
|
|
||||||
void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec);
|
|
||||||
void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec);
|
|
||||||
#ifdef use_xyz
|
|
||||||
void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
class MAPNIK_DECL ClipperOffset
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
|
|
||||||
~ClipperOffset();
|
|
||||||
void AddPath(const Path& path, JoinType joinType, EndType endType);
|
|
||||||
void AddPaths(const Paths& paths, JoinType joinType, EndType endType);
|
|
||||||
void Execute(Paths& solution, double delta);
|
|
||||||
void Execute(PolyTree& solution, double delta);
|
|
||||||
void Clear();
|
|
||||||
double MiterLimit;
|
|
||||||
double ArcTolerance;
|
|
||||||
private:
|
|
||||||
Paths m_destPolys;
|
|
||||||
Path m_srcPoly;
|
|
||||||
Path m_destPoly;
|
|
||||||
std::vector<DoublePoint> m_normals;
|
|
||||||
double m_delta, m_sinA, m_sin, m_cos;
|
|
||||||
double m_miterLim, m_StepsPerRad;
|
|
||||||
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;
|
|
||||||
};
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
} //ClipperLib namespace
|
|
||||||
|
|
||||||
#endif //clipper_hpp
|
|
||||||
|
|
||||||
|
|
||||||
4571
deps/clipper/src/clipper.cpp
vendored
4571
deps/clipper/src/clipper.cpp
vendored
File diff suppressed because it is too large
Load diff
1
deps/mapnik/build.py
vendored
1
deps/mapnik/build.py
vendored
|
|
@ -7,7 +7,6 @@ subdirs = {
|
||||||
'sparsehash':'sparsehash',
|
'sparsehash':'sparsehash',
|
||||||
'sparsehash/internal':'sparsehash/internal',
|
'sparsehash/internal':'sparsehash/internal',
|
||||||
'../agg/include':'agg',
|
'../agg/include':'agg',
|
||||||
'../clipper/include':'agg'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if 'install' in COMMAND_LINE_TARGETS:
|
if 'install' in COMMAND_LINE_TARGETS:
|
||||||
|
|
|
||||||
|
|
@ -340,12 +340,6 @@ source += Split(
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
# clipper
|
|
||||||
source += Split(
|
|
||||||
"""
|
|
||||||
../deps/clipper/src/clipper.cpp
|
|
||||||
""")
|
|
||||||
|
|
||||||
if env['RUNTIME_LINK'] == "static":
|
if env['RUNTIME_LINK'] == "static":
|
||||||
source += glob.glob('../deps/agg/src/' + '*.cpp')
|
source += glob.glob('../deps/agg/src/' + '*.cpp')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 405596e476874a47a33e398fc9c73affeb08264f
|
Subproject commit 698026c007507590ebc4d04fedc8dbe4242fc990
|
||||||
Loading…
Reference in a new issue