X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_particle%2Fplant.cpp;h=29dab46088a4b5ae71c2ecb66f0d217230b31f14;hb=c4f08b9dd6388dcf27121fd5346047909ed82815;hp=4f10df9eba00867c56a68f4bcde6e9eea281cb49;hpb=e13130619534dd014f1e41cefe89f0270e3169d0;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_particle/plant.cpp b/synfig-core/trunk/src/modules/mod_particle/plant.cpp index 4f10df9..29dab46 100644 --- a/synfig-core/trunk/src/modules/mod_particle/plant.cpp +++ b/synfig-core/trunk/src/modules/mod_particle/plant.cpp @@ -1,6 +1,6 @@ /* === S Y N F I G ========================================================= */ /*! \file plant.cpp -** \brief Template +** \brief Implementation of the "Plant" layer ** ** $Id$ ** @@ -65,8 +65,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Plant); SYNFIG_LAYER_SET_NAME(Plant,"plant"); -SYNFIG_LAYER_SET_LOCAL_NAME(Plant,_("Plant")); -SYNFIG_LAYER_SET_CATEGORY(Plant,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Plant,N_("Plant")); +SYNFIG_LAYER_SET_CATEGORY(Plant,N_("Other")); SYNFIG_LAYER_SET_VERSION(Plant,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Plant,"$Id$"); @@ -107,6 +107,7 @@ Plant::Plant(): needs_sync_=true; sync(); size_as_alpha=false; + reverse=true; } void @@ -283,12 +284,17 @@ Plant::set_param(const String & param, const ValueBase &value) else if (step > 1) step=1; }); - IMPORT_PLUS(splits,needs_sync_=true); + IMPORT_PLUS(splits,{ + needs_sync_=true; + if (splits < 1) + splits = 1; + }); IMPORT_PLUS(sprouts,needs_sync_=true); IMPORT_PLUS(random_factor,needs_sync_=true); IMPORT_PLUS(drag,needs_sync_=true); IMPORT(size); IMPORT(size_as_alpha); + IMPORT(reverse); return Layer_Composite::set_param(param,value); } @@ -336,6 +342,7 @@ Plant::get_param(const String& param)const EXPORT(size); EXPORT(size_as_alpha); + EXPORT(reverse); EXPORT_NAME(); EXPORT_VERSION(); @@ -392,6 +399,11 @@ Plant::get_param_vocab()const .set_description(_("If enabled, the alpha channel from the gradient is multiplied by the stem size, and an alpha of 1.0 is used when rendering")) ); + ret.push_back(ParamDesc("reverse") + .set_local_name(_("Reverse")) + .set_description(_("If enabled, render the plant in the opposite direction")) + ); + ret.push_back(ParamDesc("step") .set_local_name(_("Step")) .set_description(_("Measure of the distance between points when rendering")) @@ -449,189 +461,215 @@ Plant::accelerated_render(Context context,Surface *surface,int quality, const Re const Real pw = (br[0] - tl[0]) / w; const Real ph = (br[1] - tl[1]) / h; + if (isinf(pw) || isinf(ph)) + return true; + if(needs_sync_==true) sync(); - std::vector::reverse_iterator iter; + if (particle_list.begin() != particle_list.end()) + { + std::vector::iterator iter; + Particle *particle; - float radius(size*sqrt(1.0f/(abs(pw)*abs(ph)))); + float radius(size*sqrt(1.0f/(abs(pw)*abs(ph)))); - int x1,y1,x2,y2; - for(iter=particle_list.rbegin();iter!=particle_list.rend();++iter) - { - float scaled_radius(radius); - Color color(iter->color); - if(size_as_alpha) - { - scaled_radius*=color.get_a(); - color.set_a(1); - } + int x1,y1,x2,y2; - // previously, radius was multiplied by sqrt(step)*12 only if - // the radius came out at less than 1 (pixel): - // if (radius<=1.0f) radius*=sqrt(step)*12.0f; - // seems a little arbitrary - does it help? - - // calculate the box that this particle will be drawn as - float x1f=(iter->point[0]-tl[0])/pw-(scaled_radius*0.5); - float x2f=(iter->point[0]-tl[0])/pw+(scaled_radius*0.5); - float y1f=(iter->point[1]-tl[1])/ph-(scaled_radius*0.5); - float y2f=(iter->point[1]-tl[1])/ph+(scaled_radius*0.5); - x1=ceil_to_int(x1f); - x2=ceil_to_int(x2f)-1; - y1=ceil_to_int(y1f); - y2=ceil_to_int(y2f)-1; - - // if the box is entirely off the canvas, go to the next particle - if(x1>surface_width || y1>surface_height || x2<0 || y2<0) continue; - - float x1e=x1-x1f, x2e=x2f-x2, y1e=y1-y1f, y2e=y2f-y2; - // printf("x1e %.4f x2e %.4f y1e %.4f y2e %.4f\n", x1e, x2e, y1e, y2e); - - // adjust the box so it's entirely on the canvas - if(x1<=0) { x1=0; x1e=0; } - if(y1<=0) { y1=0; y1e=0; } - if(x2>=surface_width) { x2=surface_width; x2e=0; } - if(y2>=surface_height) { y2=surface_height; y2e=0; } - - int w(x2-x1), h(y2-y1); - - Surface::alpha_pen surface_pen(dest_surface.get_pen(x1,y1),1.0f); - if(w>0 && h>0) - dest_surface.fill(color,surface_pen,w,h); - - /* the rectangle doesn't cross any vertical pixel boundaries so we don't - * need to draw any top or bottom edges - */ - if(x2color); + if(size_as_alpha) { - surface_pen.move_to(x1-1,y2); - if (x1e!=0) // maybe draw left pixel - { - surface_pen.set_alpha(x1e*(y2f-y1f)); - surface_pen.put_value(color); - } - surface_pen.inc_x(); - surface_pen.set_alpha(y2f-y1f); - for(int i=x1; ipoint[0]-tl[0])/pw-(scaled_radius*0.5); + float x2f=(particle->point[0]-tl[0])/pw+(scaled_radius*0.5); + float y1f=(particle->point[1]-tl[1])/ph-(scaled_radius*0.5); + float y2f=(particle->point[1]-tl[1])/ph+(scaled_radius*0.5); + x1=ceil_to_int(x1f); + x2=ceil_to_int(x2f)-1; + y1=ceil_to_int(y1f); + y2=ceil_to_int(y2f)-1; + + // if the box isn't entirely off the canvas, draw it + if(x1<=surface_width && y1<=surface_height && x2>=0 && y2>=0) { - if (x1e!=0) // maybe draw left edge + float x1e=x1-x1f, x2e=x2f-x2, y1e=y1-y1f, y2e=y2f-y2; + // printf("x1e %.4f x2e %.4f y1e %.4f y2e %.4f\n", x1e, x2e, y1e, y2e); + + // adjust the box so it's entirely on the canvas + if(x1<=0) { x1=0; x1e=0; } + if(y1<=0) { y1=0; y1e=0; } + if(x2>=surface_width) { x2=surface_width; x2e=0; } + if(y2>=surface_height) { y2=surface_height; y2e=0; } + + int w(x2-x1), h(y2-y1); + + Surface::alpha_pen surface_pen(dest_surface.get_pen(x1,y1),1.0f); + if(w>0 && h>0) + dest_surface.fill(color,surface_pen,w,h); + + /* the rectangle doesn't cross any vertical pixel boundaries so we don't + * need to draw any top or bottom edges + */ + if(x2