Shortcut color blending in get_color() when blend method is 'straight' and amount...

[synfig.git] / synfig-core / trunk / src / modules / example / metaballs.cpp

diff --git a/synfig-core/trunk/src/modules/example/metaballs.cpp b/synfig-core/trunk/src/modules/example/metaballs.cpp
index 6d9f959..b365ea5 100644 (file)
--- a/synfig-core/trunk/src/modules/example/metaballs.cpp
+++ b/synfig-core/trunk/src/modules/example/metaballs.cpp
@@ -54,7 +54,7 @@ using namespace synfig;
 SYNFIG_LAYER_INIT(Metaballs);
 SYNFIG_LAYER_SET_NAME(Metaballs,"metaballs");
 SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,N_("Metaballs"));
-SYNFIG_LAYER_SET_CATEGORY(Metaballs,N_("Default"));
+SYNFIG_LAYER_SET_CATEGORY(Metaballs,N_("Example"));
 SYNFIG_LAYER_SET_VERSION(Metaballs,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id$");
 
@@ -68,6 +68,9 @@ Metaballs::Metaballs():
        Layer_Composite(1.0,Color::BLEND_STRAIGHT),
        color(Color::black())
 {
+       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
@@ -166,9 +169,7 @@ Metaballs::totaldensity(const Point &pos) const
 
        //sum up weighted functions
        for(unsigned int i=0;i<centers.size();i++)
-       {
                density += weights[i] * densityfunc(pos,centers[i], radii[i]);
-       }
 
        return density;
 }
@@ -176,10 +177,13 @@ Metaballs::totaldensity(const Point &pos) const
 Color
 Metaballs::get_color(Context context, const Point &pos)const
 {
-       Real dens = totaldensity(pos);
-
-       if(dens >= threshold)
-               return color;
+       if (totaldensity(pos) >= threshold)
+       {
+               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());
+       }
        else
                return context.get_color(pos);
 }
@@ -188,21 +192,14 @@ 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);
 
        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__));
@@ -213,14 +210,8 @@ 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)
-                       {
+                       if (totaldensity(pos) >= threshold)
                                (*surface)[y][x] = Color::blend(color,(*surface)[y][x],get_amount(),get_blend_method());
-                       }
-               }
        }
 
        // Mark our progress as finished