X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Flineargradient.cpp;h=be7155a06d2d761dbb785985e37ac5b673d8c52f;hb=13468222677bf3e31d445144621d983a4094c6bb;hp=27364d79f63ad7dbb38a5321a3312c3760061f96;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp
index 27364d7..be7155a 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp
@@ -1,6 +1,8 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file lineargradient.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Linear Gradient" layer
+**
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -48,8 +50,8 @@
 
 SYNFIG_LAYER_INIT(LinearGradient);
 SYNFIG_LAYER_SET_NAME(LinearGradient,"linear_gradient");
-SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,_("Linear Gradient"));
-SYNFIG_LAYER_SET_CATEGORY(LinearGradient,_("Gradients"));
+SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,N_("Linear Gradient"));
+SYNFIG_LAYER_SET_CATEGORY(LinearGradient,N_("Gradients"));
 SYNFIG_LAYER_SET_VERSION(LinearGradient,"0.0");
 SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id$");
 
@@ -95,14 +97,20 @@ LinearGradient::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();
 		}
 	}
@@ -110,7 +118,7 @@ LinearGradient::color_func(const Point &point, float supersample)const
 }
 
 float
-LinearGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const
+LinearGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const
 {
 	return pw/(p2-p1).mag();
 }
@@ -130,13 +138,13 @@ LinearGradient::hit_check(synfig::Context context, const synfig::Point &point)co
 bool
 LinearGradient::set_param(const String & param, const ValueBase &value)
 {
-	if(param=="p1" && value.same_as(p1))
+	if(param=="p1" && value.same_type_as(p1))
 	{
 		p1=value.get(p1);
 		sync();
 		return true;
 	}
-	if(param=="p2" && value.same_as(p2))
+	if(param=="p2" && value.same_type_as(p2))
 	{
 		p2=value.get(p2);
 		sync();