From: cilix42 Date: Mon, 16 Jun 2008 16:16:53 +0000 (+0000) Subject: New LPE: Angle bisector X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=64aee804a6a47424f7994e60558351b8cf2ea4db;p=inkscape.git New LPE: Angle bisector --- diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert index 843a8beb6..3d5cc43c4 100644 --- a/src/live_effects/Makefile_insert +++ b/src/live_effects/Makefile_insert @@ -54,5 +54,7 @@ live_effects_liblive_effects_a_SOURCES = \ live_effects/lpe-mirror_reflect.cpp \ live_effects/lpe-mirror_reflect.h \ live_effects/lpe-circle_3pts.cpp \ - live_effects/lpe-circle_3pts.h + live_effects/lpe-circle_3pts.h \ + live_effects/lpe-angle_bisector.cpp \ + live_effects/lpe-angle_bisector.h diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 4f4aaff3f..81c9a6384 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -57,6 +57,7 @@ #include "live_effects/lpe-tangent_to_curve.h" #include "live_effects/lpe-mirror_reflect.h" #include "live_effects/lpe-circle_3pts.h" +#include "live_effects/lpe-angle_bisector.h" // end of includes namespace Inkscape { @@ -85,6 +86,7 @@ const Util::EnumData LPETypeData[INVALID_LPE] = { {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, {MIRROR_REFLECT, N_("Mirror reflection"), "mirror_reflect"}, {CIRCLE_3PTS, N_("Circle through 3 points"), "circle_3pts"}, + {ANGLE_BISECTOR, N_("Angle bisector"), "angle_bisector"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, INVALID_LPE); @@ -149,6 +151,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj) case CIRCLE_3PTS: neweffect = static_cast ( new LPECircle3Pts(lpeobj) ); break; + case ANGLE_BISECTOR: + neweffect = static_cast ( new LPEAngleBisector(lpeobj) ); + break; default: g_warning("LivePathEffect::Effect::New called with invalid patheffect type (%d)", lpenr); neweffect = NULL; diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index 93f2e60b1..6eeff94c4 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -74,6 +74,7 @@ enum EffectType { TANGENT_TO_CURVE, MIRROR_REFLECT, CIRCLE_3PTS, + ANGLE_BISECTOR, INVALID_LPE // This must be last }; diff --git a/src/live_effects/lpe-angle_bisector.cpp b/src/live_effects/lpe-angle_bisector.cpp new file mode 100644 index 000000000..a69b6913d --- /dev/null +++ b/src/live_effects/lpe-angle_bisector.cpp @@ -0,0 +1,161 @@ +#define INKSCAPE_LPE_ANGLE_BISECTOR_CPP +/** \file + * LPE implementation, used as an example for a base starting class + * when implementing new LivePathEffects. + * + * In vi, three global search-and-replaces will let you rename everything + * in this and the .h file: + * + * :%s/ANGLE_BISECTOR/YOURNAME/g + * :%s/AngleBisector/Yourname/g + * :%s/angle_bisector/yourname/g + */ +/* + * Authors: + * Johan Engelen + * + * Copyright (C) Johan Engelen 2007 + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "live_effects/lpe-angle_bisector.h" + +// You might need to include other 2geom files. You can add them here: +#include <2geom/path.h> +#include <2geom/sbasis-to-bezier.h> + +namespace Inkscape { +namespace LivePathEffect { + +namespace AB { + +class KnotHolderEntityLeftEnd : public KnotHolderEntity +{ +public: + virtual bool isLPEParam() { return true; } + + virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual NR::Point knot_get(); +}; + +class KnotHolderEntityRightEnd : public KnotHolderEntity +{ +public: + virtual bool isLPEParam() { return true; } + + virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual NR::Point knot_get(); +}; + +} // namespace TtC + +LPEAngleBisector::LPEAngleBisector(LivePathEffectObject *lpeobject) : + Effect(lpeobject), + length_left(_("Length left"), _("Specifies the left end of the bisector"), "length-left", &wr, this, 0), + length_right(_("Length right"), _("Specifies the right end of the bisector"), "length-right", &wr, this, 250) +{ + show_orig_path = true; + + registerParameter( dynamic_cast(&length_left) ); + registerParameter( dynamic_cast(&length_right) ); + + /* we disable the handles until we support both knotholders and nodepaths */ + //registerKnotHolderHandle(new AB::KnotHolderEntityLeftEnd(), _("Adjust the \"right\" end of the bisector")); + //registerKnotHolderHandle(new AB::KnotHolderEntityRightEnd(), _("Adjust the point of attachment of the bisector")); +} + +LPEAngleBisector::~LPEAngleBisector() +{ +} + +std::vector +LPEAngleBisector::doEffect_path (std::vector const & path_in) +{ + using namespace Geom; + + std::vector path_out; + + // we assume that the path has >= 3 nodes + ptA = path_in[0].pointAt(1); + Point B = path_in[0].initialPoint(); + Point C = path_in[0].pointAt(2); + + double angle = angle_between(B - ptA, C - ptA); + + dir = unit_vector(B - ptA) * Rotate(angle/2); + + Geom::Point D = ptA - dir * length_left; + Geom::Point E = ptA + dir * length_right; + + Piecewise > output = Piecewise >(D2(Linear(D[X], E[X]), Linear(D[Y], E[Y]))); + + return path_from_piecewise(output, LPE_CONVERSION_TOLERANCE); +} +namespace AB { + +// TODO: make this more generic +static LPEAngleBisector * +get_effect(SPItem *item) +{ + Effect *effect = sp_lpe_item_get_current_lpe(SP_LPE_ITEM(item)); + if (effect->effectType() != ANGLE_BISECTOR) { + g_print ("Warning: Effect is not of type LPEAngleBisector!\n"); + return NULL; + } + return static_cast(effect); +} + +void +KnotHolderEntityLeftEnd::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint /*state*/) +{ + LPEAngleBisector *lpe = get_effect(item); + + double lambda = Geom::nearest_point(p.to_2geom(), lpe->ptA, lpe->dir); + lpe->length_left.param_set_value(-lambda); + + sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); +} + +void +KnotHolderEntityRightEnd::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint /*state*/) +{ + LPEAngleBisector *lpe = get_effect(item); + + double lambda = Geom::nearest_point(p.to_2geom(), lpe->ptA, lpe->dir); + lpe->length_right.param_set_value(lambda); + + sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); +} + +NR::Point +KnotHolderEntityLeftEnd::knot_get() +{ + LPEAngleBisector *lpe = get_effect(item); + return lpe->ptA - lpe->dir * lpe->length_left; +} + +NR::Point +KnotHolderEntityRightEnd::knot_get() +{ + LPEAngleBisector *lpe = get_effect(item); + return lpe->ptA + lpe->dir * lpe->length_right; +} + +} // namespace AB + +/* ######################## */ + +} //namespace LivePathEffect +} /* namespace Inkscape */ + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/live_effects/lpe-angle_bisector.h b/src/live_effects/lpe-angle_bisector.h new file mode 100644 index 000000000..255635b71 --- /dev/null +++ b/src/live_effects/lpe-angle_bisector.h @@ -0,0 +1,65 @@ +#ifndef INKSCAPE_LPE_ANGLE_BISECTOR_H +#define INKSCAPE_LPE_ANGLE_BISECTOR_H + +/** \file + * LPE implementation, see lpe-angle_bisector.cpp. + */ + +/* + * Authors: + * Johan Engelen + * + * Copyright (C) Johan Engelen 2007 + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "live_effects/effect.h" +#include "live_effects/parameter/parameter.h" +#include "live_effects/parameter/point.h" + +namespace Inkscape { +namespace LivePathEffect { + +namespace AB { + // we use a separate namespace to avoid clashes with other LPEs + class KnotHolderEntityLeftEnd; + class KnotHolderEntityRightEnd; +} + +class LPEAngleBisector : public Effect { +public: + LPEAngleBisector(LivePathEffectObject *lpeobject); + virtual ~LPEAngleBisector(); + + virtual std::vector doEffect_path (std::vector const & path_in); + + friend class AB::KnotHolderEntityLeftEnd; + friend class AB::KnotHolderEntityRightEnd; + +private: + ScalarParam length_left; + ScalarParam length_right; + + Geom::Point ptA; + Geom::Point dir; + + LPEAngleBisector(const LPEAngleBisector&); + LPEAngleBisector& operator=(const LPEAngleBisector&); +}; + +} //namespace LivePathEffect +} //namespace Inkscape + +#endif + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :