Use a single scalar product to calculate the distance of each point from the bline.

[synfig.git] / synfig-core / trunk / src / modules / mod_gradient / curvegradient.cpp

diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
index ee7a4b2..9e9a5ea 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007-2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -203,7 +203,7 @@ CurveGradient::sync()
 
 
 CurveGradient::CurveGradient():
-       offset(0,0),
+       origin(0,0),
        width(0.25),
        gradient(Color::black(), Color::white()),
        loop(false),
@@ -251,7 +251,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
        else
        {
                float t;
-               Point point(point_-offset);
+               Point point(point_-origin);
 
                std::vector<synfig::BLinePoint>::const_iterator iter,next;
 
@@ -362,14 +362,14 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
                        const Real mag(diff.inv_mag());
                        supersample=supersample*mag;
                        diff*=mag*mag;
-                       dist=((point_-offset)*diff-p1*diff);
+                       dist=(point_-origin - p1)*diff;
                }
        }
        else                                            // not perpendicular
        {
                if (edge_case)
                {
-                       diff=(p1-(point_-offset));
+                       diff=(p1-(point_-origin));
                        if(diff*tangent.perp()<0) diff=-diff;
                        diff=diff.norm()*thickness*width;
                }
@@ -380,7 +380,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
                const Real mag(diff.inv_mag());
                supersample=supersample*mag;
                diff*=mag*mag;
-               dist=((point_-offset)*diff-p1*diff);
+               dist=(point_-origin - p1)*diff;
        }
 
        if(loop)
@@ -440,7 +440,7 @@ CurveGradient::set_param(const String & param, const ValueBase &value)
 {
 
 
-       IMPORT(offset);
+       IMPORT(origin);
        IMPORT(perpendicular);
        IMPORT(fast);
 
@@ -457,13 +457,16 @@ CurveGradient::set_param(const String & param, const ValueBase &value)
        IMPORT(gradient);
        IMPORT(loop);
        IMPORT(zigzag);
+
+       IMPORT_AS(origin,"offset");
+
        return Layer_Composite::set_param(param,value);
 }
 
 ValueBase
 CurveGradient::get_param(const String & param)const
 {
-       EXPORT(offset);
+       EXPORT(origin);
        EXPORT(bline);
        EXPORT(gradient);
        EXPORT(loop);
@@ -483,8 +486,8 @@ CurveGradient::get_param_vocab()const
 {
        Layer::Vocab ret(Layer_Composite::get_param_vocab());
 
-       ret.push_back(ParamDesc("offset")
-                                 .set_local_name(_("Offset")));
+       ret.push_back(ParamDesc("origin")
+                                 .set_local_name(_("Origin")));
 
        ret.push_back(ParamDesc("width")
                                  .set_is_distance()
@@ -492,8 +495,8 @@ CurveGradient::get_param_vocab()const
 
        ret.push_back(ParamDesc("bline")
                                  .set_local_name(_("Vertices"))
-                                 .set_origin("offset")
-                                 .set_scalar("width")
+                                 .set_origin("origin")
+                                 .set_hint("width")
                                  .set_description(_("A list of BLine Points")));
 
        ret.push_back(ParamDesc("gradient")