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=cdff1751065329dd12d33e10e928dfa357daefd7;hpb=e8a065f2385c219c511b57dac52786120bfa097d;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 cdff175..5bf42a9 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file conicalgradient.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Conical Gradient" layer
 **
-**	$Id: conicalgradient.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
@@ -53,10 +53,10 @@ 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: conicalgradient.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(ConicalGradient,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -72,7 +72,7 @@ ConicalGradient::ConicalGradient():
 	symmetric(false)
 {
 }
-	
+
 bool
 ConicalGradient::set_param(const String & param, const ValueBase &value)
 {
@@ -93,15 +93,15 @@ ConicalGradient::get_param(const String &param)const
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return Layer_Composite::get_param(param);	
+
+	return Layer_Composite::get_param(param);
 }
 
 Layer::Vocab
 ConicalGradient::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Composite::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("gradient")
 		.set_local_name(_("Gradient"))
 	);
@@ -109,7 +109,7 @@ ConicalGradient::get_param_vocab()const
 	ret.push_back(ParamDesc("center")
 		.set_local_name(_("Center"))
 	);
-	
+
 	ret.push_back(ParamDesc("angle")
 		.set_local_name(_("Angle"))
 		.set_origin("center")
@@ -118,7 +118,7 @@ ConicalGradient::get_param_vocab()const
 	ret.push_back(ParamDesc("symmetric")
 		.set_local_name(_("Symmetric"))
 	);
-	
+
 	return ret;
 }
 
@@ -129,7 +129,7 @@ ConicalGradient::color_func(const Point &pos, float supersample)const
 	Angle::rot a=Angle::tan(-centered[1],centered[0]).mod();
 	a+=angle;
 	Real dist(a.mod().get());
-	
+
 	dist-=floor(dist);
 
 	if(symmetric)
@@ -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();
 	}
 
@@ -207,13 +211,13 @@ Color
 ConicalGradient::get_color(Context context, const Point &pos)const
 {
 	const Color color(color_func(pos));
-	
+
 	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
 		return color;
 	else
 		return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
 }
-	
+
 bool
 ConicalGradient::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
@@ -231,7 +235,7 @@ ConicalGradient::accelerated_render(Context context,Surface *surface,int quality
 			return true;
 	}
 
-		
+
 	int x,y;
 
 	Surface::pen pen(surface->begin());
@@ -240,7 +244,7 @@ ConicalGradient::accelerated_render(Context context,Surface *surface,int quality
 	Point tl(renddesc.get_tl());
 	const int w(surface->get_w());
 	const int h(surface->get_h());
-	
+
 	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
 	{
 		if(quality<9)