X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fconicalgradient.cpp;h=5bf42a9ddf15659b2687447e65d3d49ff296a240;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=f2abd63a3ce290927a6f65012e0f99c5c1944025;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp
index f2abd63..5bf42a9 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file conicalgradient.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Conical Gradient" layer
 **
 **	$Id$
 **
@@ -53,8 +53,8 @@ using namespace synfig;
 
 SYNFIG_LAYER_INIT(ConicalGradient);
 SYNFIG_LAYER_SET_NAME(ConicalGradient,"conical_gradient");
-SYNFIG_LAYER_SET_LOCAL_NAME(ConicalGradient,_("Conical Gradient"));
-SYNFIG_LAYER_SET_CATEGORY(ConicalGradient,_("Gradients"));
+SYNFIG_LAYER_SET_LOCAL_NAME(ConicalGradient,N_("Conical Gradient"));
+SYNFIG_LAYER_SET_CATEGORY(ConicalGradient,N_("Gradients"));
 SYNFIG_LAYER_SET_VERSION(ConicalGradient,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(ConicalGradient,"$Id$");
 
@@ -168,14 +168,18 @@ ConicalGradient::color_func(const Point &pos, 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);
+		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();
 	}