projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
6d9f959
..
6437a42
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_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$");
SYNFIG_LAYER_SET_VERSION(Metaballs,"0.1");
SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id$");
@@
-66,8
+66,13
@@
SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id$");
Metaballs::Metaballs():
Layer_Composite(1.0,Color::BLEND_STRAIGHT),
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);
+ centers.push_back(Point( 2, 1)); radii.push_back(2.5); weights.push_back(1);
}
bool
}
bool
@@
-91,8
+96,9
@@
Metaballs::set_param(const String & param, const ValueBase &value)
return true;
}
return true;
}
- IMPORT(
color
);
+ IMPORT(
gradient
);
IMPORT(threshold);
IMPORT(threshold);
+ IMPORT(threshold2);
return Layer_Composite::set_param(param,value);
}
return Layer_Composite::set_param(param,value);
}
@@
-100,12
+106,13
@@
Metaballs::set_param(const String & param, const ValueBase &value)
ValueBase
Metaballs::get_param(const String ¶m)const
{
ValueBase
Metaballs::get_param(const String ¶m)const
{
- EXPORT(
color
);
+ EXPORT(
gradient
);
EXPORT(radii);
EXPORT(weights);
EXPORT(centers);
EXPORT(threshold);
EXPORT(radii);
EXPORT(weights);
EXPORT(centers);
EXPORT(threshold);
+ EXPORT(threshold2);
EXPORT_NAME();
EXPORT_VERSION();
EXPORT_NAME();
EXPORT_VERSION();
@@
-118,8
+125,8
@@
Metaballs::get_param_vocab()const
{
Layer::Vocab ret(Layer_Composite::get_param_vocab());
{
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")
);
ret.push_back(ParamDesc("centers")
@@
-135,7
+142,11
@@
Metaballs::get_param_vocab()const
);
ret.push_back(ParamDesc("threshold")
);
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;
);
return ret;
@@
-166,43
+177,32
@@
Metaballs::totaldensity(const Point &pos) const
//sum up weighted functions
for(unsigned int i=0;i<centers.size();i++)
//sum up weighted functions
for(unsigned int i=0;i<centers.size();i++)
- {
density += weights[i] * densityfunc(pos,centers[i], radii[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
{
}
Color
Metaballs::get_color(Context context, const Point &pos)const
{
- Real dens = totaldensity(pos);
-
- if(dens >= threshold)
- return color;
+ if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
+ return gradient(totaldensity(pos));
else
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
}
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]);
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__));
if(!context.accelerated_render(surface,quality,renddesc,&supercb))
{
if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__));
@@
-213,14
+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)
{
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
}
// Mark our progress as finished