Added a slower but more accurate find_closest() routine to _bezier.h. Added a parame...

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

diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp
index ce29a36..f8bf419 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp
@@ -2,6 +2,8 @@
 /*!    \file lineargradient.cpp
 **     \brief Template Header
 **
+**     $Id$
+**
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
@@ -51,7 +53,7 @@ SYNFIG_LAYER_SET_NAME(LinearGradient,"linear_gradient");
 SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,_("Linear Gradient"));
 SYNFIG_LAYER_SET_CATEGORY(LinearGradient,_("Gradients"));
 SYNFIG_LAYER_SET_VERSION(LinearGradient,"0.0");
-SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id: lineargradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -95,14 +97,20 @@ LinearGradient::color_func(const Point &point, float supersample)const
        {
                if(dist+supersample*0.5>1.0)
                {
-                       Color pool(gradient(dist,supersample*0.5).premult_alpha()*(1.0-(dist-supersample*0.5)));
-                       pool+=gradient((dist+supersample*0.5)-1.0,supersample*0.5).premult_alpha()*((dist+supersample*0.5)-1.0);
+                       float  left(supersample*0.5-(dist-1.0));
+                       float right(supersample*0.5+(dist-1.0));
+                       Color pool(gradient(1.0-(left*0.5),left).premult_alpha()*left/supersample);
+                       if (zigzag) pool+=gradient(1.0-right*0.5,right).premult_alpha()*right/supersample;
+                       else            pool+=gradient(right*0.5,right).premult_alpha()*right/supersample;
                        return pool.demult_alpha();
                }
                if(dist-supersample*0.5<0.0)
                {
-                       Color pool(gradient(dist,supersample*0.5).premult_alpha()*(dist+supersample*0.5));
-                       pool+=gradient(1.0-(dist-supersample*0.5),supersample*0.5).premult_alpha()*(-(dist-supersample*0.5));
+                       float  left(supersample*0.5-dist);
+                       float right(supersample*0.5+dist);
+                       Color pool(gradient(right*0.5,right).premult_alpha()*right/supersample);
+                       if (zigzag) pool+=gradient(left*0.5,left).premult_alpha()*left/supersample;
+                       else            pool+=gradient(1.0-left*0.5,left).premult_alpha()*left/supersample;
                        return pool.demult_alpha();
                }
        }