X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fexample%2Fmetaballs.cpp;h=0cfa6c3cc27543c4b419c8a3d34bb2ea90c7ee57;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=f7550f9351e8f2a14bd7b12b9d71cc2cad3bd4ad;hpb=c74ce4738eff208de3bef4b63929b6975a896e93;p=synfig.git diff --git a/synfig-core/trunk/src/modules/example/metaballs.cpp b/synfig-core/trunk/src/modules/example/metaballs.cpp index f7550f9..0cfa6c3 100644 --- a/synfig-core/trunk/src/modules/example/metaballs.cpp +++ b/synfig-core/trunk/src/modules/example/metaballs.cpp @@ -1,6 +1,6 @@ /* === S Y N F I G ========================================================= */ /*! \file metaballs.cpp -** \brief Implements metaballs +** \brief Implementation of the "Metaballs" layer ** ** $Id$ ** @@ -53,8 +53,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Metaballs); SYNFIG_LAYER_SET_NAME(Metaballs,"metaballs"); -SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,_("Metaballs")); -SYNFIG_LAYER_SET_CATEGORY(Metaballs,_("Default")); +SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,N_("Metaballs")); +SYNFIG_LAYER_SET_CATEGORY(Metaballs,N_("Example")); SYNFIG_LAYER_SET_VERSION(Metaballs,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id$"); @@ -66,8 +66,14 @@ SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id$"); Metaballs::Metaballs(): Layer_Composite(1.0,Color::BLEND_STRAIGHT), - color(Color::black()) + gradient(Color::black(), Color::white()), + threshold(0), + threshold2(1), + positive(false) { + centers.push_back(Point( 0, -1.5)); radii.push_back(2.5); weights.push_back(1); + centers.push_back(Point(-2, 1)); radii.push_back(2.5); weights.push_back(1); + centers.push_back(Point( 2, 1)); radii.push_back(2.5); weights.push_back(1); } bool @@ -91,8 +97,10 @@ Metaballs::set_param(const String & param, const ValueBase &value) return true; } - IMPORT(color); + IMPORT(gradient); IMPORT(threshold); + IMPORT(threshold2); + IMPORT(positive); return Layer_Composite::set_param(param,value); } @@ -100,12 +108,14 @@ Metaballs::set_param(const String & param, const ValueBase &value) ValueBase Metaballs::get_param(const String ¶m)const { - EXPORT(color); + EXPORT(gradient); EXPORT(radii); EXPORT(weights); EXPORT(centers); EXPORT(threshold); + EXPORT(threshold2); + EXPORT(positive); EXPORT_NAME(); EXPORT_VERSION(); @@ -118,8 +128,8 @@ Metaballs::get_param_vocab()const { Layer::Vocab ret(Layer_Composite::get_param_vocab()); - ret.push_back(ParamDesc("color") - .set_local_name(_("Color")) + ret.push_back(ParamDesc("gradient") + .set_local_name(_("Gradient")) ); ret.push_back(ParamDesc("centers") @@ -135,18 +145,47 @@ Metaballs::get_param_vocab()const ); ret.push_back(ParamDesc("threshold") - .set_local_name(_("Threshold")) + .set_local_name(_("Gradient Left")) + ); + + ret.push_back(ParamDesc("threshold2") + .set_local_name(_("Gradient Right")) + ); + + ret.push_back(ParamDesc("positive") + .set_local_name(_("Positive Only")) ); return ret; } -static inline Real densityfunc(const synfig::Point &p, const synfig::Point &c, Real R) +synfig::Layer::Handle +Metaballs::hit_check(synfig::Context context, const synfig::Point &point)const +{ + Real density(totaldensity(point)); + + if (density <= 0 || density > 1 || get_amount() == 0) + return context.hit_check(point); + + synfig::Layer::Handle tmp; + + if (get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(point))) + return tmp; + + if (Color::is_onto(get_blend_method()) && !(context.hit_check(point))) + return 0; + + return const_cast(this); +} + +Real +Metaballs::densityfunc(const synfig::Point &p, const synfig::Point &c, Real R)const { const Real dx = p[0] - c[0]; const Real dy = p[1] - c[1]; const Real n = (1 - (dx*dx + dy*dy)/(R*R)); + if (positive && n < 0) return 0; return (n*n*n); /* @@ -160,55 +199,38 @@ static inline Real densityfunc(const synfig::Point &p, const synfig::Point &c, R } Real -Metaballs::totaldensity(const Point &pos) const +Metaballs::totaldensity(const Point &pos)const { Real density = 0; //sum up weighted functions for(unsigned int i=0;i= threshold) - return color; + if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT) + return gradient(totaldensity(pos)); else - return context.get_color(pos); + return Color::blend(gradient(totaldensity(pos)),context.get_color(pos),get_amount(),get_blend_method()); } bool Metaballs::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const { // Width and Height of a pixel - const Point br(renddesc.get_br()), - tl(renddesc.get_tl()); - - const int w = renddesc.get_w(), - h = renddesc.get_h(); - - Real pw = renddesc.get_pw(); - Real ph = renddesc.get_ph(); + const Point br(renddesc.get_br()), tl(renddesc.get_tl()); + const int w(renddesc.get_w()), h(renddesc.get_h()); + const Real pw(renddesc.get_pw()), ph(renddesc.get_ph()); SuperCallback supercb(cb,0,9000,10000); - if(!context.accelerated_render(surface,quality,renddesc,&supercb)) - { - if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__)); - return false; - } - Point pos(tl[0],tl[1]); - Real dens; - if(!context.accelerated_render(surface,quality,renddesc,&supercb)) { if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__)); @@ -219,14 +241,7 @@ Metaballs::accelerated_render(Context context,Surface *surface,int quality, cons { pos[0] = tl[0]; for(int x = 0; x < w; x++, pos[0] += pw) - { - dens = totaldensity(pos); - - if(dens >= threshold) - { - (*surface)[y][x] = Color::blend(color,(*surface)[y][x],get_amount(),get_blend_method()); - } - } + (*surface)[y][x] = Color::blend(gradient(totaldensity(pos)),(*surface)[y][x],get_amount(),get_blend_method()); } // Mark our progress as finished