![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 917b2af806185b3bba7ee1d2b985822815875d06..6f38fd97d8d018d57a57af5bae793749235b0246 100644 (file)
-#define __NR_ARENA_SHAPE_C__
-
/*
* RGBA display list system for inkscape
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include <glib.h>
+#include <fenv.h>
+#include <typeinfo>
+#include <cairo.h>
-
-#include <display/nr-arena.h>
-#include <display/nr-arena-shape.h>
-#include "display/nr-filter.h"
-#include "display/nr-filter-gaussian.h"
-#include "display/nr-filter-types.h"
-#include <libnr/n-art-bpath.h>
-#include <libnr/nr-path.h>
-#include <libnr/nr-pixops.h>
-#include <libnr/nr-matrix-ops.h>
-#include <libnr/nr-matrix-fns.h>
-#include <libnr/nr-blit.h>
-#include <livarot/Path.h>
-#include <livarot/float-line.h>
-#include <livarot/int-line.h>
-#include <style.h>
-#include "prefs-utils.h"
+#include <2geom/svg-path.h>
+#include <2geom/svg-path-parser.h>
+#include <2geom/pathvector.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-gaussian-blur.h"
+#include "sp-filter-reference.h"
+#include "display/nr-filter.h"
+#include "preferences.h"
-#include <cairo.h>
+#include "svg/svg.h"
//int showRuns=0;
void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS);
static void nr_arena_shape_set_child_position(NRArenaItem *item, NRArenaItem *child, NRArenaItem *ref);
static guint nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset);
-static unsigned int nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags);
+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;
shape->paintbox.x0 = shape->paintbox.y0 = 0.0F;
shape->paintbox.x1 = shape->paintbox.y1 = 256.0F;
- nr_matrix_set_identity(&shape->ctm);
+ shape->ctm.setIdentity();
shape->fill_painter = NULL;
shape->stroke_painter = NULL;
shape->cached_fill = NULL;
shape->approx_bbox.x0 = shape->approx_bbox.y0 = 0;
shape->approx_bbox.x1 = shape->approx_bbox.y1 = 0;
- nr_matrix_set_identity(&shape->cached_fctm);
- nr_matrix_set_identity(&shape->cached_sctm);
+ shape->cached_fctm.setIdentity();
+ shape->cached_sctm.setIdentity();
shape->markers = NULL;
+
+ shape->last_pick = NULL;
+ shape->repick_after = 0;
}
static void
if (shape->stroke_painter) sp_painter_free(shape->stroke_painter);
if (shape->style) sp_style_unref(shape->style);
- if (shape->curve) sp_curve_unref(shape->curve);
+ if (shape->curve) shape->curve->unref();
((NRObjectClass *) shape_parent_class)->finalize(object);
}
@@ -219,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,NRRect &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.
static guint
nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset)
{
- NRRect bbox;
+ Geom::OptRect boundingbox;
NRArenaShape *shape = NR_ARENA_SHAPE(item);
@@ -244,16 +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) {
- NRBPath bp;
- /* fixme: */
- bbox.x0 = bbox.y0 = NR_HUGE;
- bbox.x1 = bbox.y1 = -NR_HUGE;
- bp.path = SP_CURVE_BPATH(shape->curve);
- nr_path_matrix_bbox_union(&bp, gc->transform, &bbox);
- item->bbox.x0 = (gint32)(bbox.x0 - 1.0F);
- item->bbox.y0 = (gint32)(bbox.y0 - 1.0F);
- item->bbox.x1 = (gint32)(bbox.x1 + 1.9999F);
- item->bbox.y1 = (gint32)(bbox.y1 + 1.9999F);
+ boundingbox = bounds_exact_transformed(shape->curve->get_pathvector(), gc->transform);
+ if (boundingbox) {
+ item->bbox.x0 = static_cast<NR::ICoord>(floor((*boundingbox)[0][0])); // Floor gives the coordinate in which the point resides
+ item->bbox.y0 = static_cast<NR::ICoord>(floor((*boundingbox)[1][0]));
+ item->bbox.x1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[0][1])); // Ceil gives the first coordinate beyond the point
+ item->bbox.y1 = static_cast<NR::ICoord>(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) {
@@ -266,53 +274,44 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
shape->delayed_shp=true;
shape->ctm = gc->transform;
- bbox.x0 = bbox.y0 = NR_HUGE;
- bbox.x1 = bbox.y1 = -NR_HUGE;
+ boundingbox = Geom::OptRect();
- bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
+ bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
if (shape->curve) {
- NRBPath bp;
- /* fixme: */
- bbox.x0 = bbox.y0 = NR_HUGE;
- bbox.x1 = bbox.y1 = -NR_HUGE;
- bp.path = SP_CURVE_BPATH(shape->curve);
- nr_path_matrix_bbox_union(&bp, gc->transform, &bbox);
- if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline) {
+ boundingbox = bounds_exact_transformed(shape->curve->get_pathvector(), gc->transform);
+
+ if (boundingbox && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) {
float width, scale;
- scale = NR_MATRIX_DF_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
- bbox.x0-=width;
- bbox.x1+=width;
- bbox.y0-=width;
- bbox.y1+=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)
- bbox.x0-=miterMax;
- bbox.x1+=miterMax;
- bbox.y0-=miterMax;
- bbox.y1+=miterMax;
+ boundingbox->expandBy(miterMax);
}
}
+ }
+
+ /// \todo just write item->bbox = boundingbox
+ if (boundingbox) {
+ shape->approx_bbox.x0 = static_cast<NR::ICoord>(floor((*boundingbox)[0][0]));
+ shape->approx_bbox.y0 = static_cast<NR::ICoord>(floor((*boundingbox)[1][0]));
+ shape->approx_bbox.x1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[0][1]));
+ shape->approx_bbox.y1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[1][1]));
} else {
+ shape->approx_bbox = NR_RECT_L_EMPTY;
}
- shape->approx_bbox.x0 = (gint32)(bbox.x0 - 1.0F);
- shape->approx_bbox.y0 = (gint32)(bbox.y0 - 1.0F);
- shape->approx_bbox.x1 = (gint32)(bbox.x1 + 1.9999F);
- shape->approx_bbox.y1 = (gint32)(bbox.y1 + 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_matrix_test_transform_equal(&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;
@@ -329,7 +328,7 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
if (!shape->curve ||
!shape->style ||
- sp_curve_is_empty(shape->curve) ||
+ shape->curve->is_empty() ||
(( shape->_fill.paint.type() == NRArenaShape::Paint::NONE ) &&
( shape->_stroke.paint.type() == NRArenaShape::Paint::NONE && !outline) ))
{
@@ -344,28 +343,34 @@ 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);
- bbox.x0 = bbox.y0 = bbox.x1 = bbox.y1 = 0.0;
- nr_arena_shape_add_bboxes(shape,bbox);
+ boundingbox = Geom::OptRect();
+ nr_arena_shape_add_bboxes(shape, boundingbox);
- shape->approx_bbox.x0 = (gint32)(bbox.x0 - 1.0F);
- shape->approx_bbox.y0 = (gint32)(bbox.y0 - 1.0F);
- shape->approx_bbox.x1 = (gint32)(bbox.x1 + 1.9999F);
- shape->approx_bbox.y1 = (gint32)(bbox.y1 + 1.9999F);
+ /// \todo just write shape->approx_bbox = boundingbox
+ if (boundingbox) {
+ shape->approx_bbox.x0 = static_cast<NR::ICoord>(floor((*boundingbox)[0][0]));
+ shape->approx_bbox.y0 = static_cast<NR::ICoord>(floor((*boundingbox)[1][0]));
+ shape->approx_bbox.x1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[0][1]));
+ shape->approx_bbox.y1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[1][1]));
+ } else {
+ shape->approx_bbox = NR_RECT_L_EMPTY;
+ }
}
- if (nr_rect_d_test_empty(&bbox)) return NR_ARENA_ITEM_STATE_ALL;
+ if (!boundingbox)
+ return NR_ARENA_ITEM_STATE_ALL;
- item->bbox.x0 = (gint32)(bbox.x0 - 1.0F);
- item->bbox.y0 = (gint32)(bbox.y0 - 1.0F);
- item->bbox.x1 = (gint32)(bbox.x1 + 1.0F);
- item->bbox.y1 = (gint32)(bbox.y1 + 1.0F);
- nr_arena_request_render_rect(item->arena, &item->bbox);
+ /// \todo just write item->bbox = boundingbox
+ item->bbox.x0 = static_cast<NR::ICoord>(floor((*boundingbox)[0][0]));
+ item->bbox.y0 = static_cast<NR::ICoord>(floor((*boundingbox)[1][0]));
+ item->bbox.x1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[0][1]));
+ item->bbox.y1 = static_cast<NR::ICoord>(ceil ((*boundingbox)[1][1]));
item->render_opacity = TRUE;
if ( shape->_fill.paint.type() == NRArenaShape::Paint::SERVER ) {
if (gc && gc->parent) {
shape->fill_painter = sp_paint_server_painter_new(shape->_fill.paint.server(),
- NR::Matrix(&gc->transform), NR::Matrix(&gc->parent->transform),
+ gc->transform, gc->parent->transform,
&shape->paintbox);
}
item->render_opacity = FALSE;
@@ -373,16 +378,17 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
if ( shape->_stroke.paint.type() == NRArenaShape::Paint::SERVER ) {
if (gc && gc->parent) {
shape->stroke_painter = sp_paint_server_painter_new(shape->_stroke.paint.server(),
- NR::Matrix(&gc->transform), NR::Matrix(&gc->parent->transform),
+ gc->transform, gc->parent->transform,
&shape->paintbox);
}
item->render_opacity = FALSE;
}
- if ( item->render_opacity == TRUE
- && shape->_fill.paint.type() != NRArenaShape::Paint::NONE
- && shape->_stroke.paint.type() != NRArenaShape::Paint::NONE )
+ if ( (shape->_fill.paint.type() != NRArenaShape::Paint::NONE &&
+ shape->_stroke.paint.type() != NRArenaShape::Paint::NONE)
+ || (shape->markers)
+ )
{
- // don't merge item opacity with paint opacity if there is a stroke on the fill
+ // don't merge item opacity with paint opacity if there is a stroke on the fill, or markers on stroke
item->render_opacity = FALSE;
}
@@ -395,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];
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 )
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->end > 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) {
@@ -447,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)) {
@@ -490,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,
@@ -505,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;
- }
}
}
{
SPStyle* style = shape->style;
- float const scale = NR_MATRIX_DF_EXPANSION(&gc->transform);
+ float const scale = gc->transform.descrim();
- bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
+ bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
if (outline) {
- return; // cairo does not need the livarot path, hehe
+ // cairo does not need the livarot path for rendering
+ return;
}
+ // after switching normal stroke rendering to cairo too, optimize this: lower tolerance, disregard dashes
+ // (since it will only be used for picking, not for rendering)
+
if (outline ||
((shape->_stroke.paint.type() != NRArenaShape::Paint::NONE) &&
( fabs(shape->_stroke.width * scale) > 0.01 ))) { // sinon c'est 0=oon veut pas de bord
width = style_width;
}
- NR::Matrix cached_to_new = NR::identity();
+ Geom::Matrix cached_to_new = Geom::identity();
int isometry = 0;
if ( shape->cached_stroke ) {
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
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,
void
-nr_arena_shape_add_bboxes(NRArenaShape* shape, NRRect &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 ! */
+
if ( shape->stroke_shp ) {
- shape->stroke_shp->CalcBBox();
- shape->stroke_shp->leftX=floor(shape->stroke_shp->leftX);
- shape->stroke_shp->rightX=ceil(shape->stroke_shp->rightX);
- shape->stroke_shp->topY=floor(shape->stroke_shp->topY);
- shape->stroke_shp->bottomY=ceil(shape->stroke_shp->bottomY);
- if ( bbox.x0 >= bbox.x1 ) {
- if ( shape->stroke_shp->leftX < shape->stroke_shp->rightX ) {
- bbox.x0=shape->stroke_shp->leftX;
- bbox.x1=shape->stroke_shp->rightX;
- }
- } else {
- if ( shape->stroke_shp->leftX < bbox.x0 )
- bbox.x0=shape->stroke_shp->leftX;
- if ( shape->stroke_shp->rightX > bbox.x1 )
- bbox.x1=shape->stroke_shp->rightX;
- }
- if ( bbox.y0 >= bbox.y1 ) {
- if ( shape->stroke_shp->topY < shape->stroke_shp->bottomY ) {
- bbox.y0=shape->stroke_shp->topY;
- bbox.y1=shape->stroke_shp->bottomY;
- }
- } else {
- if ( shape->stroke_shp->topY < bbox.y0 )
- bbox.y0=shape->stroke_shp->topY;
- if ( shape->stroke_shp->bottomY > bbox.y1 )
- bbox.y1=shape->stroke_shp->bottomY;
- }
+ Shape *larger = shape->stroke_shp;
+ larger->CalcBBox();
+ larger->leftX = floor(larger->leftX);
+ larger->rightX = ceil(larger->rightX);
+ larger->topY = floor(larger->topY);
+ larger->bottomY = ceil(larger->bottomY);
+ Geom::Rect stroke_bbox( Geom::Interval(larger->leftX, larger->rightX),
+ Geom::Interval(larger->topY, larger->bottomY) );
+ bbox.unionWith(stroke_bbox);
}
+
if ( shape->fill_shp ) {
- shape->fill_shp->CalcBBox();
- shape->fill_shp->leftX=floor(shape->fill_shp->leftX);
- shape->fill_shp->rightX=ceil(shape->fill_shp->rightX);
- shape->fill_shp->topY=floor(shape->fill_shp->topY);
- shape->fill_shp->bottomY=ceil(shape->fill_shp->bottomY);
- if ( bbox.x0 >= bbox.x1 ) {
- if ( shape->fill_shp->leftX < shape->fill_shp->rightX ) {
- bbox.x0=shape->fill_shp->leftX;
- bbox.x1=shape->fill_shp->rightX;
- }
- } else {
- if ( shape->fill_shp->leftX < bbox.x0 ) bbox.x0=shape->fill_shp->leftX;
- if ( shape->fill_shp->rightX > bbox.x1 ) bbox.x1=shape->fill_shp->rightX;
- }
- if ( bbox.y0 >= bbox.y1 ) {
- if ( shape->fill_shp->topY < shape->fill_shp->bottomY ) {
- bbox.y0=shape->fill_shp->topY;
- bbox.y1=shape->fill_shp->bottomY;
- }
- } else {
- if ( shape->fill_shp->topY < bbox.y0 ) bbox.y0=shape->fill_shp->topY;
- if ( shape->fill_shp->bottomY > bbox.y1 ) bbox.y1=shape->fill_shp->bottomY;
- }
+ Shape *larger = shape->fill_shp;
+ larger->CalcBBox();
+ larger->leftX = floor(larger->leftX);
+ larger->rightX = ceil(larger->rightX);
+ larger->topY = floor(larger->topY);
+ larger->bottomY = ceil(larger->bottomY);
+ Geom::Rect fill_bbox( Geom::Interval(larger->leftX, larger->rightX),
+ Geom::Interval(larger->topY, larger->bottomY) );
+ bbox.unionWith(fill_bbox);
}
}
-/**
- * Renders the item. Markers are just composed into the parent buffer.
- */
+// cairo outline rendering:
static unsigned int
-nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
+cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, Geom::OptRect area)
{
NRArenaShape *shape = NR_ARENA_SHAPE(item);
- if (!shape->curve) return item->state;
- if (!shape->style) return item->state;
+ if (!ct)
+ return item->state;
- bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
+ guint32 rgba = NR_ARENA_ITEM(shape)->arena->outlinecolor;
+ // FIXME: we use RGBA buffers but cairo writes BGRA (on i386), so we must cheat
+ // by setting color channels in the "wrong" order
+ cairo_set_source_rgba(ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
- if (outline) { // fixme: if no problems reported, remove old outline stuff
- NRPixBlock m;
- int width = area->x1 - area->x0;
- int height = area->y1 - area->y0;
-
- //known bug: buffer for cairo must have stride divisible by 4, even though this is a one-byte-per-pixel mode
- int rem = width % 4;
- int x1 = area->x1;
- if (rem != 0) {
- width += (4 - rem);
- x1 = area->x0 + width;
- }
+ cairo_set_line_width(ct, 0.5);
+ cairo_set_tolerance(ct, 1.25); // low quality, but good enough for outline mode
+ cairo_new_path(ct);
- nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, x1, area->y1, TRUE);
- m.visible_area = pb->visible_area;
- m.empty = FALSE;
+ feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), shape->ctm, area, true, 0);
- cairo_surface_t* cst = cairo_image_surface_create_for_data
- (NR_PIXBLOCK_PX(&m),
- CAIRO_FORMAT_A8,
- width,
- height,
- m.rs);
- cairo_t *ct = cairo_create (cst);
- cairo_set_source_rgba(ct, 0, 0, 0, 1.0);
- cairo_set_line_width(ct, 0.5);
- cairo_set_miter_limit(ct, 0.0);
- cairo_set_tolerance(ct, 1.25); // low quality, but good enough for outline mode
- cairo_new_path(ct);
+ cairo_stroke(ct);
- NR::Matrix trans(shape->ctm);
- NR::Point lastX(0,0);
- bool closed = false;
- NArtBpath *bpath = SP_CURVE_BPATH(shape->curve);
- for (int i = 0; bpath[i].code != NR_END; i++) {
- switch (bpath[i].code) {
- case NR_MOVETO_OPEN:
- case NR_MOVETO:
- if (closed) cairo_close_path(ct);
- closed = (bpath[i].code == NR_MOVETO);
- lastX[NR::X] = bpath[i].x3;
- lastX[NR::Y] = bpath[i].y3;
- lastX*=trans;
- lastX -= NR::Point(area->x0, area->y0);
- cairo_move_to(ct, lastX[NR::X], lastX[NR::Y]);
- break;
+ return item->state;
+}
- case NR_LINETO:
- lastX[NR::X] = bpath[i].x3;
- lastX[NR::Y] = bpath[i].y3;
- lastX*=trans;
- lastX -= NR::Point(area->x0, area->y0);
- cairo_line_to(ct, lastX[NR::X], lastX[NR::Y]);
- break;
+// cairo stroke rendering (flat color only so far!):
+// works on canvas, but wrongs the colors in nonpremul buffers: icons and png export
+// (need to switch them to premul before this can be enabled)
+void
+cairo_arena_shape_render_stroke(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
+{
+ NRArenaShape *shape = NR_ARENA_SHAPE(item);
+ SPStyle const *style = shape->style;
- 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;
- tm1 -= NR::Point(area->x0, area->y0);
- tm2 -= NR::Point(area->x0, area->y0);
- tm3 -= NR::Point(area->x0, area->y0);
- cairo_curve_to (ct, tm1[NR::X], tm1[NR::Y], tm2[NR::X], tm2[NR::Y], tm3[NR::X], tm3[NR::Y]);
- break;
- }
+ float const scale = shape->ctm.descrim();
- default:
- break;
- }
- }
+ if (fabs(shape->_stroke.width * scale) < 0.01)
+ return;
- cairo_stroke(ct);
+ cairo_t *ct = nr_create_cairo_context (area, pb);
- cairo_destroy (ct);
- cairo_surface_finish (cst);
+ if (!ct)
+ return;
- guint32 rgba = NR_ARENA_ITEM(shape)->arena->outlinecolor;
- nr_blit_pixblock_mask_rgba32(pb, &m, rgba);
- pb->empty = FALSE;
+ guint32 rgba;
+ 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 );
+ }
- cairo_surface_destroy (cst);
+ // FIXME: we use RGBA buffers but cairo writes BGRA (on i386), so we must cheat
+ // by setting color channels in the "wrong" order
+ cairo_set_source_rgba(ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
- nr_pixblock_release(&m);
+ float style_width = MAX(0.125, shape->_stroke.width * scale);
+ cairo_set_line_width(ct, style_width);
- return item->state;
+ switch (shape->_stroke.cap) {
+ case NRArenaShape::BUTT_CAP:
+ cairo_set_line_cap(ct, CAIRO_LINE_CAP_BUTT);
+ break;
+ case NRArenaShape::ROUND_CAP:
+ cairo_set_line_cap(ct, CAIRO_LINE_CAP_ROUND);
+ break;
+ case NRArenaShape::SQUARE_CAP:
+ cairo_set_line_cap(ct, CAIRO_LINE_CAP_SQUARE);
+ break;
+ }
+ switch (shape->_stroke.join) {
+ case NRArenaShape::MITRE_JOIN:
+ cairo_set_line_join(ct, CAIRO_LINE_JOIN_MITER);
+ break;
+ case NRArenaShape::ROUND_JOIN:
+ cairo_set_line_join(ct, CAIRO_LINE_JOIN_ROUND);
+ break;
+ case NRArenaShape::BEVEL_JOIN:
+ cairo_set_line_join(ct, CAIRO_LINE_JOIN_BEVEL);
+ break;
}
+ cairo_set_miter_limit (ct, style->stroke_miterlimit.value);
+
+ if (style->stroke_dash.n_dash) {
+ NRVpathDash dash;
+ dash.offset = style->stroke_dash.offset * scale;
+ dash.n_dash = style->stroke_dash.n_dash;
+ dash.dash = g_new(double, dash.n_dash);
+ for (int i = 0; i < dash.n_dash; i++) {
+ dash.dash[i] = style->stroke_dash.dash[i] * scale;
+ }
+ cairo_set_dash (ct, dash.dash, dash.n_dash, dash.offset);
+ g_free(dash.dash);
+ }
+
+ cairo_set_tolerance(ct, 0.1);
+ cairo_new_path(ct);
+
+ feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), shape->ctm, to_2geom(area->upgrade()), true, style_width);
+
+ cairo_stroke(ct);
+
+ cairo_surface_t *cst = cairo_get_target(ct);
+ cairo_destroy (ct);
+ cairo_surface_finish (cst);
+ cairo_surface_destroy (cst);
+
+ pb->empty = FALSE;
+}
+
+/**
+ * Renders the item. Markers are just composed into the parent buffer.
+ */
+static unsigned int
+nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
+{
+ NRArenaShape *shape = NR_ARENA_SHAPE(item);
+
+ if (!shape->curve) return item->state;
+ 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, 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;
@@ -848,7 +874,8 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
}
SPStyle const *style = shape->style;
- if ( shape->fill_shp && !outline) {
+
+ if (shape->fill_shp) {
NRPixBlock m;
guint32 rgba;
@@ -860,21 +887,25 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
return (item->state);
}
- m.visible_area = pb->visible_area;
+ m.visible_area = pb->visible_area;
nr_pixblock_render_shape_mask_or(m,shape->fill_shp);
m.empty = FALSE;
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 = sp_color_get_rgba32_falpha(&shape->_fill.paint.color(),
- 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 = sp_color_get_rgba32_falpha(&shape->_fill.paint.color(),
- 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) {
@@ -886,9 +917,44 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
nr_pixblock_release(&m);
}
- if ( shape->stroke_shp ) {
- NRPixBlock m;
+ if (shape->stroke_shp && shape->_stroke.paint.type() == NRArenaShape::Paint::COLOR) {
+
+ // cairo_arena_shape_render_stroke(item, area, pb);
+
guint32 rgba;
+ NRPixBlock m;
+
+ nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, area->x1, area->y1, TRUE);
+
+ // if memory allocation failed, abort render
+ if (m.size != NR_PIXBLOCK_SIZE_TINY && m.data.px == NULL) {
+ nr_pixblock_release (&m);
+ return (item->state);
+ }
+
+ m.visible_area = pb->visible_area;
+ nr_pixblock_render_shape_mask_or(m, shape->stroke_shp);
+ m.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);
+
+ } else if (shape->stroke_shp && shape->_stroke.paint.type() == NRArenaShape::Paint::SERVER) {
+
+ NRPixBlock m;
nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, area->x1, area->y1, TRUE);
@@ -902,46 +968,70 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
nr_pixblock_render_shape_mask_or(m, shape->stroke_shp);
m.empty = FALSE;
- if (shape->_stroke.paint.type() == NRArenaShape::Paint::COLOR || outline) {
- if (outline) {
- rgba = NR_ARENA_ITEM(shape)->arena->outlinecolor;
- } else if ( item->render_opacity ) {
- rgba = sp_color_get_rgba32_falpha(&shape->_stroke.paint.color(),
- shape->_stroke.opacity *
- SP_SCALE24_TO_FLOAT(style->opacity.value));
- } else {
- rgba = sp_color_get_rgba32_falpha(&shape->_stroke.paint.color(),
- shape->_stroke.opacity);
- }
- nr_blit_pixblock_mask_rgba32(pb, &m, rgba);
- pb->empty = FALSE;
- } else if (shape->_stroke.paint.type() == NRArenaShape::Paint::SERVER) {
- if (shape->stroke_painter) {
- nr_arena_render_paintserver_fill(pb, area, shape->stroke_painter, shape->_stroke.opacity, &m);
- }
+ if (shape->stroke_painter) {
+ nr_arena_render_paintserver_fill(pb, area, shape->stroke_painter, shape->_stroke.opacity, &m);
}
nr_pixblock_release(&m);
}
- /* Just compose children into parent buffer */
+ } // non-cairo non-outline branch
+
+ /* Render markers into parent buffer */
for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) {
- unsigned int ret;
- ret = nr_arena_item_invoke_render(child, area, pb, flags);
+ unsigned int ret = nr_arena_item_invoke_render(ct, child, area, pb, flags);
if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret;
}
return item->state;
}
+
+// cairo clipping: this basically works except for the stride-must-be-divisible-by-4 cairo bug;
+// reenable this when the bug is fixed and remove the rest of this function
+// TODO
+#if defined(DEADCODE) && !defined(DEADCODE)
+static guint
+cairo_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
+{
+ NRArenaShape *shape = NR_ARENA_SHAPE(item);
+ if (!shape->curve) return item->state;
+
+ cairo_t *ct = nr_create_cairo_context (area, pb);
+
+ if (!ct)
+ return item->state;
+
+ cairo_set_source_rgba(ct, 0, 0, 0, 1);
+
+ cairo_new_path(ct);
+
+ feed_pathvector_to_cairo (ct, shape->curve->get_pathvector(), shape->ctm, (area)->upgrade(), false, 0);
+
+ cairo_fill(ct);
+
+ cairo_surface_t *cst = cairo_get_target(ct);
+ cairo_destroy (ct);
+ cairo_surface_finish (cst);
+ cairo_surface_destroy (cst);
+
+ pb->empty = FALSE;
+
+ return item->state;
+}
+#endif //defined(DEADCODE) && !defined(DEADCODE)
+
+
static guint
nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
{
+ //return cairo_arena_shape_clip(item, area, pb);
+
NRArenaShape *shape = NR_ARENA_SHAPE(item);
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;
}
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);
+ if (shape->repick_after > 0)
+ shape->repick_after--;
+
+ if (shape->repick_after > 0) // we are a slow, huge path. skip this pick, returning what was returned last time
+ return shape->last_pick;
+
if (!shape->curve) return NULL;
if (!shape->style) return NULL;
- if ( shape->delayed_shp ) {
- NRRectL area, updateArea;
- area.x0=(int)floor(p[NR::X]);
- area.x1=(int)ceil(p[NR::X]);
- area.y0=(int)floor(p[NR::Y]);
- area.y1=(int)ceil(p[NR::Y]);
- int idelta = (int)ceil(delta) + 1;
- // njh: inset rect
- area.x0-=idelta;
- area.x1+=idelta;
- area.y0-=idelta;
- area.y1+=idelta;
- if ( nr_rect_l_test_intersect(&area, &item->bbox) ) {
- NRGC tempGC(NULL);
- tempGC.transform=shape->ctm;
- updateArea = item->bbox;
- if (shape->cached_stroke)
- nr_rect_l_intersect (&updateArea, &updateArea, &shape->cached_sarea);
- shape->delayed_shp = false;
- nr_arena_shape_update_stroke(shape, &tempGC, &updateArea);
- nr_arena_shape_update_fill(shape, &tempGC, &updateArea);
- /* NRRect bbox;
- bbox.x0 = bbox.y0 = bbox.x1 = bbox.y1 = 0.0;
- nr_arena_shape_add_bboxes(shape,bbox);
- item->bbox.x0 = (gint32)(bbox.x0 - 1.0F);
- item->bbox.y0 = (gint32)(bbox.y0 - 1.0F);
- item->bbox.x1 = (gint32)(bbox.x1 + 1.0F);
- item->bbox.y1 = (gint32)(bbox.y1 + 1.0F);
- shape->approx_bbox=item->bbox;*/
- }
+ 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);
+
+ double width;
+ if (outline) {
+ width = 0.5;
+ } else if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE && shape->_stroke.opacity > 1e-3) {
+ float const scale = shape->ctm.descrim();
+ width = MAX(0.125, shape->_stroke.width * scale) / 2;
+ } else {
+ width = 0;
}
- bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
+ double dist = NR_HUGE;
+ int wind = 0;
+ bool needfill = (shape->_fill.paint.type() != NRArenaShape::Paint::NONE
+ && shape->_fill.opacity > 1e-3 && !outline);
- if (item->state & NR_ARENA_ITEM_STATE_RENDER) {
- if (shape->fill_shp && (shape->_fill.paint.type() != NRArenaShape::Paint::NONE)) {
- if (shape->fill_shp->PtWinding(p) > 0 ) return item;
- }
- if (shape->stroke_shp && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) {
- if (shape->stroke_shp->PtWinding(p) > 0 ) return item;
- }
- if (delta > 1e-3) {
- if (shape->fill_shp && (shape->_fill.paint.type() != NRArenaShape::Paint::NONE)) {
- if (distanceLessThanOrEqual(shape->fill_shp, p, delta)) return item;
+ if (item->arena->canvasarena) {
+ 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 {
+ 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);
+ glong this_pick = (tfinish.tv_sec - tstart.tv_sec) * 1000000 + (tfinish.tv_usec - tstart.tv_usec);
+ //g_print ("pick time %lu\n", this_pick);
+
+ if (this_pick > 10000) { // slow picking, remember to skip several new picks
+ shape->repick_after = this_pick / 5000;
+ }
+
+ // covered by fill?
+ if (needfill) {
+ if (!shape->style->fill_rule.computed) {
+ if (wind != 0) {
+ shape->last_pick = item;
+ return item;
}
- if (shape->stroke_shp && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) {
- if (distanceLessThanOrEqual(shape->stroke_shp, p, delta)) return item;
+ } else {
+ if (wind & 0x1) {
+ shape->last_pick = item;
+ return item;
}
}
- } else {
- NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- double dist = NR_HUGE;
- int wind = 0;
- nr_path_matrix_point_bbox_wind_distance(&bp, shape->ctm, p, NULL, &wind, &dist, NR_EPSILON);
- if (shape->_fill.paint.type() != NRArenaShape::Paint::NONE) {
- if (!shape->style->fill_rule.computed) {
- if (wind != 0) return item;
- } else {
- if (wind & 0x1) return item;
- }
+ }
+
+ // close to the edge, as defined by strokewidth and delta?
+ // this ignores dashing (as if the stroke is solid) and always works as if caps are round
+ if (needfill || width > 0) { // if either fill or stroke visible,
+ if ((dist - width) < delta) {
+ shape->last_pick = item;
+ return item;
}
- if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline) {
- /* fixme: We do not take stroke width into account here (Lauris) */
- if (dist < delta) return item;
+ }
+
+ // if not picked on the shape itself, try its markers
+ for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) {
+ NRArenaItem *ret = nr_arena_item_invoke_pick(child, p, delta, 0);
+ if (ret) {
+ shape->last_pick = item;
+ return item;
}
}
+ shape->last_pick = NULL;
return NULL;
}
@@ -1089,13 +1191,13 @@ void nr_arena_shape_set_path(NRArenaShape *shape, SPCurve *curve,bool justTrans)
nr_arena_item_request_render(NR_ARENA_ITEM(shape));
if (shape->curve) {
- sp_curve_unref(shape->curve);
+ shape->curve->unref();
shape->curve = NULL;
}
if (curve) {
shape->curve = curve;
- sp_curve_ref(curve);
+ curve->ref();
}
nr_arena_item_request_update(NR_ARENA_ITEM(shape), NR_ARENA_ITEM_STATE_ALL, FALSE);
if (shape->style) sp_style_unref(shape->style);
shape->style = style;
- switch (style->fill.type) {
- case SP_PAINT_TYPE_NONE: {
- shape->setFill(NULL);
- break;
- }
- case SP_PAINT_TYPE_COLOR: {
- shape->setFill(style->fill.value.color);
- break;
- }
- case SP_PAINT_TYPE_PAINTSERVER: {
- shape->setFill(style->fill.value.paint.server);
- break;
- }
- default: {
- g_assert_not_reached();
- }
+ if ( style->fill.isPaintserver() ) {
+ shape->setFill(style->getFillPaintServer());
+ } else if ( style->fill.isColor() ) {
+ shape->setFill(style->fill.value.color);
+ } else if ( style->fill.isNone() ) {
+ shape->setFill(NULL);
+ } else {
+ g_assert_not_reached();
}
shape->setFillOpacity(SP_SCALE24_TO_FLOAT(style->fill_opacity.value));
switch (style->fill_rule.computed) {
}
}
- switch (style->stroke.type) {
- case SP_PAINT_TYPE_NONE: {
- shape->setStroke(NULL);
- break;
- }
- case SP_PAINT_TYPE_COLOR: {
- shape->setStroke(style->stroke.value.color);
- break;
- }
- case SP_PAINT_TYPE_PAINTSERVER: {
- shape->setStroke(style->stroke.value.paint.server);
- break;
- }
- default: {
- g_assert_not_reached();
- }
+ if ( style->stroke.isPaintserver() ) {
+ shape->setStroke(style->getStrokePaintServer());
+ } else if ( style->stroke.isColor() ) {
+ shape->setStroke(style->stroke.value.color);
+ } else if ( style->stroke.isNone() ) {
+ shape->setStroke(NULL);
+ } else {
+ g_assert_not_reached();
}
shape->setStrokeWidth(style->stroke_width.computed);
shape->setStrokeOpacity(SP_SCALE24_TO_FLOAT(style->stroke_opacity.value));
shape->setMitreLimit(style->stroke_miterlimit.value);
//if shape has a filter
- if (style->filter.set && style->filter.filter)
- {
- shape->filter = new NR::Filter();
- shape->filter->set_x(style->filter.filter->x);
- shape->filter->set_y(style->filter.filter->y);
- shape->filter->set_width(style->filter.filter->width);
- shape->filter->set_height(style->filter.filter->height);
-
- //go through all SP filter primitives
- for(int i=0; i<style->filter.filter->_primitive_count; i++)
- {
- SPFilterPrimitive *primitive = style->filter.filter->_primitives[i];
- //if primitive is gaussianblur
- if(SP_IS_GAUSSIANBLUR(primitive)) {
- NR::FilterGaussian * gaussian = (NR::FilterGaussian *) shape->filter->add_primitive(NR::NR_FILTER_GAUSSIANBLUR);
- SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive);
- float num = spblur->stdDeviation.getNumber();
- if( num>=0.0 )
- {
- float optnum = spblur->stdDeviation.getOptNumber();
- if( optnum>=0.0 )
- gaussian->set_deviation((double) num, (double) optnum);
- else
- gaussian->set_deviation((double) num);
- }
- }
+ if (style->filter.set && style->getFilter()) {
+ if (!shape->filter) {
+ int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
+ shape->filter = new Inkscape::Filters::Filter(primitives);
}
- }
- else
- {
+ sp_filter_build_renderer(SP_FILTER(style->getFilter()), shape->filter);
+ } else {
//no filter set for this shape
+ delete shape->filter;
shape->filter = NULL;
}
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);
}
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 :