X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fshade.cpp;h=4ab3917b748937aef8f092fc0bd195ad0b9f177a;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=7b53479b5582f5385b78a4233bf6621a120fc2dc;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/modules/lyr_std/shade.cpp b/synfig-core/trunk/src/modules/lyr_std/shade.cpp index 7b53479..4ab3917 100644 --- a/synfig-core/trunk/src/modules/lyr_std/shade.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/shade.cpp @@ -1,11 +1,12 @@ /* === S Y N F I G ========================================================= */ /*! \file shade.cpp -** \brief Template Header +** \brief Implementation of the "Shade" layer ** -** $Id: shade.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -53,9 +54,7 @@ using namespace std; /*#define TYPE_BOX 0 #define TYPE_FASTGUASSIAN 1 -#define TYPE_FASTGAUSSIAN 1 #define TYPE_CROSS 2 -#define TYPE_GUASSIAN 3 #define TYPE_GAUSSIAN 3 #define TYPE_DISC 4 */ @@ -64,10 +63,10 @@ using namespace std; SYNFIG_LAYER_INIT(Layer_Shade); SYNFIG_LAYER_SET_NAME(Layer_Shade,"shade"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shade,_("Shade")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Shade,_("Stylize")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shade,N_("Shade")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Shade,N_("Stylize")); SYNFIG_LAYER_SET_VERSION(Layer_Shade,"0.2"); -SYNFIG_LAYER_SET_CVS_ID(Layer_Shade,"$Id: shade.cpp,v 1.2 2005/01/24 03:08:17 darco Exp $"); +SYNFIG_LAYER_SET_CVS_ID(Layer_Shade,"$Id$"); /* -- F U N C T I O N S ----------------------------------------------------- */ @@ -82,7 +81,7 @@ Layer_Shade::Layer_Shade(): size(0.1,0.1), type(Blur::FASTGAUSSIAN), color(Color::black()), - offset(0.2,-0.2), + origin(0.2,-0.2), invert(false) { } @@ -92,10 +91,14 @@ Layer_Shade::set_param(const String ¶m, const ValueBase &value) { IMPORT_PLUS(size,clamp(size)); IMPORT(type); - IMPORT(color); - IMPORT(offset); + IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) { + set_blend_method(Color::BLEND_ALPHA_OVER); + color.set_a(1); } else transparent_color_ = true; } }); + IMPORT(origin); IMPORT(invert); - + + IMPORT_AS(origin,"offset"); + return Layer_Composite::set_param(param,value); } @@ -105,13 +108,13 @@ Layer_Shade::get_param(const String ¶m)const EXPORT(size); EXPORT(type); EXPORT(color); - EXPORT(offset); + EXPORT(origin); EXPORT(invert); - + EXPORT_NAME(); EXPORT_VERSION(); - - return Layer_Composite::get_param(param); + + return Layer_Composite::get_param(param); } Color @@ -121,13 +124,13 @@ Layer_Shade::get_color(Context context, const Point &pos)const if(get_amount()==0.0) return context.get_color(pos); - + Color shade(color); if(!invert) - shade.set_a(context.get_color(blurpos-offset).get_a()); + shade.set_a(context.get_color(blurpos-origin).get_a()); else - shade.set_a(1.0f-context.get_color(blurpos-offset).get_a()); + shade.set_a(1.0f-context.get_color(blurpos-origin).get_a()); return Color::blend(shade,context.get_color(pos),get_amount(),get_blend_method()); } @@ -136,46 +139,44 @@ bool Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const { int x,y; - + const int w = renddesc.get_w(), h = renddesc.get_h(); const Real pw = renddesc.get_pw(), ph = renddesc.get_ph(); - + RendDesc workdesc(renddesc); Surface worksurface; etl::surface blurred; - + //expand the working surface to accommodate the blur - + //the expanded size = 1/2 the size in each direction rounded up int halfsizex = (int) (abs(size[0]*.5/pw) + 3), halfsizey = (int) (abs(size[1]*.5/ph) + 3); - int offset_u(-round_to_int(offset[0]/pw)),offset_v(-round_to_int(offset[1]/ph)); + int origin_u(-round_to_int(origin[0]/pw)),origin_v(-round_to_int(origin[1]/ph)); - int offset_w(w+abs(offset_u)),offset_h(h+abs(offset_v)); + int origin_w(w+abs(origin_u)),origin_h(h+abs(origin_v)); workdesc.set_subwindow( - offset_u<0?offset_u:0, - offset_v<0?offset_v:0, - (offset_u>0?offset_u:0)+w, - (offset_v>0?offset_v:0)+h + origin_u<0?origin_u:0, + origin_v<0?origin_v:0, + (origin_u>0?origin_u:0)+w, + (origin_v>0?origin_v:0)+h ); - /* - if(quality >=10) + if(quality >= 10) { halfsizex=1; halfsizey=1; - }else - */ - if(quality == 9) + } + else if (quality == 9) { halfsizex/=4; halfsizey/=4; } - + //expand by 1/2 size in each direction on either side switch(type) { @@ -183,7 +184,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co case Blur::BOX: case Blur::CROSS: { - workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),offset_w+2*max(1,halfsizex),offset_h+2*max(1,halfsizey)); + workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),origin_w+2*max(1,halfsizex),origin_h+2*max(1,halfsizey)); break; } case Blur::FASTGAUSSIAN: @@ -193,7 +194,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co halfsizex*=2; halfsizey*=2; } - workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),offset_w+2*max(1,halfsizex),offset_h+2*max(1,halfsizey)); + workdesc.set_subwindow(-max(1,halfsizex),-max(1,halfsizey),origin_w+2*max(1,halfsizex),origin_h+2*max(1,halfsizey)); break; } case Blur::GAUSSIAN: @@ -201,7 +202,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co #define GAUSSIAN_ADJUSTMENT (0.05) Real pw = (Real)workdesc.get_w()/(workdesc.get_br()[0]-workdesc.get_tl()[0]); Real ph = (Real)workdesc.get_h()/(workdesc.get_br()[1]-workdesc.get_tl()[1]); - + pw=pw*pw; ph=ph*ph; @@ -210,8 +211,8 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co halfsizex = (halfsizex + 1)/2; halfsizey = (halfsizey + 1)/2; - workdesc.set_subwindow( -halfsizex, -halfsizey, offset_w+2*halfsizex, offset_h+2*halfsizey ); - + workdesc.set_subwindow( -halfsizex, -halfsizey, origin_w+2*halfsizex, origin_h+2*halfsizey ); + break; } } @@ -220,25 +221,25 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co { SuperCallback stageone(cb,0,5000,10000); SuperCallback stagetwo(cb,5000,10000,10000); - + //callbacks depend on how long the blur takes if(size[0] || size[1]) { if(type == Blur::DISC) { stageone = SuperCallback(cb,0,5000,10000); - stagetwo = SuperCallback(cb,5000,10000,10000); + stagetwo = SuperCallback(cb,5000,10000,10000); } else { stageone = SuperCallback(cb,0,9000,10000); - stagetwo = SuperCallback(cb,9000,10000,10000); + stagetwo = SuperCallback(cb,9000,10000,10000); } } else { stageone = SuperCallback(cb,0,9999,10000); - stagetwo = SuperCallback(cb,9999,10000,10000); + stagetwo = SuperCallback(cb,9999,10000,10000); } @@ -246,7 +247,7 @@ Layer_Shade::accelerated_render(Context context,Surface *surface,int quality, co //render the background onto the expanded surface if(!context.accelerated_render(&worksurface,quality,workdesc,&stageone)) return false; - + // Copy over the alpha blurred.set_wh(worksurface.get_w(),worksurface.get_h()); for(int j=0;jset_wh(renddesc.get_w(),renddesc.get_h()); - - int u = halfsizex-(offset_u<0?offset_u:0), v = halfsizey-(offset_v<0?offset_v:0); + + int u = halfsizex-(origin_u<0?origin_u:0), v = halfsizey-(origin_v<0?origin_v:0); for(y=0;yamount_complete(10000,10000)) { //if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__)); return false; } - + return true; } - + Layer::Vocab Layer_Shade::get_param_vocab(void)const { @@ -373,14 +374,14 @@ Layer_Shade::get_param_vocab(void)const ret.push_back(ParamDesc("color") .set_local_name(_("Color")) ); - ret.push_back(ParamDesc("offset") - .set_local_name(_("Offset")) + ret.push_back(ParamDesc("origin") + .set_local_name(_("Origin")) ); ret.push_back(ParamDesc("size") .set_local_name(_("Size")) .set_description(_("Size of Shade")) .set_is_distance() - .set_origin("offset") + .set_origin("origin") ); ret.push_back(ParamDesc("type") .set_local_name(_("Type")) @@ -392,11 +393,11 @@ Layer_Shade::get_param_vocab(void)const .add_enum_value(Blur::GAUSSIAN,"gaussian",_("Gaussian Blur")) .add_enum_value(Blur::DISC,"disc",_("Disc Blur")) ); - + ret.push_back(ParamDesc("invert") .set_local_name(_("Invert")) ); - + return ret; } @@ -414,10 +415,10 @@ Layer_Shade::get_full_bounding_rect(Context context)const if(Color::is_onto(get_blend_method())) return under; - Rect bounds((under+offset).expand_x(size[0]).expand_y(size[1])); + Rect bounds((under+origin).expand_x(size[0]).expand_y(size[1])); if(is_solid_color()) return bounds; - + return bounds|under; }