From 8e8734dc15e614586f9b4963b69671ce16d5c137 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Fri, 30 May 2008 20:36:13 +0000 Subject: LPE STACKING! (many thanks to the french students who made this.) (bzr r5766) --- src/live_effects/effect.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/live_effects/effect.cpp') diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 906955575..f968ec5c0 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -43,8 +43,9 @@ #include "live_effects/lpe-circle_with_radius.h" #include "live_effects/lpe-perspective_path.h" #include "live_effects/lpe-spiro.h" -#include "live_effects/lpe-constructgrid.h" +#include "live_effects/lpe-lattice.h" #include "live_effects/lpe-envelope.h" +#include "live_effects/lpe-constructgrid.h" #include "live_effects/lpe-perp_bisector.h" #include "live_effects/lpe-tangent_to_curve.h" // end of includes @@ -66,14 +67,15 @@ const Util::EnumData LPETypeData[INVALID_LPE] = { {DOEFFECTSTACK_TEST, N_("doEffect stack test"), "doeffectstacktest"}, #endif {GEARS, N_("Gears"), "gears"}, - {CURVE_STITCH, N_("Stitch Sub-Paths"), "curvestitching"}, + {CURVE_STITCH, N_("Stitch Sub-Paths"), "curvestitching"}, {CIRCLE_WITH_RADIUS, N_("Circle (center+radius)"), "circle_with_radius"}, {PERSPECTIVE_PATH, N_("Perspective path"), "perspective_path"}, {SPIRO, N_("Spiro spline"), "spiro"}, - {CONSTRUCT_GRID, N_("Construct grid"), "construct_grid"}, + {LATTICE, N_("Lattice Deformation"), "lattice"}, {ENVELOPE, N_("Envelope Deformation"), "envelope"}, + {CONSTRUCT_GRID, N_("Construct grid"), "construct_grid"}, {PERP_BISECTOR, N_("Perpendicular bisector"), "perp_bisector"}, - {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, + {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"} }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, INVALID_LPE); @@ -108,6 +110,12 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case CURVE_STITCH: neweffect = static_cast ( new LPECurveStitch(lpeobj) ); break; + case LATTICE: + neweffect = static_cast ( new LPELattice(lpeobj) ); + break; + case ENVELOPE: + neweffect = static_cast ( new LPEEnvelope(lpeobj) ); + break; case CIRCLE_WITH_RADIUS: neweffect = static_cast ( new LPECircleWithRadius(lpeobj) ); break; @@ -120,9 +128,6 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case CONSTRUCT_GRID: neweffect = static_cast ( new LPEConstructGrid(lpeobj) ); break; - case ENVELOPE: - neweffect = static_cast ( new LPEEnvelope(lpeobj) ); - break; case PERP_BISECTOR: neweffect = static_cast ( new LPEPerpBisector(lpeobj) ); break; -- cgit v1.2.3