X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdisplay%2Fnr-arena-shape.cpp;h=6f38fd97d8d018d57a57af5bae793749235b0246;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=de5b9c770033d991c49d9298294520978006f631;hpb=4a4922b854d411a872193c60d112424e26da9809;p=inkscape.git diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index de5b9c770..6f38fd97d 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -1,5 +1,3 @@ -#define __NR_ARENA_SHAPE_C__ - /* * RGBA display list system for inkscape * @@ -12,32 +10,36 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include +#include +#include +#include - -#include -#include -#include -#include "display/curve.h" -#include -#include -#include -#include -#include -#include -#include +#include <2geom/svg-path.h> +#include <2geom/svg-path-parser.h> #include <2geom/pathvector.h> -#include -#include -#include -#include -#include "prefs-utils.h" +#include <2geom/curves.h> +#include "display/sp-canvas.h" +#include "display/canvas-arena.h" +#include "display/nr-arena.h" +#include "display/nr-arena-shape.h" +#include "display/curve.h" +#include "libnr/nr-pixops.h" +#include "libnr/nr-blit.h" +#include "libnr/nr-convert2geom.h" +#include "livarot/Path.h" +#include "livarot/float-line.h" +#include "livarot/int-line.h" +#include "style.h" #include "inkscape-cairo.h" - +#include "helper/geom.h" +#include "helper/geom-curves.h" #include "sp-filter.h" #include "sp-filter-reference.h" #include "display/nr-filter.h" +#include "preferences.h" -#include +#include "svg/svg.h" //int showRuns=0; void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS); @@ -54,7 +56,7 @@ static void nr_arena_shape_set_child_position(NRArenaItem *item, NRArenaItem *ch static guint nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset); static unsigned int nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags); static guint nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb); -static NRArenaItem *nr_arena_shape_pick(NRArenaItem *item, NR::Point p, double delta, unsigned int sticky); +static NRArenaItem *nr_arena_shape_pick(NRArenaItem *item, Geom::Point p, double delta, unsigned int sticky); static NRArenaItemClass *shape_parent_class; @@ -109,7 +111,7 @@ nr_arena_shape_init(NRArenaShape *shape) shape->paintbox.x0 = shape->paintbox.y0 = 0.0F; shape->paintbox.x1 = shape->paintbox.y1 = 256.0F; - shape->ctm.set_identity(); + shape->ctm.setIdentity(); shape->fill_painter = NULL; shape->stroke_painter = NULL; shape->cached_fill = NULL; @@ -123,8 +125,8 @@ nr_arena_shape_init(NRArenaShape *shape) shape->approx_bbox.x0 = shape->approx_bbox.y0 = 0; shape->approx_bbox.x1 = shape->approx_bbox.y1 = 0; - shape->cached_fctm.set_identity(); - shape->cached_sctm.set_identity(); + shape->cached_fctm.setIdentity(); + shape->cached_sctm.setIdentity(); shape->markers = NULL; @@ -226,7 +228,7 @@ nr_arena_shape_set_child_position(NRArenaItem *item, NRArenaItem *child, NRArena void nr_arena_shape_update_stroke(NRArenaShape *shape, NRGC* gc, NRRectL *area); void nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool force_shape = false); -void nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::Rect &bbox); +void nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::OptRect &bbox); /** * Updates the arena shape 'item' and all of its children, including the markers. @@ -234,7 +236,7 @@ void nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::Rect &bbox); static guint nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset) { - Geom::Rect boundingbox; + Geom::OptRect boundingbox; NRArenaShape *shape = NR_ARENA_SHAPE(item); @@ -251,12 +253,15 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g shape->ctm = gc->transform; if (state & NR_ARENA_ITEM_STATE_BBOX) { if (shape->curve) { - Geom::PathVector pv = shape->curve->get_pathvector() * to_2geom(gc->transform); - boundingbox = Geom::bounds_fast(pv); - item->bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F); - item->bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F); - item->bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F); - item->bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F); + boundingbox = bounds_exact_transformed(shape->curve->get_pathvector(), gc->transform); + if (boundingbox) { + item->bbox.x0 = static_cast(floor((*boundingbox)[0][0])); // Floor gives the coordinate in which the point resides + item->bbox.y0 = static_cast(floor((*boundingbox)[1][0])); + item->bbox.x1 = static_cast(ceil ((*boundingbox)[0][1])); // Ceil gives the first coordinate beyond the point + item->bbox.y1 = static_cast(ceil ((*boundingbox)[1][1])); + } else { + item->bbox = NR_RECT_L_EMPTY; + } } if (beststate & NR_ARENA_ITEM_STATE_BBOX) { for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) { @@ -269,44 +274,44 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g shape->delayed_shp=true; shape->ctm = gc->transform; - boundingbox[0][0] = boundingbox[1][0] = NR_HUGE; - boundingbox[0][1] = boundingbox[1][1] = -NR_HUGE; + boundingbox = Geom::OptRect(); bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE); if (shape->curve) { - Geom::PathVector pv = shape->curve->get_pathvector() * to_2geom(gc->transform); - boundingbox = Geom::bounds_fast(pv); + boundingbox = bounds_exact_transformed(shape->curve->get_pathvector(), gc->transform); - if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline) { + if (boundingbox && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) { float width, scale; - scale = NR::expansion(gc->transform); + scale = gc->transform.descrim(); width = MAX(0.125, shape->_stroke.width * scale); if ( fabs(shape->_stroke.width * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord - boundingbox.expandBy(width); + boundingbox->expandBy(width); } // those pesky miters, now float miterMax=width*shape->_stroke.mitre_limit; if ( miterMax > 0.01 ) { // grunt mode. we should compute the various miters instead (one for each point on the curve) - boundingbox.expandBy(miterMax); + boundingbox->expandBy(miterMax); } } + } + + /// \todo just write item->bbox = boundingbox + if (boundingbox) { + shape->approx_bbox.x0 = static_cast(floor((*boundingbox)[0][0])); + shape->approx_bbox.y0 = static_cast(floor((*boundingbox)[1][0])); + shape->approx_bbox.x1 = static_cast(ceil ((*boundingbox)[0][1])); + shape->approx_bbox.y1 = static_cast(ceil ((*boundingbox)[1][1])); } else { + shape->approx_bbox = NR_RECT_L_EMPTY; } - shape->approx_bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F); - shape->approx_bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F); - shape->approx_bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F); - shape->approx_bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F); - if ( area && nr_rect_l_test_intersect(area, &shape->approx_bbox) ) shape->delayed_shp=false; + if ( area && nr_rect_l_test_intersect_ptr(area, &shape->approx_bbox) ) shape->delayed_shp=false; /* Release state data */ - if (TRUE || !NR::transform_equalp(gc->transform, shape->ctm, NR_EPSILON)) { - /* Concept test */ - if (shape->fill_shp) { - delete shape->fill_shp; - shape->fill_shp = NULL; - } + if (shape->fill_shp) { + delete shape->fill_shp; + shape->fill_shp = NULL; } if (shape->stroke_shp) { delete shape->stroke_shp; @@ -338,23 +343,28 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g nr_arena_shape_update_stroke(shape, gc, area); nr_arena_shape_update_fill(shape, gc, area); - boundingbox[0][0] = boundingbox[0][1] = boundingbox[1][0] = boundingbox[1][1] = 0.0; + boundingbox = Geom::OptRect(); nr_arena_shape_add_bboxes(shape, boundingbox); - shape->approx_bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F); - shape->approx_bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F); - shape->approx_bbox.x1 = (gint32)(boundingbox[0][1] + 1.9999F); - shape->approx_bbox.y1 = (gint32)(boundingbox[1][1] + 1.9999F); + /// \todo just write shape->approx_bbox = boundingbox + if (boundingbox) { + shape->approx_bbox.x0 = static_cast(floor((*boundingbox)[0][0])); + shape->approx_bbox.y0 = static_cast(floor((*boundingbox)[1][0])); + shape->approx_bbox.x1 = static_cast(ceil ((*boundingbox)[0][1])); + shape->approx_bbox.y1 = static_cast(ceil ((*boundingbox)[1][1])); + } else { + shape->approx_bbox = NR_RECT_L_EMPTY; + } } - if (boundingbox.isEmpty()) + if (!boundingbox) return NR_ARENA_ITEM_STATE_ALL; - item->bbox.x0 = (gint32)(boundingbox[0][0] - 1.0F); - item->bbox.y0 = (gint32)(boundingbox[1][0] - 1.0F); - item->bbox.x1 = (gint32)(boundingbox[0][1] + 1.0F); - item->bbox.y1 = (gint32)(boundingbox[1][1] + 1.0F); - nr_arena_request_render_rect(item->arena, &item->bbox); + /// \todo just write item->bbox = boundingbox + item->bbox.x0 = static_cast(floor((*boundingbox)[0][0])); + item->bbox.y0 = static_cast(floor((*boundingbox)[1][0])); + item->bbox.x1 = static_cast(ceil ((*boundingbox)[0][1])); + item->bbox.y1 = static_cast(ceil ((*boundingbox)[1][1])); item->render_opacity = TRUE; if ( shape->_fill.paint.type() == NRArenaShape::Paint::SERVER ) { @@ -391,8 +401,8 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g return NR_ARENA_ITEM_STATE_ALL; } -int matrix_is_isometry(NR::Matrix p) { - NR::Matrix tp; +int matrix_is_isometry(Geom::Matrix p) { + Geom::Matrix tp; // transposition tp[0]=p[0]; tp[1]=p[2]; @@ -400,9 +410,9 @@ int matrix_is_isometry(NR::Matrix p) { tp[3]=p[3]; for (int i = 4; i < 6; i++) // shut valgrind up :) tp[i] = p[i] = 0; - NR::Matrix isom = tp*p; // A^T * A = adjunct? + Geom::Matrix isom = tp*p; // A^T * A = adjunct? // Is the adjunct nearly an identity function? - if (isom.is_translation(0.01)) { + if (isom.isTranslation(0.01)) { // the transformation is an isometry -> no need to recompute // the uncrossed polygon if ( p.det() < 0 ) @@ -417,14 +427,33 @@ static bool is_inner_area(NRRectL const &outer, NRRectL const &inner) { return (outer.x0 <= inner.x0 && outer.y0 <= inner.y0 && outer.x1 >= inner.x1 && outer.y1 >= inner.y1); } +/* returns true if the pathvector has a region that needs fill. + * is for optimizing purposes, so should be fast and can falsely return true. + * CANNOT falsely return false. */ +static bool has_inner_area(Geom::PathVector const & pv) { + // return false for the cases where there is surely no region to be filled + if (pv.empty()) + return false; + + if ( (pv.size() == 1) && (pv.front().size() <= 1) ) { + // vector has only one path with only one segment, see if that's a non-curve segment: that would mean no internal region + if ( is_straight_curve(pv.front().front()) ) + { + return false; + } + } + + return true; //too costly to see if it has region to be filled, so return true. +} + /** force_shape is used for clipping paths, when we need the shape for clipping even if it's not filled */ void nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool force_shape) { if ((shape->_fill.paint.type() != NRArenaShape::Paint::NONE || force_shape) && - ((shape->curve->get_length() > 2) || (SP_CURVE_BPATH(shape->curve)[1].code == NR_CURVETO)) ) { - if (TRUE || !shape->fill_shp) { - NR::Matrix cached_to_new = NR::identity(); + has_inner_area(shape->curve->get_pathvector()) ) { + + Geom::Matrix cached_to_new = Geom::identity(); int isometry = 0; if ( shape->cached_fill ) { if (shape->cached_fctm == gc->transform) { @@ -443,8 +472,8 @@ nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool fo Path* thePath=new Path; Shape* theShape=new Shape; { - NR::Matrix tempMat(gc->transform); - thePath->LoadArtBPath(SP_CURVE_BPATH(shape->curve),tempMat,true); + Geom::Matrix tempMat(gc->transform); + thePath->LoadPathVector(shape->curve->get_pathvector(), tempMat, true); } if (is_inner_area(*area, NR_ARENA_ITEM(shape)->bbox)) { @@ -486,7 +515,7 @@ nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool fo shape->fill_shp->Reset(shape->cached_fill->numberOfPoints(), shape->cached_fill->numberOfEdges()); for (int i = 0; i < shape->cached_fill->numberOfPoints(); i++) - shape->fill_shp->AddPoint(shape->cached_fill->getPoint(i).x * cached_to_new); + shape->fill_shp->AddPoint(to_2geom(shape->cached_fill->getPoint(i).x) * cached_to_new); if ( isometry == 1 ) { for (int i = 0; i < shape->cached_fill->numberOfEdges(); i++) shape->fill_shp->AddEdge(shape->cached_fill->getEdge(i).st, @@ -501,7 +530,6 @@ nr_arena_shape_update_fill(NRArenaShape *shape, NRGC *gc, NRRectL *area, bool fo shape->fill_shp->needEdgesSorting(); } shape->delayed_shp |= shape->cached_fpartialy; - } } } @@ -510,7 +538,7 @@ nr_arena_shape_update_stroke(NRArenaShape *shape,NRGC* gc, NRRectL *area) { SPStyle* style = shape->style; - float const scale = NR::expansion(gc->transform); + float const scale = gc->transform.descrim(); bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE); @@ -534,7 +562,7 @@ nr_arena_shape_update_stroke(NRArenaShape *shape,NRGC* gc, NRRectL *area) width = style_width; } - NR::Matrix cached_to_new = NR::identity(); + Geom::Matrix cached_to_new = Geom::identity(); int isometry = 0; if ( shape->cached_stroke ) { @@ -558,8 +586,8 @@ nr_arena_shape_update_stroke(NRArenaShape *shape,NRGC* gc, NRRectL *area) Path* thePath = new Path; Shape* theShape = new Shape; { - NR::Matrix tempMat(gc->transform); - thePath->LoadArtBPath(SP_CURVE_BPATH(shape->curve), tempMat, true); + Geom::Matrix tempMat( gc->transform ); + thePath->LoadPathVector(shape->curve->get_pathvector(), tempMat, true); } // add some padding to the rendering area, so clipped path does not go into a render area @@ -642,7 +670,7 @@ nr_arena_shape_update_stroke(NRArenaShape *shape,NRGC* gc, NRRectL *area) shape->stroke_shp=new Shape; shape->stroke_shp->Reset(shape->cached_stroke->numberOfPoints(), shape->cached_stroke->numberOfEdges()); for (int i = 0; i < shape->cached_stroke->numberOfPoints(); i++) - shape->stroke_shp->AddPoint(shape->cached_stroke->getPoint(i).x * cached_to_new); + shape->stroke_shp->AddPoint(to_2geom(shape->cached_stroke->getPoint(i).x) * cached_to_new); if ( isometry == 1 ) { for (int i = 0; i < shape->cached_stroke->numberOfEdges(); i++) shape->stroke_shp->AddEdge(shape->cached_stroke->getEdge(i).st, @@ -662,7 +690,7 @@ nr_arena_shape_update_stroke(NRArenaShape *shape,NRGC* gc, NRRectL *area) void -nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::Rect &bbox) +nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::OptRect &bbox) { /* TODO: are these two if's mutually exclusive? ( i.e. "shape->stroke_shp <=> !shape->fill_shp" ) * if so, then this can be written much more compact ! */ @@ -694,7 +722,7 @@ nr_arena_shape_add_bboxes(NRArenaShape* shape, Geom::Rect &bbox) // cairo outline rendering: static unsigned int -cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, NR::Maybe area) +cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, Geom::OptRect area) { NRArenaShape *shape = NR_ARENA_SHAPE(item); @@ -710,7 +738,7 @@ cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, NR::Maybecurve->get_pathvector(), to_2geom(shape->ctm), area, true, 0); + feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), shape->ctm, area, true, 0); cairo_stroke(ct); @@ -726,7 +754,7 @@ cairo_arena_shape_render_stroke(NRArenaItem *item, NRRectL *area, NRPixBlock *pb NRArenaShape *shape = NR_ARENA_SHAPE(item); SPStyle const *style = shape->style; - float const scale = NR::expansion(shape->ctm); + float const scale = shape->ctm.descrim(); if (fabs(shape->_stroke.width * scale) < 0.01) return; @@ -791,7 +819,7 @@ cairo_arena_shape_render_stroke(NRArenaItem *item, NRRectL *area, NRPixBlock *pb cairo_set_tolerance(ct, 0.1); cairo_new_path(ct); - feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), to_2geom(shape->ctm), area->upgrade(), true, style_width); + feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), shape->ctm, to_2geom(area->upgrade()), true, style_width); cairo_stroke(ct); @@ -803,7 +831,6 @@ cairo_arena_shape_render_stroke(NRArenaItem *item, NRRectL *area, NRPixBlock *pb pb->empty = FALSE; } - /** * Renders the item. Markers are just composed into the parent buffer. */ @@ -816,17 +843,18 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock if (!shape->style) return item->state; bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE); + bool print_colors_preview = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW); if (outline) { // cairo outline rendering pb->empty = FALSE; - unsigned int ret = cairo_arena_shape_render_outline (ct, item, (&pb->area)->upgrade()); + unsigned int ret = cairo_arena_shape_render_outline (ct, item, to_2geom((&pb->area)->upgrade())); if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret; } else { if ( shape->delayed_shp ) { - if ( nr_rect_l_test_intersect(area, &item->bbox) ) { + if ( nr_rect_l_test_intersect_ptr(area, &item->bbox) ) { NRGC tempGC(NULL); tempGC.transform=shape->ctm; shape->delayed_shp = false; @@ -846,6 +874,7 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock } SPStyle const *style = shape->style; + if (shape->fill_shp) { NRPixBlock m; guint32 rgba; @@ -865,12 +894,18 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock if (shape->_fill.paint.type() == NRArenaShape::Paint::NONE) { // do not render fill in any way } else if (shape->_fill.paint.type() == NRArenaShape::Paint::COLOR) { + + const SPColor* fill_color = &shape->_fill.paint.color(); if ( item->render_opacity ) { - rgba = shape->_fill.paint.color().toRGBA32( shape->_fill.opacity * - SP_SCALE24_TO_FLOAT(style->opacity.value) ); + rgba = fill_color->toRGBA32( shape->_fill.opacity * + SP_SCALE24_TO_FLOAT(style->opacity.value) ); } else { - rgba = shape->_fill.paint.color().toRGBA32( shape->_fill.opacity ); + rgba = fill_color->toRGBA32( shape->_fill.opacity ); } + + if (print_colors_preview) + nr_arena_separate_color_plates(&rgba); + nr_blit_pixblock_mask_rgba32(pb, &m, rgba); pb->empty = FALSE; } else if (shape->_fill.paint.type() == NRArenaShape::Paint::SERVER) { @@ -901,14 +936,19 @@ nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock nr_pixblock_render_shape_mask_or(m, shape->stroke_shp); m.empty = FALSE; - if ( item->render_opacity ) { - rgba = shape->_stroke.paint.color().toRGBA32( shape->_stroke.opacity * - SP_SCALE24_TO_FLOAT(style->opacity.value) ); - } else { - rgba = shape->_stroke.paint.color().toRGBA32( shape->_stroke.opacity ); - } - nr_blit_pixblock_mask_rgba32(pb, &m, rgba); - pb->empty = FALSE; + const SPColor* stroke_color = &shape->_stroke.paint.color(); + if ( item->render_opacity ) { + rgba = stroke_color->toRGBA32( shape->_stroke.opacity * + SP_SCALE24_TO_FLOAT(style->opacity.value) ); + } else { + rgba = stroke_color->toRGBA32( shape->_stroke.opacity ); + } + + if (print_colors_preview) + nr_arena_separate_color_plates(&rgba); + + nr_blit_pixblock_mask_rgba32(pb, &m, rgba); + pb->empty = FALSE; nr_pixblock_release(&m); @@ -966,7 +1006,7 @@ cairo_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb) cairo_new_path(ct); - feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), to_2geom(shape->ctm), (area)->upgrade(), false, 0); + feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), shape->ctm, (area)->upgrade(), false, 0); cairo_fill(ct); @@ -991,7 +1031,7 @@ nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb) if (!shape->curve) return item->state; if ( shape->delayed_shp || shape->fill_shp == NULL) { // we need a fill shape no matter what - if ( nr_rect_l_test_intersect(area, &item->bbox) ) { + if ( nr_rect_l_test_intersect_ptr(area, &item->bbox) ) { NRGC tempGC(NULL); tempGC.transform=shape->ctm; shape->delayed_shp = false; @@ -1034,7 +1074,7 @@ nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb) } static NRArenaItem * -nr_arena_shape_pick(NRArenaItem *item, NR::Point p, double delta, unsigned int /*sticky*/) +nr_arena_shape_pick(NRArenaItem *item, Geom::Point p, double delta, unsigned int /*sticky*/) { NRArenaShape *shape = NR_ARENA_SHAPE(item); @@ -1046,37 +1086,37 @@ nr_arena_shape_pick(NRArenaItem *item, NR::Point p, double delta, unsigned int / if (!shape->curve) return NULL; if (!shape->style) return NULL; - if (SP_SCALE24_TO_FLOAT(shape->style->opacity.value) == 0) // fully transparent, no pick + + bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE); + + if (SP_SCALE24_TO_FLOAT(shape->style->opacity.value) == 0 && !outline) + // fully transparent, no pick unless outline mode return NULL; GTimeVal tstart, tfinish; g_get_current_time (&tstart); - bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE); - double width; if (outline) { width = 0.5; } else if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE && shape->_stroke.opacity > 1e-3) { - float const scale = NR::expansion(shape->ctm); + float const scale = shape->ctm.descrim(); width = MAX(0.125, shape->_stroke.width * scale) / 2; } else { width = 0; } - const_NRBPath bp; - bp.path = SP_CURVE_BPATH(shape->curve); double dist = NR_HUGE; int wind = 0; bool needfill = (shape->_fill.paint.type() != NRArenaShape::Paint::NONE && shape->_fill.opacity > 1e-3 && !outline); if (item->arena->canvasarena) { - NR::Rect viewbox = item->arena->canvasarena->item.canvas->getViewbox(); - viewbox.growBy (width); - nr_path_matrix_point_bbox_wind_distance(&bp, shape->ctm, p, NULL, needfill? &wind : NULL, &dist, 0.5, &viewbox); + Geom::Rect viewbox = item->arena->canvasarena->item.canvas->getViewbox(); + viewbox.expandBy (width); + pathv_matrix_point_bbox_wind_distance(shape->curve->get_pathvector(), shape->ctm, p, NULL, needfill? &wind : NULL, &dist, 0.5, &viewbox); } else { - nr_path_matrix_point_bbox_wind_distance(&bp, shape->ctm, p, NULL, needfill? &wind : NULL, &dist, 0.5, NULL); + pathv_matrix_point_bbox_wind_distance(shape->curve->get_pathvector(), shape->ctm, p, NULL, needfill? &wind : NULL, &dist, 0.5, NULL); } g_get_current_time (&tfinish); @@ -1307,7 +1347,7 @@ nr_arena_shape_set_style(NRArenaShape *shape, SPStyle *style) if (style->filter.set && style->getFilter()) { if (!shape->filter) { int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter())); - shape->filter = new NR::Filter(primitives); + shape->filter = new Inkscape::Filters::Filter(primitives); } sp_filter_build_renderer(SP_FILTER(style->getFilter()), shape->filter); } else { @@ -1337,12 +1377,12 @@ nr_arena_shape_set_paintbox(NRArenaShape *shape, NRRect const *pbox) nr_arena_item_request_update(shape, NR_ARENA_ITEM_STATE_ALL, FALSE); } -void NRArenaShape::setPaintBox(NR::Rect const &pbox) +void NRArenaShape::setPaintBox(Geom::Rect const &pbox) { - paintbox.x0 = pbox.min()[NR::X]; - paintbox.y0 = pbox.min()[NR::Y]; - paintbox.x1 = pbox.max()[NR::X]; - paintbox.y1 = pbox.max()[NR::Y]; + paintbox.x0 = pbox.min()[Geom::X]; + paintbox.y0 = pbox.min()[Geom::Y]; + paintbox.x1 = pbox.max()[Geom::X]; + paintbox.y1 = pbox.max()[Geom::Y]; nr_arena_item_request_update(this, NR_ARENA_ITEM_STATE_ALL, FALSE); } @@ -1468,4 +1508,4 @@ void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :