X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Finternal%2Fcairo-renderer.cpp;h=8c27632e11a9fb8bcc9a9263a025fb361f8988e8;hb=17d87f5698f5c2958d38c6a6207c7b322a7adaf9;hp=eb19c3cbd67ab1da98564c5e77a93e8860fb27cc;hpb=54e660c4de9d37185e3953165d053526632ef4f0;p=inkscape.git diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index eb19c3cbd..8c27632e1 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include #include @@ -136,7 +135,7 @@ CairoRenderer::createContext(void) // create initial render state CairoRenderState *state = new_context->_createState(); - state->transform.set_identity(); + state->transform = Geom::identity(); new_context->_state_stack = g_slist_prepend(new_context->_state_stack, state); new_context->_state = state; @@ -176,39 +175,36 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) if (!shape->curve) return; /* fixme: Think (Lauris) */ - sp_item_invoke_bbox(item, &pbox, NR::identity(), TRUE); + sp_item_invoke_bbox(item, &pbox, Geom::identity(), TRUE); SPStyle* style = SP_OBJECT_STYLE (item); CairoRenderer *renderer = ctx->getRenderer(); - const_NRBPath bp; - bp.path = SP_CURVE_BPATH(shape->curve); + Geom::PathVector const & pathv = shape->curve->get_pathvector(); - ctx->renderPath(&bp, style, &pbox); + ctx->renderPathVector(pathv, style, &pbox); - Geom::PathVector const & pathv = shape->curve->get_pathvector(); + /* TODO: make code prettier: lots of variables can be taken out of the loop! */ for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) { if ( shape->marker[SP_MARKER_LOC_START] ) { SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_START]); SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_START])); - Geom::Point p = path_it->front().pointAt(0); - Geom::Point tang = path_it->front().unitTangentAt(0); - NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang, tang))); + Geom::Matrix tr(sp_shape_marker_get_transform_at_start(path_it->front())); if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { - tr = NR::scale(style->stroke_width.computed) * tr; + tr = Geom::Scale(style->stroke_width.computed) * tr; } - tr = marker_item->transform * marker->c2p * tr; + tr = (Geom::Matrix)marker_item->transform * (Geom::Matrix)marker->c2p * tr; - NR::Matrix old_tr = marker_item->transform; + Geom::Matrix old_tr = marker_item->transform; marker_item->transform = tr; renderer->renderItem (ctx, marker_item); marker_item->transform = old_tr; } - if ( shape->marker[SP_MARKER_LOC_MID] ) { + if ( shape->marker[SP_MARKER_LOC_MID] && (path_it->size_default() > 1) ) { Geom::Path::const_iterator curve_it1 = path_it->begin(); // incoming curve Geom::Path::const_iterator curve_it2 = ++(path_it->begin()); // outgoing curve while (curve_it2 != path_it->end_default()) @@ -220,18 +216,15 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_MID]); SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_MID])); - Geom::Point p = curve_it1->pointAt(1); - Geom::Point tang1 = curve_it1->unitTangentAt(1); - Geom::Point tang2 = curve_it2->unitTangentAt(0); - NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang1, tang2))); + Geom::Matrix tr(sp_shape_marker_get_transform(*curve_it1, *curve_it2)); if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { - tr = NR::scale(style->stroke_width.computed) * tr; + tr = Geom::Scale(style->stroke_width.computed) * tr; } - tr = marker_item->transform * marker->c2p * tr; + tr = (Geom::Matrix)marker_item->transform * (Geom::Matrix)marker->c2p * tr; - NR::Matrix old_tr = marker_item->transform; + Geom::Matrix old_tr = marker_item->transform; marker_item->transform = tr; renderer->renderItem (ctx, marker_item); marker_item->transform = old_tr; @@ -245,17 +238,23 @@ static void sp_shape_render (SPItem *item, CairoRenderContext *ctx) SPMarker* marker = SP_MARKER (shape->marker[SP_MARKER_LOC_END]); SPItem* marker_item = sp_item_first_item_child (SP_OBJECT (shape->marker[SP_MARKER_LOC_END])); - Geom::Point p = path_it->back_default().pointAt(1); - Geom::Point tang = path_it->back_default().unitTangentAt(1); - NR::Matrix tr(from_2geom(sp_shape_marker_get_transform(p, tang, tang))); + /* Get reference to last curve in the path. + * For moveto-only path, this returns the "closing line segment". */ + unsigned int index = path_it->size_default(); + if (index > 0) { + index--; + } + Geom::Curve const &lastcurve = (*path_it)[index]; + + Geom::Matrix tr = sp_shape_marker_get_transform_at_end(lastcurve); if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { - tr = NR::scale(style->stroke_width.computed) * tr; + tr = Geom::Scale(style->stroke_width.computed) * tr; } - tr = marker_item->transform * marker->c2p * tr; + tr = (Geom::Matrix)marker_item->transform * (Geom::Matrix)marker->c2p * tr; - NR::Matrix old_tr = marker_item->transform; + Geom::Matrix old_tr = marker_item->transform; marker_item->transform = tr; renderer->renderItem (ctx, marker_item); marker_item->transform = old_tr; @@ -286,7 +285,7 @@ static void sp_use_render(SPItem *item, CairoRenderContext *ctx) CairoRenderer *renderer = ctx->getRenderer(); if ((use->x._set && use->x.computed != 0) || (use->y._set && use->y.computed != 0)) { - NR::Matrix tp(NR::translate(use->x.computed, use->y.computed)); + Geom::Matrix tp(Geom::Translate(use->x.computed, use->y.computed)); ctx->pushState(); ctx->transform(&tp); translated = true; @@ -343,9 +342,9 @@ static void sp_image_render(SPItem *item, CairoRenderContext *ctx) ctx->addClippingRect(image->x.computed, image->y.computed, image->width.computed, image->height.computed); } - NR::translate tp(x, y); - NR::scale s(width / (double)w, height / (double)h); - NR::Matrix t(s * tp); + Geom::Translate tp(x, y); + Geom::Scale s(width / (double)w, height / (double)h); + Geom::Matrix t(s * tp); ctx->renderImage (px, w, h, rs, &t, SP_OBJECT_STYLE (item)); } @@ -362,7 +361,7 @@ static void sp_symbol_render(SPItem *item, CairoRenderContext *ctx) // apply viewbox if set if (0 /*symbol->viewBox_set*/) { - NR::Matrix vb2user; + Geom::Matrix vb2user; double x, y, width, height; double view_width, view_height; x = 0.0; @@ -377,7 +376,7 @@ static void sp_symbol_render(SPItem *item, CairoRenderContext *ctx) &x, &y,&width, &height); // [itemTransform *] translate(x, y) * scale(w/vw, h/vh) * translate(-vx, -vy); - vb2user.set_identity(); + vb2user = Geom::identity(); vb2user[0] = width / view_width; vb2user[3] = height / view_height; vb2user[4] = x - symbol->viewBox.x0 * vb2user[0]; @@ -400,7 +399,8 @@ static void sp_root_render(SPItem *item, CairoRenderContext *ctx) ctx->pushState(); renderer->setStateForItem(ctx, item); - ctx->transform(&root->c2p); + Geom::Matrix tempmat (root->c2p); + ctx->transform(&tempmat); sp_group_render(item, ctx); ctx->popState(); } @@ -418,9 +418,9 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document); // Get the bounding box of the selection - //NR::Maybe _bbox = item->getBounds(from_2geom(sp_item_i2d_affine(item))); - // NRRect bbox = item->getBounds(from_2geom(sp_item_i2d_affine(item))); - NRRect bbox(item->getBounds(from_2geom(sp_item_i2d_affine(item)))); + //boost::optional _bbox = item->getBounds(sp_item_i2d_affine(item)); + // NRRect bbox = item->getBounds(sp_item_i2d_affine(item)); + NRRect bbox(item->getBounds(sp_item_i2d_affine(item))); // List of the items to show; all others will be hidden @@ -473,8 +473,8 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) } */ // Calculate the matrix that will be applied to the image so that it exactly overlaps the source objects - NR::Matrix eek = from_2geom(sp_item_i2d_affine (SP_ITEM(parent_object))); - NR::Matrix t; + Geom::Matrix eek = sp_item_i2d_affine (SP_ITEM(parent_object)); + Geom::Matrix t; double shift_x = bbox.x0; double shift_y = bbox.y1; @@ -482,9 +482,9 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) shift_x = round (shift_x); shift_y = -round (-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone } - t = (NR::Matrix)(NR::scale(1, -1) * (NR::Matrix)(NR::translate (shift_x, shift_y)* eek.inverse())); + t = (Geom::Matrix)(Geom::Scale(1, -1) * (Geom::Matrix)(Geom::Translate (shift_x, shift_y)* eek.inverse())); - //t = t * ((NR::Matrix)ctx->getCurrentState()->transform).inverse(); + //t = t * ((Geom::Matrix)ctx->getCurrentState()->transform).inverse(); // Do the export GdkPixbuf *pb = sp_generate_internal_bitmap(document, NULL, @@ -502,9 +502,9 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) unsigned int w = gdk_pixbuf_get_width(pb); unsigned int h = gdk_pixbuf_get_height(pb); unsigned int rs = gdk_pixbuf_get_rowstride(pb); - NR::Matrix matrix; + Geom::Matrix matrix; matrix = t; - //matrix = ((NR::Matrix)ctx->getCurrentState()->transform).inverse(); + //matrix = ((Geom::Matrix)ctx->getCurrentState()->transform).inverse(); //matrix.set_identity(); ctx->renderImage (px, w, h, rs, &matrix, SP_OBJECT_STYLE (item)); @@ -610,7 +610,8 @@ CairoRenderer::renderItem(CairoRenderContext *ctx, SPItem *item) state->merge_opacity = FALSE; ctx->pushLayer(); } - ctx->transform(&item->transform); + Geom::Matrix tempmat (item->transform); + ctx->transform(&tempmat); sp_item_invoke_render(item, ctx); if (state->need_layer) @@ -641,7 +642,7 @@ CairoRenderer::setupDocument(CairoRenderContext *ctx, SPDocument *doc) d.y1 = ceil(ctx->_height); } else { SPItem* doc_item = SP_ITEM(sp_document_root(doc)); - sp_item_invoke_bbox(doc_item, &d, from_2geom(sp_item_i2r_affine(doc_item)), TRUE); + sp_item_invoke_bbox(doc_item, &d, sp_item_i2r_affine(doc_item), TRUE); if (ctx->_vector_based_target) { // convert from px to pt d.x0 *= PT_PER_PX; @@ -668,11 +669,11 @@ CairoRenderer::applyClipPath(CairoRenderContext *ctx, SPClipPath const *cp) CairoRenderContext::CairoRenderMode saved_mode = ctx->getRenderMode(); ctx->setRenderMode(CairoRenderContext::RENDER_MODE_CLIP); - NR::Matrix saved_ctm; + Geom::Matrix saved_ctm; if (cp->clipPathUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX) { //SP_PRINT_DRECT("clipd", cp->display->bbox); NRRect clip_bbox(cp->display->bbox); - NR::Matrix t(NR::scale(clip_bbox.x1 - clip_bbox.x0, clip_bbox.y1 - clip_bbox.y0)); + Geom::Matrix t(Geom::Scale(clip_bbox.x1 - clip_bbox.x0, clip_bbox.y1 - clip_bbox.y0)); t[4] = clip_bbox.x0; t[5] = clip_bbox.y0; t *= ctx->getCurrentState()->transform; @@ -713,7 +714,7 @@ CairoRenderer::applyMask(CairoRenderContext *ctx, SPMask const *mask) NRRect mask_bbox(mask->display->bbox); // TODO: should the bbox be transformed if maskUnits != userSpaceOnUse ? if (mask->maskContentUnits == SP_CONTENT_UNITS_OBJECTBOUNDINGBOX) { - NR::Matrix t(NR::scale(mask_bbox.x1 - mask_bbox.x0, mask_bbox.y1 - mask_bbox.y0)); + Geom::Matrix t(Geom::Scale(mask_bbox.x1 - mask_bbox.x0, mask_bbox.y1 - mask_bbox.y0)); t[4] = mask_bbox.x0; t[5] = mask_bbox.y0; t *= ctx->getCurrentState()->transform;