New LPE: Angle bisector

diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert
index 843a8beb6614fd158d6ccd62fd9016b2452e8cd1..3d5cc43c4c197199a44d5c4f70e1f129cd755447 100644 (file)
--- 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 4f4aaff3fc88775d4ea648aad75511e99effd814..81c9a63848a39a859e935e00a5828c7f8077ced4 100644 (file)
--- 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<EffectType> 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<EffectType> LPETypeConverter(LPETypeData, INVALID_LPE);
 
@@ -149,6 +151,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
         case CIRCLE_3PTS:
             neweffect = static_cast<Effect*> ( new LPECircle3Pts(lpeobj) );
             break;
+        case ANGLE_BISECTOR:
+            neweffect = static_cast<Effect*> ( 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 93f2e60b15b61c9910955aa13b46158f987fd06a..6eeff94c4e4cccece6a4d42f8f30987cd7485a32 100644 (file)
--- 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 (file)
index 0000000..a69b691
--- /dev/null
+++ b/src/live_effects/lpe-angle_bisector.cpp
@@ -0,0 +1,161 @@
+#define INKSCAPE_LPE_ANGLE_BISECTOR_CPP
+/** \file
+ * LPE <angle_bisector> 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 <j.b.c.engelen@utwente.nl>
+ *
+ * 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<Parameter *>(&length_left) );
+    registerParameter( dynamic_cast<Parameter *>(&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<Geom::Path>
+LPEAngleBisector::doEffect_path (std::vector<Geom::Path> const & path_in)
+{
+    using namespace Geom;
+
+    std::vector<Geom::Path> 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<D2<SBasis> > output = Piecewise<D2<SBasis> >(D2<SBasis>(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<LPEAngleBisector *>(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 (file)
index 0000000..255635b
--- /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 <angle_bisector> implementation, see lpe-angle_bisector.cpp.
+ */
+
+/*
+ * Authors:
+ *   Johan Engelen
+ *
+ * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
+ *
+ * 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<Geom::Path> doEffect_path (std::vector<Geom::Path> 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 :