Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
index d945d46..81bd99d 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file spiralgradient.cpp
-**     \brief Template Header
+**     \brief Implementation of the "Spiral Gradient" layer
 **
-**     $Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -52,10 +52,10 @@ using namespace synfig;
 
 SYNFIG_LAYER_INIT(SpiralGradient);
 SYNFIG_LAYER_SET_NAME(SpiralGradient,"spiral_gradient");
-SYNFIG_LAYER_SET_LOCAL_NAME(SpiralGradient,_("Spiral Gradient"));
-SYNFIG_LAYER_SET_CATEGORY(SpiralGradient,_("Gradients"));
+SYNFIG_LAYER_SET_LOCAL_NAME(SpiralGradient,N_("Spiral Gradient"));
+SYNFIG_LAYER_SET_CATEGORY(SpiralGradient,N_("Gradients"));
 SYNFIG_LAYER_SET_VERSION(SpiralGradient,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(SpiralGradient,"$Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(SpiralGradient,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -151,14 +151,18 @@ SpiralGradient::color_func(const Point &pos, float supersample)const
        dist-=floor(dist);
        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);
+               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);
+               pool+=gradient(1.0-left*0.5,left).premult_alpha()*left/supersample;
                return pool.demult_alpha();
        }
 
@@ -166,7 +170,7 @@ SpiralGradient::color_func(const Point &pos, float supersample)const
 }
 
 float
-SpiralGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const
+SpiralGradient::calc_supersample(const synfig::Point &x, float pw,float /*ph*/)const
 {
        return (1.41421*pw/radius+(1.41421*pw/Point(x-center).mag())/(PI*2))*0.5;
 }