X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_filter%2Fhalftone2.cpp;h=ea814ae85cc85435f218c8097bbb527dd19816cb;hb=6e6b8ce1d75be6a6b99d2cc955faeeea80d62c26;hp=cc5872cf1c2a3d64145a416c7c02efb9248393fd;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp index cc5872c..ea814ae 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp @@ -70,7 +70,7 @@ Halftone2::Halftone2(): halftone.size=(synfig::Vector(0.25,0.25)); halftone.angle=(Angle::zero()); halftone.type=TYPE_SYMMETRIC; - + set_blend_method(Color::BLEND_STRAIGHT); } @@ -85,8 +85,8 @@ Halftone2::color_func(const Point &point, float supersample,const Color& color)c else if(amount>=1.0f) halfcolor=color_light; else - halfcolor=Color::blend(color_light,color_dark,amount,Color::BLEND_STRAIGHT); - + halfcolor=Color::blend(color_light,color_dark,amount,Color::BLEND_STRAIGHT); + halfcolor.set_a(color.get_a()); return halfcolor; @@ -114,8 +114,8 @@ Halftone2::set_param(const String & param, const ValueBase &value) IMPORT_AS(halftone.type,"type"); IMPORT_AS(halftone.angle,"angle"); IMPORT_AS(halftone.offset,"offset"); - - return Layer_Composite::set_param(param,value); + + return Layer_Composite::set_param(param,value); } ValueBase @@ -128,18 +128,18 @@ Halftone2::get_param(const String & param)const EXPORT(color_dark); EXPORT(color_light); - + EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Composite::get_param(param); + + return Layer_Composite::get_param(param); } Layer::Vocab Halftone2::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - + ret.push_back(ParamDesc("offset") .set_local_name(_("Mask Offset")) .set_is_distance() @@ -168,7 +168,7 @@ Halftone2::get_param_vocab()const .add_enum_value(TYPE_DIAMOND,"diamond",_("Diamond")) .add_enum_value(TYPE_STRIPE,"stripe",_("Stripe")) ); - + return ret; } @@ -193,7 +193,7 @@ Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons return false; if(get_amount()==0) return true; - + const Real pw(renddesc.get_pw()),ph(renddesc.get_ph()); const Point tl(renddesc.get_tl()); const int w(surface->get_w()); @@ -203,7 +203,7 @@ Halftone2::accelerated_render(Context context,Surface *surface,int quality, cons Surface::pen pen(surface->begin()); Point pos; int x,y; - + if(is_solid_color()) { for(y=0,pos[1]=tl[1];yamount_complete(10000,10000)) return false;