Replace the 'Threshold' parameter with 'Gradient Left' and 'Gradient Right' which...

[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 a582dc1..6437a42 100644 (file)
--- a/synfig-core/trunk/src/modules/example/metaballs.cpp
+++ b/synfig-core/trunk/src/modules/example/metaballs.cpp
@@ -66,7 +66,9 @@ 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)
 {
        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);
@@ -94,8 +96,9 @@ Metaballs::set_param(const String & param, const ValueBase &value)
                return true;
        }
 
-       IMPORT(color);
+       IMPORT(gradient);
        IMPORT(threshold);
+       IMPORT(threshold2);
 
        return Layer_Composite::set_param(param,value);
 }
@@ -103,12 +106,13 @@ Metaballs::set_param(const String & param, const ValueBase &value)
 ValueBase
 Metaballs::get_param(const String &param)const
 {
-       EXPORT(color);
+       EXPORT(gradient);
 
        EXPORT(radii);
        EXPORT(weights);
        EXPORT(centers);
        EXPORT(threshold);
+       EXPORT(threshold2);
 
        EXPORT_NAME();
        EXPORT_VERSION();
@@ -121,8 +125,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")
@@ -138,7 +142,11 @@ 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"))
        );
 
        return ret;
@@ -171,16 +179,16 @@ Metaballs::totaldensity(const Point &pos) const
        for(unsigned int i=0;i<centers.size();i++)
                density += weights[i] * densityfunc(pos,centers[i], radii[i]);
 
-       return density;
+       return (density - threshold) / (threshold2 - threshold);
 }
 
 Color
 Metaballs::get_color(Context context, const Point &pos)const
 {
-       if (totaldensity(pos) >= threshold)
-               return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+       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
@@ -205,8 +213,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)
-                       if (totaldensity(pos) >= 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