From: johanengelen Date: Tue, 8 Apr 2008 18:02:31 +0000 (+0000) Subject: rename LPESkeletalStrokes -> LPEPatternAlongPath X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c39cbeab9949a0a7d6ae66b768a7352019e42f8;p=inkscape.git rename LPESkeletalStrokes -> LPEPatternAlongPath --- diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt index d437e40f9..f88e96531 100644 --- a/src/live_effects/CMakeLists.txt +++ b/src/live_effects/CMakeLists.txt @@ -15,8 +15,8 @@ lpeobject-reference.cpp lpeobject-reference.h lpe-bendpath.cpp lpe-bendpath.h -lpe-skeletalstrokes.cpp -lpe-skeletalstrokes.h +lpe-patternalongpath.cpp +lpe-patternalongpath.h lpe-skeleton.cpp lpe-skeleton.h lpe-sketch.cpp diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert index 7d2121c12..798ad5496 100644 --- a/src/live_effects/Makefile_insert +++ b/src/live_effects/Makefile_insert @@ -16,8 +16,8 @@ live_effects_liblive_effects_a_SOURCES = \ live_effects/lpeobject-reference.h \ live_effects/n-art-bpath-2geom.cpp \ live_effects/n-art-bpath-2geom.h \ - live_effects/lpe-skeletalstrokes.cpp \ - live_effects/lpe-skeletalstrokes.h \ + live_effects/lpe-patternalongpath.cpp \ + live_effects/lpe-patternalongpath.h \ live_effects/lpe-bendpath.cpp \ live_effects/lpe-bendpath.h \ live_effects/lpe-sketch.cpp \ diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 4b3ee5b0f..51a59f1a1 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -32,7 +32,7 @@ // include effects: -#include "live_effects/lpe-skeletalstrokes.h" +#include "live_effects/lpe-patternalongpath.h" #include "live_effects/lpe-bendpath.h" #include "live_effects/lpe-sketch.h" #include "live_effects/lpe-vonkoch.h" @@ -53,7 +53,7 @@ namespace LivePathEffect { const Util::EnumData LPETypeData[INVALID_LPE] = { // {constant defined in effect.h, N_("name of your effect"), "name of your effect in SVG"} {BEND_PATH, N_("Bend"), "bend_path"}, - {SKELETAL_STROKES, N_("Pattern Along Path"), "skeletal"}, + {PATTERN_ALONG_PATH, N_("Pattern Along Path"), "skeletal"}, // for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG {SKETCH, N_("Sketch"), "sketch"}, {VONKOCH, N_("VonKoch"), "vonkoch"}, {KNOT, N_("Knot"), "knot"}, @@ -73,8 +73,8 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) { Effect* neweffect = NULL; switch (lpenr) { - case SKELETAL_STROKES: - neweffect = (Effect*) new LPESkeletalStrokes(lpeobj); + case PATTERN_ALONG_PATH: + neweffect = (Effect*) new LPEPatternAlongPath(lpeobj); break; case BEND_PATH: neweffect = (Effect*) new LPEBendPath(lpeobj); diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index 2f8014cc6..be3cefecf 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -52,7 +52,7 @@ namespace LivePathEffect { enum EffectType { BEND_PATH = 0, - SKELETAL_STROKES, + PATTERN_ALONG_PATH, SKETCH, VONKOCH, KNOT, diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp new file mode 100644 index 000000000..9b2819219 --- /dev/null +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -0,0 +1,244 @@ +#define INKSCAPE_LPE_PATTERN_ALONG_PATH_CPP + +/* + * Copyright (C) Johan Engelen 2007 + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "live_effects/lpe-patternalongpath.h" +#include "sp-shape.h" +#include "display/curve.h" +#include +#include "live_effects/n-art-bpath-2geom.h" +#include "svg/svg.h" +#include "ui/widget/scalar.h" + +#include <2geom/sbasis.h> +#include <2geom/sbasis-geometric.h> +#include <2geom/bezier-to-sbasis.h> +#include <2geom/sbasis-to-bezier.h> +#include <2geom/d2.h> +#include <2geom/piecewise.h> + +#include +using std::vector; + + +/* Theory in e-mail from J.F. Barraud +Let B be the skeleton path, and P the pattern (the path to be deformed). + +P is a map t --> P(t) = ( x(t), y(t) ). +B is a map t --> B(t) = ( a(t), b(t) ). + +The first step is to re-parametrize B by its arc length: this is the parametrization in which a point p on B is located by its distance s from start. One obtains a new map s --> U(s) = (a'(s),b'(s)), that still describes the same path B, but where the distance along B from start to +U(s) is s itself. + +We also need a unit normal to the path. This can be obtained by computing a unit tangent vector, and rotate it by 90°. Call this normal vector N(s). + +The basic deformation associated to B is then given by: + + (x,y) --> U(x)+y*N(x) + +(i.e. we go for distance x along the path, and then for distance y along the normal) + +Of course this formula needs some minor adaptations (as is it depends on the absolute position of P for instance, so a little translation is needed +first) but I think we can first forget about them. +*/ + +namespace Inkscape { +namespace LivePathEffect { + +static const Util::EnumData PAPCopyTypeData[PAPCT_END] = { + {PAPCT_SINGLE, N_("Single"), "single"}, + {PAPCT_SINGLE_STRETCHED, N_("Single, stretched"), "single_stretched"}, + {PAPCT_REPEATED, N_("Repeated"), "repeated"}, + {PAPCT_REPEATED_STRETCHED, N_("Repeated, stretched"), "repeated_stretched"} +}; +static const Util::EnumDataConverter PAPCopyTypeConverter(PAPCopyTypeData, PAPCT_END); + +LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) : + Effect(lpeobject), + pattern(_("Pattern source"), _("Path to put along the skeleton path"), "pattern", &wr, this, "M0,0 L1,0"), + copytype(_("Pattern copies"), _("How many pattern copies to place along the skeleton path"), "copytype", PAPCopyTypeConverter, &wr, this, PAPCT_SINGLE_STRETCHED), + prop_scale(_("Width"), _("Width of the pattern"), "prop_scale", &wr, this, 1), + scale_y_rel(_("Width in units of length"), _("Scale the width of the pattern in units of its length"), "scale_y_rel", &wr, this, false), + spacing(_("Spacing"), _("Space between copies of the pattern. Negative values allowed, but are limited to -90% of pattern width."), "spacing", &wr, this, 0), + normal_offset(_("Normal offset"), "", "normal_offset", &wr, this, 0), + tang_offset(_("Tangential offset"), "", "tang_offset", &wr, this, 0), + prop_units(_("Offsets in unit of pattern size"), "Spacing, tangential and normal offset are expressed as a ratio of width/height", "prop_units", &wr, this, false), + vertical_pattern(_("Pattern is vertical"), "Rotate pattern 90 deg before applying", "vertical_pattern", &wr, this, false) +{ + registerParameter( dynamic_cast(&pattern) ); + registerParameter( dynamic_cast(©type) ); + registerParameter( dynamic_cast(&prop_scale) ); + registerParameter( dynamic_cast(&scale_y_rel) ); + registerParameter( dynamic_cast(&spacing) ); + registerParameter( dynamic_cast(&normal_offset) ); + registerParameter( dynamic_cast(&tang_offset) ); + registerParameter( dynamic_cast(&prop_units) ); + registerParameter( dynamic_cast(&vertical_pattern) ); + + prop_scale.param_set_digits(3); + prop_scale.param_set_increments(0.01, 0.10); +} + +LPEPatternAlongPath::~LPEPatternAlongPath() +{ + +} + + +//TODO: does this already exist in 2Geom? if not, move this there... +static +std::vector > > +split_at_discontinuities (Geom::Piecewise > & pwsbin, double tol = .0001) +{ + using namespace Geom; + std::vector > > ret; + unsigned piece_start = 0; + for (unsigned i=0; i tol){ + Piecewise > piece; + piece.cuts.push_back(pwsbin.cuts[piece_start]); + for (unsigned j = piece_start; j > +LPEPatternAlongPath::doEffect_pwd2 (Geom::Piecewise > & pwd2_in) +{ + using namespace Geom; + +/* Much credit should go to jfb and mgsloan of lib2geom development for the code below! */ + Piecewise > output; + + PAPCopyType type = copytype.get_value(); + + D2 > patternd2 = make_cuts_independant(pattern.get_pwd2()); + Piecewise x0 = vertical_pattern.get_value() ? Piecewise(patternd2[1]) : Piecewise(patternd2[0]); + Piecewise y0 = vertical_pattern.get_value() ? Piecewise(patternd2[0]) : Piecewise(patternd2[1]); + Interval pattBndsX = bounds_exact(x0); + x0 -= pattBndsX.min(); + Interval pattBndsY = bounds_exact(y0); + y0 -= pattBndsY.middle(); + + double xspace = spacing; + double noffset = normal_offset; + double toffset = tang_offset; + if (prop_units.get_value()){ + xspace *= pattBndsX.extent(); + noffset *= pattBndsY.extent(); + toffset *= pattBndsX.extent(); + } + + //Prevent more than 90% overlap... + if (xspace < -pattBndsX.extent()*.9) { + xspace = -pattBndsX.extent()*.9; + } + //TODO: dynamical update of parameter ranges? + //if (prop_units.get_value()){ + // spacing.param_set_range(-.9, NR_HUGE); + // }else{ + // spacing.param_set_range(-pattBndsX.extent()*.9, NR_HUGE); + // } + + y0+=noffset; + + std::vector > > paths_in; + paths_in = split_at_discontinuities(pwd2_in); + + for (unsigned idx = 0; idx < paths_in.size(); idx++){ + Geom::Piecewise > path_i = paths_in[idx]; + Piecewise x = x0; + Piecewise y = y0; + Piecewise > uskeleton = arc_length_parametrization(path_i,2,.1); + uskeleton = remove_short_cuts(uskeleton,.01); + Piecewise > n = rot90(derivative(uskeleton)); + n = force_continuity(remove_short_cuts(n,.1)); + + int nbCopies = 0; + double scaling = 1; + switch(type) { + case PAPCT_REPEATED: + nbCopies = floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace)); + pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace); + break; + + case PAPCT_SINGLE: + nbCopies = (toffset + pattBndsX.extent() < uskeleton.domain().extent()) ? 1 : 0; + break; + + case PAPCT_SINGLE_STRETCHED: + nbCopies = 1; + scaling = (uskeleton.domain().extent() - toffset)/pattBndsX.extent(); + break; + + case PAPCT_REPEATED_STRETCHED: + // if uskeleton is closed: + if(path_i.segs.front().at0() == path_i.segs.back().at1()){ + nbCopies = std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX.extent()+xspace)); + pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace); + scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX.extent()); + // if not closed: no space at the end + }else{ + nbCopies = std::floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace)); + pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace); + scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX.extent() - xspace); + } + break; + + default: + return pwd2_in; + }; + + double pattWidth = pattBndsX.extent() * scaling; + + if (scaling != 1.0) { + x*=scaling; + } + if ( scale_y_rel.get_value() ) { + y*=(scaling*prop_scale); + } else { + if (prop_scale != 1.0) y *= prop_scale; + } + x += toffset; + + double offs = 0; + for (int i=0; i + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "live_effects/effect.h" +#include "live_effects/parameter/path.h" +#include "live_effects/parameter/enum.h" +#include "live_effects/parameter/bool.h" + +namespace Inkscape { +namespace LivePathEffect { + +enum PAPCopyType { + PAPCT_SINGLE = 0, + PAPCT_SINGLE_STRETCHED, + PAPCT_REPEATED, + PAPCT_REPEATED_STRETCHED, + PAPCT_END // This must be last +}; + +class LPEPatternAlongPath : public Effect { +public: + LPEPatternAlongPath(LivePathEffectObject *lpeobject); + virtual ~LPEPatternAlongPath(); + + virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > & pwd2_in); + + virtual void transform_multiply(Geom::Matrix const& postmul, bool set); + +private: + PathParam pattern; + EnumParam copytype; + ScalarParam prop_scale; + BoolParam scale_y_rel; + ScalarParam spacing; + ScalarParam normal_offset; + ScalarParam tang_offset; + BoolParam prop_units; + BoolParam vertical_pattern; + + void on_pattern_pasted(); + + LPEPatternAlongPath(const LPEPatternAlongPath&); + LPEPatternAlongPath& operator=(const LPEPatternAlongPath&); +}; + +}; //namespace LivePathEffect +}; //namespace Inkscape + +#endif diff --git a/src/live_effects/lpe-skeletalstrokes.cpp b/src/live_effects/lpe-skeletalstrokes.cpp deleted file mode 100644 index 677aa1510..000000000 --- a/src/live_effects/lpe-skeletalstrokes.cpp +++ /dev/null @@ -1,244 +0,0 @@ -#define INKSCAPE_LPE_SKELETAL_STROKES_CPP - -/* - * Copyright (C) Johan Engelen 2007 - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "live_effects/lpe-skeletalstrokes.h" -#include "sp-shape.h" -#include "display/curve.h" -#include -#include "live_effects/n-art-bpath-2geom.h" -#include "svg/svg.h" -#include "ui/widget/scalar.h" - -#include <2geom/sbasis.h> -#include <2geom/sbasis-geometric.h> -#include <2geom/bezier-to-sbasis.h> -#include <2geom/sbasis-to-bezier.h> -#include <2geom/d2.h> -#include <2geom/piecewise.h> - -#include -using std::vector; - - -/* Theory in e-mail from J.F. Barraud -Let B be the skeleton path, and P the pattern (the path to be deformed). - -P is a map t --> P(t) = ( x(t), y(t) ). -B is a map t --> B(t) = ( a(t), b(t) ). - -The first step is to re-parametrize B by its arc length: this is the parametrization in which a point p on B is located by its distance s from start. One obtains a new map s --> U(s) = (a'(s),b'(s)), that still describes the same path B, but where the distance along B from start to -U(s) is s itself. - -We also need a unit normal to the path. This can be obtained by computing a unit tangent vector, and rotate it by 90°. Call this normal vector N(s). - -The basic deformation associated to B is then given by: - - (x,y) --> U(x)+y*N(x) - -(i.e. we go for distance x along the path, and then for distance y along the normal) - -Of course this formula needs some minor adaptations (as is it depends on the absolute position of P for instance, so a little translation is needed -first) but I think we can first forget about them. -*/ - -namespace Inkscape { -namespace LivePathEffect { - -static const Util::EnumData SkelCopyTypeData[SSCT_END] = { - {SSCT_SINGLE, N_("Single"), "single"}, - {SSCT_SINGLE_STRETCHED, N_("Single, stretched"), "single_stretched"}, - {SSCT_REPEATED, N_("Repeated"), "repeated"}, - {SSCT_REPEATED_STRETCHED, N_("Repeated, stretched"), "repeated_stretched"} -}; -static const Util::EnumDataConverter SkelCopyTypeConverter(SkelCopyTypeData, SSCT_END); - -LPESkeletalStrokes::LPESkeletalStrokes(LivePathEffectObject *lpeobject) : - Effect(lpeobject), - pattern(_("Pattern source"), _("Path to put along the skeleton path"), "pattern", &wr, this, "M0,0 L1,0"), - copytype(_("Pattern copies"), _("How many pattern copies to place along the skeleton path"), "copytype", SkelCopyTypeConverter, &wr, this, SSCT_SINGLE_STRETCHED), - prop_scale(_("Width"), _("Width of the pattern"), "prop_scale", &wr, this, 1), - scale_y_rel(_("Width in units of length"), _("Scale the width of the pattern in units of its length"), "scale_y_rel", &wr, this, false), - spacing(_("Spacing"), _("Space between copies of the pattern. Negative values allowed, but are limited to -90% of pattern width."), "spacing", &wr, this, 0), - normal_offset(_("Normal offset"), "", "normal_offset", &wr, this, 0), - tang_offset(_("Tangential offset"), "", "tang_offset", &wr, this, 0), - prop_units(_("Offsets in unit of pattern size"), "Spacing, tangential and normal offset are expressed as a ratio of width/height", "prop_units", &wr, this, false), - vertical_pattern(_("Pattern is vertical"), "Rotate pattern 90 deg before applying", "vertical_pattern", &wr, this, false) -{ - registerParameter( dynamic_cast(&pattern) ); - registerParameter( dynamic_cast(©type) ); - registerParameter( dynamic_cast(&prop_scale) ); - registerParameter( dynamic_cast(&scale_y_rel) ); - registerParameter( dynamic_cast(&spacing) ); - registerParameter( dynamic_cast(&normal_offset) ); - registerParameter( dynamic_cast(&tang_offset) ); - registerParameter( dynamic_cast(&prop_units) ); - registerParameter( dynamic_cast(&vertical_pattern) ); - - prop_scale.param_set_digits(3); - prop_scale.param_set_increments(0.01, 0.10); -} - -LPESkeletalStrokes::~LPESkeletalStrokes() -{ - -} - - -//TODO: does this already exist in 2Geom? if not, move this there... -static -std::vector > > -split_at_discontinuities (Geom::Piecewise > & pwsbin, double tol = .0001) -{ - using namespace Geom; - std::vector > > ret; - unsigned piece_start = 0; - for (unsigned i=0; i tol){ - Piecewise > piece; - piece.cuts.push_back(pwsbin.cuts[piece_start]); - for (unsigned j = piece_start; j > -LPESkeletalStrokes::doEffect_pwd2 (Geom::Piecewise > & pwd2_in) -{ - using namespace Geom; - -/* Much credit should go to jfb and mgsloan of lib2geom development for the code below! */ - Piecewise > output; - - SkelCopyType type = copytype.get_value(); - - D2 > patternd2 = make_cuts_independant(pattern.get_pwd2()); - Piecewise x0 = vertical_pattern.get_value() ? Piecewise(patternd2[1]) : Piecewise(patternd2[0]); - Piecewise y0 = vertical_pattern.get_value() ? Piecewise(patternd2[0]) : Piecewise(patternd2[1]); - Interval pattBndsX = bounds_exact(x0); - x0 -= pattBndsX.min(); - Interval pattBndsY = bounds_exact(y0); - y0 -= pattBndsY.middle(); - - double xspace = spacing; - double noffset = normal_offset; - double toffset = tang_offset; - if (prop_units.get_value()){ - xspace *= pattBndsX.extent(); - noffset *= pattBndsY.extent(); - toffset *= pattBndsX.extent(); - } - - //Prevent more than 90% overlap... - if (xspace < -pattBndsX.extent()*.9) { - xspace = -pattBndsX.extent()*.9; - } - //TODO: dynamical update of parameter ranges? - //if (prop_units.get_value()){ - // spacing.param_set_range(-.9, NR_HUGE); - // }else{ - // spacing.param_set_range(-pattBndsX.extent()*.9, NR_HUGE); - // } - - y0+=noffset; - - std::vector > > paths_in; - paths_in = split_at_discontinuities(pwd2_in); - - for (unsigned idx = 0; idx < paths_in.size(); idx++){ - Geom::Piecewise > path_i = paths_in[idx]; - Piecewise x = x0; - Piecewise y = y0; - Piecewise > uskeleton = arc_length_parametrization(path_i,2,.1); - uskeleton = remove_short_cuts(uskeleton,.01); - Piecewise > n = rot90(derivative(uskeleton)); - n = force_continuity(remove_short_cuts(n,.1)); - - int nbCopies = 0; - double scaling = 1; - switch(type) { - case SSCT_REPEATED: - nbCopies = floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace)); - pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace); - break; - - case SSCT_SINGLE: - nbCopies = (toffset + pattBndsX.extent() < uskeleton.domain().extent()) ? 1 : 0; - break; - - case SSCT_SINGLE_STRETCHED: - nbCopies = 1; - scaling = (uskeleton.domain().extent() - toffset)/pattBndsX.extent(); - break; - - case SSCT_REPEATED_STRETCHED: - // if uskeleton is closed: - if(path_i.segs.front().at0() == path_i.segs.back().at1()){ - nbCopies = std::floor((uskeleton.domain().extent() - toffset)/(pattBndsX.extent()+xspace)); - pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace); - scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX.extent()); - // if not closed: no space at the end - }else{ - nbCopies = std::floor((uskeleton.domain().extent() - toffset + xspace)/(pattBndsX.extent()+xspace)); - pattBndsX = Interval(pattBndsX.min(),pattBndsX.max()+xspace); - scaling = (uskeleton.domain().extent() - toffset)/(((double)nbCopies)*pattBndsX.extent() - xspace); - } - break; - - default: - return pwd2_in; - }; - - double pattWidth = pattBndsX.extent() * scaling; - - if (scaling != 1.0) { - x*=scaling; - } - if ( scale_y_rel.get_value() ) { - y*=(scaling*prop_scale); - } else { - if (prop_scale != 1.0) y *= prop_scale; - } - x += toffset; - - double offs = 0; - for (int i=0; i - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "live_effects/effect.h" -#include "live_effects/parameter/path.h" -#include "live_effects/parameter/enum.h" -#include "live_effects/parameter/bool.h" - -namespace Inkscape { -namespace LivePathEffect { - -enum SkelCopyType { - SSCT_SINGLE = 0, - SSCT_SINGLE_STRETCHED, - SSCT_REPEATED, - SSCT_REPEATED_STRETCHED, - SSCT_END // This must be last -}; - -class LPESkeletalStrokes : public Effect { -public: - LPESkeletalStrokes(LivePathEffectObject *lpeobject); - virtual ~LPESkeletalStrokes(); - - virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > & pwd2_in); - - virtual void transform_multiply(Geom::Matrix const& postmul, bool set); - -private: - PathParam pattern; - EnumParam copytype; - ScalarParam prop_scale; - BoolParam scale_y_rel; - ScalarParam spacing; - ScalarParam normal_offset; - ScalarParam tang_offset; - BoolParam prop_units; - BoolParam vertical_pattern; - - void on_pattern_pasted(); - - LPESkeletalStrokes(const LPESkeletalStrokes&); - LPESkeletalStrokes& operator=(const LPESkeletalStrokes&); -}; - -}; //namespace LivePathEffect -}; //namespace Inkscape - -#endif