X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fcurvegradient.cpp;h=9ae4af210be82bd182d2619e174e2edfc6268bb6;hb=65850038127c5cb49d09374b1776aa5dce11c674;hp=89b967b15e7f66b804e911d76428eb1fd23b725a;hpb=44bccb5e0f65738a88be04586da0a5f452a25fc6;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
index 89b967b..9ae4af2 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
@@ -86,7 +86,7 @@ inline float calculate_distance(const std::vector<synfig::BLinePoint>& bline)
 	//if(loop)
 	//	iter=--bline.end();
 	//else
-		iter=next++;
+	iter=next++;
 
 	for(;next!=end;iter=next++)
 	{
@@ -95,8 +95,7 @@ inline float calculate_distance(const std::vector<synfig::BLinePoint>& bline)
 			iter->get_vertex(),
 			next->get_vertex(),
 			iter->get_tangent2(),
-			next->get_tangent1()
-		);
+			next->get_tangent1());
 
 //		dist+=calculate_distance(*iter,*next);
 		dist+=curve.length();
@@ -106,7 +105,7 @@ inline float calculate_distance(const std::vector<synfig::BLinePoint>& bline)
 }
 
 std::vector<synfig::BLinePoint>::const_iterator
-find_closest(const std::vector<synfig::BLinePoint>& bline,const Point& p,bool loop=false,float *bline_dist_ret=0)
+find_closest(bool fast, const std::vector<synfig::BLinePoint>& bline,const Point& p,float& t,bool loop=false,float *bline_dist_ret=0)
 {
 	std::vector<synfig::BLinePoint>::const_iterator iter,next,ret;
 	std::vector<synfig::BLinePoint>::const_iterator end(bline.end());
@@ -119,6 +118,7 @@ find_closest(const std::vector<synfig::BLinePoint>& bline,const Point& p,bool lo
 	float best_bline_dist(0);
 	float best_bline_len(0);
 	float total_bline_dist(0);
+	float best_pos(0);
 	etl::hermite<Vector> best_curve;
 
 	if(loop)
@@ -135,8 +135,7 @@ find_closest(const std::vector<synfig::BLinePoint>& bline,const Point& p,bool lo
 			iter->get_vertex(),
 			next->get_vertex(),
 			iter->get_tangent2(),
-			next->get_tangent1()
-		);
+			next->get_tangent1());
 
 		/*
 		const float t(curve.find_closest(p,6,0.01,0.99));
@@ -151,23 +150,43 @@ find_closest(const std::vector<synfig::BLinePoint>& bline,const Point& p,bool lo
 			len=curve.length();
 		}
 
+		if (fast)
+		{
 #define POINT_CHECK(x) bp=curve(x);	thisdist=(bp-p).mag_squared(); if(thisdist<dist) { ret=iter; dist=thisdist; best_bline_dist=total_bline_dist; best_bline_len=len; best_curve=curve; }
-
-		POINT_CHECK(0.0001);
-		POINT_CHECK((1.0/6.0));
-		POINT_CHECK((2.0/6.0));
-		POINT_CHECK((3.0/6.0));
-		POINT_CHECK((4.0/6.0));
-		POINT_CHECK((5.0/6.0));
-		POINT_CHECK(0.9999);
+			POINT_CHECK(0.0001);
+			POINT_CHECK((1.0/6.0));
+			POINT_CHECK((2.0/6.0));
+			POINT_CHECK((3.0/6.0));
+			POINT_CHECK((4.0/6.0));
+			POINT_CHECK((5.0/6.0));
+			POINT_CHECK(0.9999);
+		}
+		else
+		{
+			float pos = curve.find_closest(fast, p);
+			thisdist=(curve(pos)-p).mag_squared();
+			if(thisdist<dist)
+			{
+				ret=iter;
+				dist=thisdist;
+				best_bline_dist=total_bline_dist;
+				best_bline_len=len;
+				best_curve=curve;
+				best_pos = pos;
+			}
+		}
 
 		total_bline_dist+=len;
 	}
 
+	t = best_pos;
+
 	if(bline_dist_ret)
 	{
-		*bline_dist_ret=best_bline_dist+best_curve.find_distance(0,best_curve.find_closest(p));
-//		*bline_dist_ret=best_bline_dist+best_curve.find_closest(p)*best_bline_len;
+		//! \todo is this a redundant call to find_closest()?
+		// note bline_dist_ret is null except when 'perpendicular' is true
+		*bline_dist_ret=best_bline_dist+best_curve.find_distance(0,best_curve.find_closest(fast, p));
+//		*bline_dist_ret=best_bline_dist+best_curve.find_closest(fast, p)*best_bline_len;
 	}
 
 	return ret;
@@ -188,7 +207,8 @@ CurveGradient::CurveGradient():
 	gradient(Color::black(), Color::white()),
 	loop(false),
 	zigzag(false),
-	perpendicular(false)
+	perpendicular(false),
+	fast(true)
 {
 	bline.push_back(BLinePoint());
 	bline.push_back(BLinePoint());
@@ -228,6 +248,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
 	}
 	else
 	{
+		float t;
 		Point point(point_-offset);
 
 		std::vector<synfig::BLinePoint>::const_iterator iter,next;
@@ -236,76 +257,77 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
 		// Taking into account looping.
 		if(perpendicular)
 		{
-			next=find_closest(bline,point,bline_loop,&perp_dist);
+			next=find_closest(fast,bline,point,t,bline_loop,&perp_dist);
 			perp_dist/=curve_length_;
 		}
 		else
 		{
-			next=find_closest(bline,point,bline_loop);
+			next=find_closest(fast,bline,point,t,bline_loop);
 		}
-			iter=next++;
-			if(next==bline.end()) next=bline.begin();
-
-			// Setup the curve
-			etl::hermite<Vector> curve(
-				iter->get_vertex(),
-				next->get_vertex(),
-				iter->get_tangent2(),
-				next->get_tangent1()
+
+		iter=next++;
+		if(next==bline.end()) next=bline.begin();
+
+		// Setup the curve
+		etl::hermite<Vector> curve(
+			iter->get_vertex(),
+			next->get_vertex(),
+			iter->get_tangent2(),
+			next->get_tangent1()
 			);
 
-			// Setup the derivative function
-			etl::derivative<etl::hermite<Vector> > deriv(curve);
+		// Setup the derivative function
+		etl::derivative<etl::hermite<Vector> > deriv(curve);
 
-			int search_iterations(7);
+		int search_iterations(7);
 
-			/*if(quality==0)search_iterations=8;
-			else if(quality<=2)search_iterations=10;
-			else if(quality<=4)search_iterations=8;
-			*/
-			if(!perpendicular)
-			{
-				if(quality<=6)search_iterations=7;
-				else if(quality<=7)search_iterations=6;
-				else if(quality<=8)search_iterations=5;
-				else search_iterations=4;
-			}
-			else
-			{
-				if(quality>7)
-					search_iterations=4;
-			}
+		/*if(quality==0)search_iterations=8;
+		  else if(quality<=2)search_iterations=10;
+		  else if(quality<=4)search_iterations=8;
+		*/
+		if(!perpendicular)
+		{
+			if(quality<=6)search_iterations=7;
+			else if(quality<=7)search_iterations=6;
+			else if(quality<=8)search_iterations=5;
+			else search_iterations=4;
+		}
+		else
+		{
+			if(quality>7)
+				search_iterations=4;
+		}
 
-			// Figure out the closest point on the curve
-			const float t(curve.find_closest(point,search_iterations));
+		// Figure out the closest point on the curve
+		if (fast)
+			t = curve.find_closest(fast, point,search_iterations);
 
 
-			// Calculate our values
-			p1=curve(t);
-			tangent=deriv(t).norm();
+		// Calculate our values
+		p1=curve(t);
+		tangent=deriv(t).norm();
 
-			if(perpendicular)
-			{
-				tangent*=curve_length_;
-				p1-=tangent*perp_dist;
-				tangent=-tangent.perp();
-			}
-			else
-			{
-				thickness=(next->get_width()-iter->get_width())*t+iter->get_width();
-			}
+		if(perpendicular)
+		{
+			tangent*=curve_length_;
+			p1-=tangent*perp_dist;
+			tangent=-tangent.perp();
+		}
+		else
+		{
+			thickness=(next->get_width()-iter->get_width())*t+iter->get_width();
+		}
 		//}
 	}
 
-
 	if(!perpendicular)
 	{
-			diff=tangent.perp()*thickness*width;
-			p1-=diff*0.5;
-			const Real mag(diff.inv_mag());
-			supersample=supersample*mag;
-			diff*=mag*mag;
-			dist=((point_-offset)*diff-p1*diff);
+		diff=tangent.perp()*thickness*width;
+		p1-=diff*0.5;
+		const Real mag(diff.inv_mag());
+		supersample=supersample*mag;
+		diff*=mag*mag;
+		dist=((point_-offset)*diff-p1*diff);
 	}
 	else
 	{
@@ -320,12 +342,12 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
 		}
 		else
 		{
-		diff=tangent.perp();
-		//p1-=diff*0.5;
-		const Real mag(diff.inv_mag());
-		supersample=supersample*mag;
-		diff*=mag*mag;
-		dist=((point_-offset)*diff-p1*diff);
+			diff=tangent.perp();
+			//p1-=diff*0.5;
+			const Real mag(diff.inv_mag());
+			supersample=supersample*mag;
+			diff*=mag*mag;
+			dist=((point_-offset)*diff-p1*diff);
 		}
 	}
 
@@ -388,6 +410,7 @@ CurveGradient::set_param(const String & param, const ValueBase &value)
 
 	IMPORT(offset);
 	IMPORT(perpendicular);
+	IMPORT(fast);
 
 	if(param=="bline" && value.get_type()==ValueBase::TYPE_LIST)
 	{
@@ -415,6 +438,7 @@ CurveGradient::get_param(const String & param)const
 	EXPORT(zigzag);
 	EXPORT(width);
 	EXPORT(perpendicular);
+	EXPORT(fast);
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
@@ -427,35 +451,29 @@ CurveGradient::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Composite::get_param_vocab());
 
-		ret.push_back(ParamDesc("offset")
-		.set_local_name(_("Offset"))
-	);
+	ret.push_back(ParamDesc("offset")
+				  .set_local_name(_("Offset")));
 
 	ret.push_back(ParamDesc("width")
-		.set_is_distance()
-		.set_local_name(_("Width"))
-	);
+				  .set_is_distance()
+				  .set_local_name(_("Width")));
 
 	ret.push_back(ParamDesc("bline")
-		.set_local_name(_("Vertices"))
-		.set_origin("offset")
-		.set_scalar("width")
-		.set_description(_("A list of BLine Points"))
-	);
-
+				  .set_local_name(_("Vertices"))
+				  .set_origin("offset")
+				  .set_scalar("width")
+				  .set_description(_("A list of BLine Points")));
 
 	ret.push_back(ParamDesc("gradient")
-		.set_local_name(_("Gradient"))
-	);
+				  .set_local_name(_("Gradient")));
 	ret.push_back(ParamDesc("loop")
-		.set_local_name(_("Loop"))
-	);
+				  .set_local_name(_("Loop")));
 	ret.push_back(ParamDesc("zigzag")
-		.set_local_name(_("ZigZag"))
-	);
+				  .set_local_name(_("ZigZag")));
 	ret.push_back(ParamDesc("perpendicular")
-		.set_local_name(_("Perpendicular"))
-	);
+				  .set_local_name(_("Perpendicular")));
+	ret.push_back(ParamDesc("fast")
+				  .set_local_name(_("Fast")));
 
 	return ret;
 }