X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fradialgradient.cpp;h=5c3d20b61523db05519b7fa8a654ddd86b978dde;hb=13468222677bf3e31d445144621d983a4094c6bb;hp=a012039f6c2d67b446ffec4a0f43ee76b08220d9;hpb=70bcefce2ab011a11014f36fc129b473cc0bc61e;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp
index a012039..5c3d20b 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file mod_gradient/radialgradient.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Radial Gradient" layer
 **
-**	$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -52,10 +53,10 @@ using namespace synfig;
 
 SYNFIG_LAYER_INIT(RadialGradient);
 SYNFIG_LAYER_SET_NAME(RadialGradient,"radial_gradient");
-SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient"));
-SYNFIG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients"));
+SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,N_("Radial Gradient"));
+SYNFIG_LAYER_SET_CATEGORY(RadialGradient,N_("Gradients"));
 SYNFIG_LAYER_SET_VERSION(RadialGradient,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(RadialGradient,"$Id: radialgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(RadialGradient,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -125,7 +126,7 @@ RadialGradient::get_param_vocab()const
 	);
 
 	ret.push_back(ParamDesc("zigzag")
-		.set_local_name(_("Zig-Zag"))
+		.set_local_name(_("ZigZag"))
 	);
 
 	return ret;
@@ -149,14 +150,20 @@ RadialGradient::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();
 		}
 	}
@@ -166,7 +173,7 @@ RadialGradient::color_func(const Point &point, float supersample)const
 
 
 float
-RadialGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const
+RadialGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const
 {
 //	return sqrt(pw*pw+ph*ph)/radius;
 	return 1.2*pw/radius;