diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index fab6f4dadefa326d16f1e034fcd0ddf241912ddf..8854dbcec9e65241b6852b6fa79cf1b5b9bc2d50 100644 (file)
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
#include "svg/svg.h"
#include "display/canvas-bpath.h"
-#include "display/bezier-utils.h"
+#include <2geom/bezier-utils.h>
#include <glib/gmem.h>
#include "macros.h"
}
// 2. perpendicular to dc->vel (absolutely non-flat nib):
- gdouble const mag_vel = NR::L2(dc->vel);
+ gdouble const mag_vel = Geom::L2(dc->vel);
if ( mag_vel < ERASER_EPSILON ) {
return FALSE;
}
- Geom::Point ang2 = NR::rot90(dc->vel) / mag_vel;
+ Geom::Point ang2 = Geom::rot90(dc->vel) / mag_vel;
// 3. Average them using flatness parameter:
// calculate angles
// Try to detect a sudden flip when the new angle differs too much from the previous for the
// current velocity; in that case discard this move
- double angle_delta = NR::L2(Geom::Point (cos (new_ang), sin (new_ang)) - dc->ang);
- if ( angle_delta / NR::L2(dc->vel) > 4000 ) {
+ double angle_delta = Geom::L2(Geom::Point (cos (new_ang), sin (new_ang)) - dc->ang);
+ if ( angle_delta / Geom::L2(dc->vel) > 4000 ) {
return FALSE;
}
// convert to point
dc->ang = Geom::Point (cos (new_ang), sin (new_ang));
-// g_print ("force %g acc %g vel_max %g vel %g a1 %g a2 %g new_ang %g\n", NR::L2(force), NR::L2(dc->acc), dc->vel_max, NR::L2(dc->vel), a1, a2, new_ang);
+// g_print ("force %g acc %g vel_max %g vel %g a1 %g a2 %g new_ang %g\n", Geom::L2(force), Geom::L2(dc->acc), dc->vel_max, Geom::L2(dc->vel), a1, a2, new_ang);
/* Apply drag */
dc->vel *= 1.0 - drag;
double trace_thick = 1;
- double width = (pressure_thick * trace_thick - vel_thin * NR::L2(dc->vel)) * dc->width;
+ double width = (pressure_thick * trace_thick - vel_thin * Geom::L2(dc->vel)) * dc->width;
double tremble_left = 0, tremble_right = 0;
if (dc->tremor > 0) {
// (2) deflection depends on width, but is upped for small widths for better visual uniformity across widths;
// (3) deflection somewhat depends on speed, to prevent fast strokes looking
// comparatively smooth and slow ones excessively jittery
- tremble_left = (y1)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*NR::L2(dc->vel));
- tremble_right = (y2)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*NR::L2(dc->vel));
+ tremble_left = (y1)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*Geom::L2(dc->vel));
+ tremble_right = (y2)*dc->tremor * (0.15 + 0.8*width) * (0.35 + 14*Geom::L2(dc->vel));
}
if ( width < 0.02 * dc->width ) {
SPItem *item=SP_ITEM(desktop->currentLayer()->appendChildRepr(dc->repr));
Inkscape::GC::release(dc->repr);
- item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer());
+ item->transform = sp_item_i2doc_affine(SP_ITEM(desktop->currentLayer())).inverse();
item->updateRepr();
}
- Geom::PathVector pathv = dc->accumulated->get_pathvector() * sp_desktop_dt2root_affine(desktop);
+ Geom::PathVector pathv = dc->accumulated->get_pathvector() * sp_desktop_dt2doc_affine(desktop);
gchar *str = sp_svg_write_path(pathv);
g_assert( str != NULL );
dc->repr->setAttribute("d", str);
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc());
SPItem* acid = SP_ITEM(desktop->doc()->getObjectByRepr(dc->repr));
- boost::optional<Geom::Rect> eraserBbox = acid->getBounds(Geom::identity());
+ Geom::OptRect eraserBbox = acid->getBounds(Geom::identity());
Geom::Rect bounds = (*eraserBbox) * desktop->doc2dt();
std::vector<SPItem*> remainingItems;
GSList* toWorkOn = 0;
for (GSList *i = toWorkOn ; i ; i = i->next ) {
SPItem *item = SP_ITEM(i->data);
if ( eraserMode ) {
- boost::optional<Geom::Rect> bbox = item->getBounds(Geom::identity());
+ Geom::OptRect bbox = item->getBounds(Geom::identity());
if (bbox && bbox->intersects(*eraserBbox)) {
Inkscape::XML::Node* dup = dc->repr->duplicate(xml_doc);
dc->repr->parent()->appendChild(dup);
Geom::Point const &to, Geom::Point const &post,
double rounding)
{
- Geom::Point vel = rounding * NR::rot90( to - from ) / sqrt(2.0);
- double mag = NR::L2(vel);
+ Geom::Point vel = rounding * Geom::rot90( to - from ) / sqrt(2.0);
+ double mag = Geom::L2(vel);
Geom::Point v_in = from - pre;
- double mag_in = NR::L2(v_in);
+ double mag_in = Geom::L2(v_in);
if ( mag_in > ERASER_EPSILON ) {
v_in = mag * v_in / mag_in;
} else {
}
Geom::Point v_out = to - post;
- double mag_out = NR::L2(v_out);
+ double mag_out = Geom::L2(v_out);
if ( mag_out > ERASER_EPSILON ) {
v_out = mag * v_out / mag_out;
} else {
v_out = Geom::Point(0, 0);
}
- if ( NR::L2(v_in) > ERASER_EPSILON || NR::L2(v_out) > ERASER_EPSILON ) {
+ if ( Geom::L2(v_in) > ERASER_EPSILON || Geom::L2(v_out) > ERASER_EPSILON ) {
curve->curveto(from + v_in, to + v_out, to);
}
}
}
Geom::Point b1[BEZIER_MAX_LENGTH];
- gint const nb1 = sp_bezier_fit_cubic_r(b1, dc->point1, dc->npoints,
+ gint const nb1 = Geom::bezier_fit_cubic_r(b1, dc->point1, dc->npoints,
tolerance_sq, BEZIER_MAX_BEZIERS);
g_assert( nb1 * BEZIER_SIZE <= gint(G_N_ELEMENTS(b1)) );
Geom::Point b2[BEZIER_MAX_LENGTH];
- gint const nb2 = sp_bezier_fit_cubic_r(b2, dc->point2, dc->npoints,
+ gint const nb2 = Geom::bezier_fit_cubic_r(b2, dc->point2, dc->npoints,
tolerance_sq, BEZIER_MAX_BEZIERS);
g_assert( nb2 * BEZIER_SIZE <= gint(G_N_ELEMENTS(b2)) );