X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fspiralgradient.cpp;h=d945d460cda7e53abff0a1edb7e3990a5d42b43c;hb=70bcefce2ab011a11014f36fc129b473cc0bc61e;hp=c4330a870b90873c94a725e7216888580d092d6e;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;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 c4330a8..d945d46 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp
@@ -5,16 +5,17 @@
 **	$Id: spiralgradient.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -71,7 +72,7 @@ SpiralGradient::SpiralGradient():
 	clockwise(false)
 {
 }
-	
+
 bool
 SpiralGradient::set_param(const String & param, const ValueBase &value)
 {
@@ -80,7 +81,7 @@ SpiralGradient::set_param(const String & param, const ValueBase &value)
 	IMPORT(radius);
 	IMPORT(angle);
 	IMPORT(clockwise);
-	
+
 	return Layer_Composite::set_param(param,value);
 }
 
@@ -92,18 +93,18 @@ SpiralGradient::get_param(const String &param)const
 	EXPORT(radius);
 	EXPORT(angle);
 	EXPORT(clockwise);
-	
+
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return Layer_Composite::get_param(param);	
+
+	return Layer_Composite::get_param(param);
 }
 
 Layer::Vocab
 SpiralGradient::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Composite::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("gradient")
 		.set_local_name(_("Gradient"))
 	);
@@ -111,7 +112,7 @@ SpiralGradient::get_param_vocab()const
 	ret.push_back(ParamDesc("center")
 		.set_local_name(_("Center"))
 	);
-	
+
 	ret.push_back(ParamDesc("radius")
 		.set_local_name(_("Radius"))
 		.set_description(_("This is the radius of the circle"))
@@ -127,7 +128,7 @@ SpiralGradient::get_param_vocab()const
 	ret.push_back(ParamDesc("clockwise")
 		.set_local_name(_("Clockwise"))
 	);
-	
+
 	return ret;
 }
 
@@ -138,15 +139,15 @@ SpiralGradient::color_func(const Point &pos, float supersample)const
 	Angle a;
 	a=Angle::tan(-centered[1],centered[0]).mod();
 	a=a+angle;
-	
+
 	if(supersample<0.00001)supersample=0.00001;
-	
+
 	Real dist((pos-center).mag()/radius);
 	if(clockwise)
 		dist+=Angle::rot(a.mod()).get();
 	else
 		dist-=Angle::rot(a.mod()).get();
-		
+
 	dist-=floor(dist);
 	if(dist+supersample*0.5>1.0)
 	{
@@ -160,7 +161,7 @@ SpiralGradient::color_func(const Point &pos, float supersample)const
 		pool+=gradient(1.0-(dist-supersample*0.5),supersample*0.5).premult_alpha()*(-(dist-supersample*0.5));
 		return pool.demult_alpha();
 	}
-	
+
 	return gradient(dist,supersample);
 }
 
@@ -186,13 +187,13 @@ Color
 SpiralGradient::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
 SpiralGradient::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
@@ -210,7 +211,7 @@ SpiralGradient::accelerated_render(Context context,Surface *surface,int quality,
 			return true;
 	}
 
-		
+
 	int x,y;
 
 	Surface::pen pen(surface->begin());
@@ -219,7 +220,7 @@ SpiralGradient::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)
 	{
 		for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)