summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed2e363)
raw | patch | inline | side by side (parent: ed2e363)
author | johanengelen <johanengelen@users.sourceforge.net> | |
Sat, 2 Aug 2008 22:17:01 +0000 (22:17 +0000) | ||
committer | johanengelen <johanengelen@users.sourceforge.net> | |
Sat, 2 Aug 2008 22:17:01 +0000 (22:17 +0000) |
src/display/inkscape-cairo.cpp | patch | blob | history | |
src/display/inkscape-cairo.h | patch | blob | history |
index d077abbd280f623e06d643203e492d082a6255e3..c52404b23266988cacc1b2e0482865f2d6c136a9 100644 (file)
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-fns.h>
+
#include <libnr/nr-pixblock.h>
#include <libnr/nr-convert2geom.h>
#include "../style.h"
return nr_create_cairo_context_for_data (area, &(pb->area), NR_PIXBLOCK_PX (pb), pb->rs);
}
-/** Feeds path-creating calls to the cairo context translating them from the SPCurve, with the given transform and shift */
-void
-feed_curve_to_cairo (cairo_t *ct, NArtBpath const *bpath, NR::Matrix trans, NR::Maybe<NR::Rect> area, bool optimize_stroke, double stroke_width)
-{
- NR::Point next(0,0), last(0,0);
- if (!area || area->isEmpty())
- return;
- NR::Point shift = area->min();
- NR::Rect view = *area;
- view.growBy (stroke_width);
- NR::Rect swept;
- bool closed = false;
- NR::Point startpath(0,0);
- for (int i = 0; bpath[i].code != NR_END; i++) {
- switch (bpath[i].code) {
- case NR_MOVETO_OPEN:
- case NR_MOVETO:
- if (closed) {
- // we cannot use close_path because some of the curves/lines may have been optimized out
- cairo_line_to(ct, startpath[NR::X], startpath[NR::Y]);
- }
- next[NR::X] = bpath[i].x3;
- next[NR::Y] = bpath[i].y3;
- next *= trans;
- last = next;
- next -= shift;
- if (bpath[i].code == NR_MOVETO) {
- // remember the start point of the subpath, for closing it later
- closed = true;
- startpath = next;
- } else {
- closed = false;
- }
- cairo_move_to(ct, next[NR::X], next[NR::Y]);
- break;
-
- case NR_LINETO:
- next[NR::X] = bpath[i].x3;
- next[NR::Y] = bpath[i].y3;
- next *= trans;
- if (optimize_stroke) {
- swept = NR::Rect(last, next);
- //std::cout << "swept: " << swept;
- //std::cout << "view: " << view;
- //std::cout << "intersects? " << (swept.intersects(view)? "YES" : "NO") << "\n";
- }
- last = next;
- next -= shift;
- if (!optimize_stroke || swept.intersects(view))
- cairo_line_to(ct, next[NR::X], next[NR::Y]);
- else
- cairo_move_to(ct, next[NR::X], next[NR::Y]);
- break;
-
- case NR_CURVETO: {
- NR::Point tm1, tm2, tm3;
- tm1[0]=bpath[i].x1;
- tm1[1]=bpath[i].y1;
- tm2[0]=bpath[i].x2;
- tm2[1]=bpath[i].y2;
- tm3[0]=bpath[i].x3;
- tm3[1]=bpath[i].y3;
- tm1 *= trans;
- tm2 *= trans;
- tm3 *= trans;
- if (optimize_stroke) {
- swept = NR::Rect(last, last);
- swept.expandTo(tm1);
- swept.expandTo(tm2);
- swept.expandTo(tm3);
- }
- last = tm3;
- tm1 -= shift;
- tm2 -= shift;
- tm3 -= shift;
- if (!optimize_stroke || swept.intersects(view))
- cairo_curve_to (ct, tm1[NR::X], tm1[NR::Y], tm2[NR::X], tm2[NR::Y], tm3[NR::X], tm3[NR::Y]);
- else
- cairo_move_to(ct, tm3[NR::X], tm3[NR::Y]);
- break;
- }
-
- default:
- break;
- }
- }
-}
-
-
/*
* Can be called recursively.
* If optimize_stroke == false, the view Rect is not used.
@@ -286,9 +195,8 @@ feed_path_to_cairo (cairo_t *ct, Geom::Path const &path, Geom::Matrix trans, NR:
if (path.closed()) {
cairo_line_to(ct, initial[0], initial[1]);
-// cairo_close_path(ct);
- /* I think we should use cairo_close_path(ct) here but it doesn't work. (the closing line is not rendered completely)
- According to cairo documentation:
+ /* It seems we cannot use cairo_close_path(ct) here; maybe because some parts of the path have been clipped and not drawn (maybe the before last segment was outside view area)
+ However, according to cairo documentation:
The behavior of cairo_close_path() is distinct from simply calling cairo_line_to() with the equivalent coordinate
in the case of stroking. When a closed sub-path is stroked, there are no caps on the ends of the sub-path. Instead,
there is a line join connecting the final and initial segments of the sub-path.
index 43cafa4bc5d66d1de3d709c5dcfd02570c4ee8b1..03bf50cb57deb4d0dfb7c44212e69d42c0170688 100644 (file)
#include <2geom/forward.h>
#include <cairo/cairo.h>
-#include "libnr/nr-matrix.h"
#include "libnr/nr-maybe.h"
#include "libnr/nr-rect.h"
-class NArtBpath;
+
struct NRPixBlock;
class SPCanvasBuf;
cairo_t *nr_create_cairo_context_canvasbuf (NRRectL *area, SPCanvasBuf *b);
cairo_t *nr_create_cairo_context (NRRectL *area, NRPixBlock *pb);
-void feed_curve_to_cairo (cairo_t *ct, NArtBpath const *bpath, NR::Matrix trans, NR::Maybe<NR::Rect> area, bool optimize_stroke, double stroke_width);
void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv, Geom::Matrix trans, NR::Maybe<NR::Rect> area, bool optimize_stroke, double stroke_width);
void feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv);