~inkscape.dev/inkscape/trunk

« back to all changes in this revision

Viewing changes to src/2geom/toposweep.h

Committer: Krzysztof Kosiński
Date: 2015-07-04 16:15:46 UTC
mfrom: (14059.2.18 lib2geom-sync)
Revision ID: tweenk.pl@gmail.com-20150704161546-t72563dl3qrj4yya

Sync 2Geom to revision 2413.
May introduce regressions.

files added:
src/2geom/bezier.cpp

src/2geom/cairo-path-sink.cpp

src/2geom/cairo-path-sink.h

src/2geom/convex-hull.cpp

src/2geom/convex-hull.h

src/2geom/coord.cpp

src/2geom/elliptical-arc-from-sbasis.cpp

src/2geom/intersection-graph.cpp

src/2geom/intersection-graph.h

src/2geom/intersection.h

src/2geom/nearest-time.cpp

src/2geom/nearest-time.h

src/2geom/polynomial.cpp

src/2geom/polynomial.h

src/2geom/svg-path-writer.cpp

src/2geom/svg-path-writer.h

src/2geom/sweep-bounds.cpp

src/2geom/sweep-bounds.h

src/2geom/sweeper.h

src/2geom/viewbox.cpp

src/2geom/viewbox.h

files removed:
src/2geom/circle-circle.cpp

src/2geom/conjugate_gradient.cpp

src/2geom/conjugate_gradient.h

src/2geom/convex-cover.cpp

src/2geom/convex-cover.h

src/2geom/hvlinesegment.h

src/2geom/nearest-point.cpp

src/2geom/nearest-point.h

src/2geom/point-ops.h

src/2geom/poly.cpp

src/2geom/poly.h

src/2geom/quadtree.cpp

src/2geom/quadtree.h

src/2geom/region.cpp

src/2geom/region.h

src/2geom/shape.cpp

src/2geom/shape.h

src/2geom/svg-elliptical-arc.cpp

src/2geom/svg-elliptical-arc.h

src/2geom/sweep.cpp

src/2geom/sweep.h

src/live_effects/lpe-boolops.cpp

src/live_effects/lpe-boolops.h

files modified:
src/2geom/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README

src/2geom/2geom.h

src/2geom/CMakeLists.txt

src/2geom/Makefile_insert

src/2geom/affine.cpp

src/2geom/affine.h

src/2geom/angle.h

src/2geom/basic-intersection.cpp

src/2geom/basic-intersection.h

src/2geom/bezier-clipping.cpp

src/2geom/bezier-curve.cpp

src/2geom/bezier-curve.h

src/2geom/bezier-to-sbasis.h

src/2geom/bezier-utils.cpp

src/2geom/bezier.h

src/2geom/circle.cpp

src/2geom/circle.h

src/2geom/circulator.h

src/2geom/concepts.h

src/2geom/conic_section_clipper.h

src/2geom/conic_section_clipper_cr.h

src/2geom/conic_section_clipper_impl.cpp

src/2geom/conic_section_clipper_impl.h

src/2geom/conicsec.cpp

src/2geom/conicsec.h

src/2geom/coord.h

src/2geom/crossing.cpp

src/2geom/crossing.h

src/2geom/curve.cpp

src/2geom/curve.h

src/2geom/curves.h

src/2geom/d2-sbasis.cpp

src/2geom/d2-sbasis.h

src/2geom/d2.h

src/2geom/ellipse.cpp

src/2geom/ellipse.h

src/2geom/elliptical-arc.cpp

src/2geom/elliptical-arc.h

src/2geom/exception.h

src/2geom/forward.h

src/2geom/generic-interval.h

src/2geom/generic-rect.h

src/2geom/geom.cpp

src/2geom/geom.h

src/2geom/int-point.h

src/2geom/interval.h

src/2geom/line.cpp

src/2geom/line.h

src/2geom/linear.h

src/2geom/numeric/fitting-model.h

src/2geom/numeric/matrix.h

src/2geom/numeric/symmetric-matrix-fs-operation.h

src/2geom/numeric/symmetric-matrix-fs-trace.h

src/2geom/numeric/symmetric-matrix-fs.h

src/2geom/numeric/vector.h

src/2geom/ord.h

src/2geom/path-intersection.cpp

src/2geom/path-intersection.h

src/2geom/path-sink.cpp

src/2geom/path-sink.h

src/2geom/path.cpp

src/2geom/path.h

src/2geom/pathvector.cpp

src/2geom/pathvector.h

src/2geom/piecewise.h

src/2geom/point.cpp

src/2geom/point.h

src/2geom/ray.h

src/2geom/rect.cpp

src/2geom/rect.h

src/2geom/recursive-bezier-intersection.cpp

src/2geom/sbasis-2d.cpp

src/2geom/sbasis-2d.h

src/2geom/sbasis-curve.h

src/2geom/sbasis-geometric.h

src/2geom/sbasis-math.cpp

src/2geom/sbasis-math.h

src/2geom/sbasis-poly.h

src/2geom/sbasis-roots.cpp

src/2geom/sbasis-to-bezier.cpp

src/2geom/sbasis-to-bezier.h

src/2geom/sbasis.cpp

src/2geom/sbasis.h

src/2geom/solve-bezier-one-d.cpp

src/2geom/solve-bezier-parametric.cpp

src/2geom/solve-bezier.cpp

src/2geom/solver.h

src/2geom/svg-path-parser.cpp

src/2geom/svg-path-parser.h

src/2geom/toposweep.cpp

src/2geom/toposweep.h

src/2geom/transforms.cpp

src/2geom/transforms.h

src/2geom/utils.h

src/conn-avoid-ref.cpp

src/desktop-events.cpp

src/display/cairo-utils.cpp

src/display/curve-test.h

src/display/curve.cpp

src/display/curve.h

src/display/drawing-image.cpp

src/extension/implementation/implementation.h

src/extension/internal/emf-print.cpp

src/extension/internal/javafx-out.cpp

src/extension/internal/latex-pstricks.cpp

src/extension/internal/metafile-print.cpp

src/extension/internal/odf.cpp

src/extension/internal/pov-out.cpp

src/extension/internal/wmf-print.cpp

src/gradient-chemistry.cpp

src/gradient-drag.cpp

src/helper/geom-curves.h

src/helper/geom-pathstroke.cpp

src/helper/geom.cpp

src/helper/geom.h

src/libdepixelize/priv/splines-kopf2011.h

src/livarot/PathConversion.cpp

src/livarot/PathCutting.cpp

src/livarot/PathOutline.cpp

src/livarot/PathSimplify.cpp

src/livarot/PathStroke.cpp

src/livarot/Shape.cpp

src/livarot/ShapeSweep.cpp

src/livarot/sweep-tree.cpp

src/live_effects/Makefile_insert

src/live_effects/effect.cpp

src/live_effects/effect.h

src/live_effects/lpe-angle_bisector.cpp

src/live_effects/lpe-angle_bisector.h

src/live_effects/lpe-attach-path.cpp

src/live_effects/lpe-bounding-box.cpp

src/live_effects/lpe-bspline.cpp

src/live_effects/lpe-circle_3pts.cpp

src/live_effects/lpe-circle_3pts.h

src/live_effects/lpe-circle_with_radius.cpp

src/live_effects/lpe-circle_with_radius.h

src/live_effects/lpe-clone-original.cpp

src/live_effects/lpe-constructgrid.cpp

src/live_effects/lpe-constructgrid.h

src/live_effects/lpe-curvestitch.cpp

src/live_effects/lpe-curvestitch.h

src/live_effects/lpe-ellipse_5pts.cpp

src/live_effects/lpe-ellipse_5pts.h

src/live_effects/lpe-fill-between-many.cpp

src/live_effects/lpe-fill-between-strokes.cpp

src/live_effects/lpe-fillet-chamfer.cpp

src/live_effects/lpe-fillet-chamfer.h

src/live_effects/lpe-gears.cpp

src/live_effects/lpe-gears.h

src/live_effects/lpe-interpolate.cpp

src/live_effects/lpe-interpolate.h

src/live_effects/lpe-interpolate_points.h

src/live_effects/lpe-jointype.cpp

src/live_effects/lpe-jointype.h

src/live_effects/lpe-knot.cpp

src/live_effects/lpe-knot.h

src/live_effects/lpe-lattice2.cpp

src/live_effects/lpe-line_segment.cpp

src/live_effects/lpe-line_segment.h

src/live_effects/lpe-mirror_symmetry.cpp

src/live_effects/lpe-mirror_symmetry.h

src/live_effects/lpe-offset.cpp

src/live_effects/lpe-parallel.cpp

src/live_effects/lpe-perp_bisector.cpp

src/live_effects/lpe-perspective-envelope.cpp

src/live_effects/lpe-powerstroke.cpp

src/live_effects/lpe-powerstroke.h

src/live_effects/lpe-rough-hatches.cpp

src/live_effects/lpe-roughen.cpp

src/live_effects/lpe-ruler.cpp

src/live_effects/lpe-show_handles.cpp

src/live_effects/lpe-show_handles.h

src/live_effects/lpe-simplify.cpp

src/live_effects/lpe-skeleton.cpp

src/live_effects/lpe-skeleton.h

src/live_effects/lpe-sketch.cpp

src/live_effects/lpe-spiro.cpp

src/live_effects/lpe-tangent_to_curve.cpp

src/live_effects/lpe-taperstroke.cpp

src/live_effects/lpe-test-doEffect-stack.cpp

src/live_effects/lpe-test-doEffect-stack.h

src/live_effects/lpe-vonkoch.cpp

src/live_effects/lpe-vonkoch.h

src/live_effects/parameter/filletchamferpointarray.cpp

src/live_effects/parameter/filletchamferpointarray.h

src/live_effects/parameter/originalpatharray.h

src/live_effects/parameter/path.cpp

src/live_effects/parameter/path.h

src/live_effects/parameter/powerstrokepointarray.cpp

src/main.cpp

src/object-snapper.cpp

src/sp-conn-end.cpp

src/sp-ellipse.cpp

src/sp-gradient-test.h

src/sp-offset.cpp

src/sp-path.cpp

src/sp-polygon.cpp

src/splivarot.cpp

src/svg/svg-path.cpp

src/ui/tool/node.cpp

src/ui/tool/node.h

src/ui/tool/path-manipulator.cpp

src/ui/tools/calligraphic-tool.cpp

src/ui/tools/dropper-tool.cpp

src/ui/tools/eraser-tool.cpp

src/ui/tools/gradient-tool.cpp

src/ui/tools/mesh-tool.cpp

src/ui/tools/pen-tool.cpp

src/ui/tools/spray-tool.cpp

src/ui/tools/tweak-tool.cpp

Show diffs side-by-side

added added

removed removed

src/2geom/toposweep.h

/**

* \file

* \brief TopoSweep - topology / graph representation of a PathVector, for boolean operations and related tasks

*//*

* Authors:

* Michael Sloan <mgsloan at gmail.com>

* Nathan Hurst <njhurst at njhurst.com>

* the specific language governing rights and limitations.

#ifndef SEEN_GEOM_TOPOSWEEP_H

#define SEEN_GEOM_TOPOSWEEP_H

#ifndef LIB2GEOM_SEEN_TOPOSWEEP_H

#define LIB2GEOM_SEEN_TOPOSWEEP_H

#include <2geom/coord.h>

#include <2geom/point.h>

Section(CurveIx cix, double fd, double td, Point fdp, Point tdp) : curve(cix), f(fd), t(td), fp(fdp), tp(tdp) { }

Section(CurveIx cix, double fd, double td, PathVector ps, Dim2 d) : curve(cix), f(fd), t(td) {

fp = curve.get(ps).pointAt(f), tp = curve.get(ps).pointAt(t);

if (Point::LexOrderRt(d)(tp, fp)) {

if (Point::LexLessRt(d)(tp, fp)) {

//swap from and to, since tp is left or above fp

std::swap(f, t);

std::swap(fp, tp);

using std::swap;

swap(f, t);

swap(fp, tp);

}

Rect bbox() const { return Rect(fp, tp); }

167

Dim2 dim;

168

SweepSorter(Dim2 d) : dim(d) {}

169

bool operator()(const Section &a, const Section &b) const {

170

return Point::LexOrderRt(dim)(a.fp, b.fp);

170

return Point::LexLessRt(dim)(a.fp, b.fp);

171

}

172

};

173

208

209

} // end namespace Geom

210

211

#endif // SEEN_GEOM_TOPOSWEEP_H

211

#endif // LIB2GEOM_SEEN_TOPOSWEEP_H

212

213

214

Local Variables:

Older »