X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fspiralgradient.cpp;h=d945d460cda7e53abff0a1edb7e3990a5d42b43c;hb=36d01e1527fda602a9aed07d209eb34e6770bca8;hp=bcf4a4c79846c6501d1188a57e4868a46bce30fe;hpb=e8a065f2385c219c511b57dac52786120bfa097d;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 bcf4a4c..d945d46 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp @@ -72,7 +72,7 @@ SpiralGradient::SpiralGradient(): clockwise(false) { } - + bool SpiralGradient::set_param(const String & param, const ValueBase &value) { @@ -81,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); } @@ -93,18 +93,18 @@ SpiralGradient::get_param(const String ¶m)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")) ); @@ -112,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")) @@ -128,7 +128,7 @@ SpiralGradient::get_param_vocab()const ret.push_back(ParamDesc("clockwise") .set_local_name(_("Clockwise")) ); - + return ret; } @@ -139,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) { @@ -161,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); } @@ -187,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 { @@ -211,7 +211,7 @@ SpiralGradient::accelerated_render(Context context,Surface *surface,int quality, return true; } - + int x,y; Surface::pen pen(surface->begin()); @@ -220,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