X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fspiralgradient.cpp;h=81bd99d3853fb5644b9374d1d52a9706148c7b0c;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=c94b6f63863d7b091414dbb117f663a91f4ad162;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
index c94b6f6..81bd99d 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file spiralgradient.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Spiral Gradient" layer
 **
 **	$Id$
 **
@@ -52,8 +52,8 @@ 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$");
 
@@ -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;
 }