X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fexample%2Fmetaballs.cpp;h=a1bf71efea40c0aeddb98c9e798ef86e80a8760a;hb=922e067f6e961d24c9fcad4fbc9527d7642472fa;hp=f30357c91bec922d71049a741cf47c087b637ae0;hpb=e3f4437fedbdd74aebbf1675723978853dac8a8b;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/example/metaballs.cpp b/synfig-core/trunk/src/modules/example/metaballs.cpp
index f30357c..a1bf71e 100644
--- a/synfig-core/trunk/src/modules/example/metaballs.cpp
+++ b/synfig-core/trunk/src/modules/example/metaballs.cpp
@@ -166,9 +166,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 +174,8 @@ 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)
+		return Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
 	else
 		return context.get_color(pos);
 }
@@ -188,27 +184,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);
 
-	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 +202,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