From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Mon, 9 Apr 2007 15:55:12 +0000 (+0000)
Subject: Fix 1695755: Ignore adjacent points if they are in exactly the same place.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=4879764879bcf7b63bf56eb170fbf73d11a15093;p=synfig.git

Fix 1695755: Ignore adjacent points if they are in exactly the same place.

Fix 1692825: Render all cusps, even the first one.  Only display a cusp if tangents are split.  This gives the user per-vertex control over the rendering of cusps.

Fix bug: The beginning isn't rounded if the first point has a zero tangent

Fix bug: Strange artifacts sometimes appear at the verticies of outlines.

Fix bug: Rounded ends were missing a point.  This doesn't show up with the default 50 points per rounded end, but reducing it to 5 or so shows up the problem.


git-svn-id: http://svn.voria.com/code@446 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp
index 3fa59ee..597fe82 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp
@@ -194,9 +194,24 @@ Outline::sync()
 	else
 		iter=next++;
 
+	// 				iter	next
+	//				----	----
+	// looped		nth		1st
+	// !looped		1st		2nd
+
+	Vector first_tangent=bline.front().get_tangent2();
 	Vector last_tangent=iter->get_tangent1();
 
-	for(bool first=!loop;next!=end;iter=next++,first=false)
+	// if we are looped and drawing sharp cusps, we'll need a value for the incoming tangent
+	if (loop && sharp_cusps && last_tangent.is_equal_to(Vector::zero()))
+	{
+		hermite<Vector> curve((iter-1)->get_vertex(), iter->get_vertex(), (iter-1)->get_tangent2(), iter->get_tangent1());
+		const derivative< hermite<Vector> > deriv(curve);
+		last_tangent=deriv(1.0-CUSP_TANGENT_ADJUST);
+	}
+
+	// `first' is for making the cusps; don't do that for the first point if we're not looped
+	for(bool first=!loop; next!=end; iter=next++)
 	{
 		Vector prev_t(iter->get_tangent1());
 		Vector iter_t(iter->get_tangent2());
@@ -204,10 +219,16 @@ Outline::sync()
 
 		bool split_flag(iter->get_split_tangent_flag());
 
+		// if iter.t2 == 0 and next.t1 == 0, this is a straight line
 		if(iter_t.is_equal_to(Vector::zero()) && next_t.is_equal_to(Vector::zero()))
 		{
 			iter_t=next_t=next->get_vertex()-iter->get_vertex();
-			split_flag=true;
+			// split_flag=true;
+
+			// if the two points are on top of each other, ignore this segment
+			// leave `first' true if was before
+			if (iter_t.is_equal_to(Vector::zero()))
+				continue;
 		}
 
 		// Setup the curve
@@ -224,6 +245,9 @@ Outline::sync()
 
 		const derivative< hermite<Vector> > deriv(curve);
 
+		if (first)
+			first_tangent = deriv(CUSP_TANGENT_ADJUST);
+
 		// Make cusps as necessary
 		if(!first && sharp_cusps && split_flag && (!prev_t.is_equal_to(iter_t) || iter_t.is_equal_to(Vector::zero())) && !last_tangent.is_equal_to(Vector::zero()))
 		{
@@ -268,7 +292,7 @@ Outline::sync()
 			const float length(curve.length());
 			float dist(0);
 			Point lastpoint;
-			for(float n=0.0f;n<1.0f;n+=1.0f/SAMPLES)
+			for(float n=0.0f;n<0.999999f;n+=1.0f/SAMPLES)
 			{
 				const Vector d(deriv(n>CUSP_TANGENT_ADJUST?n:CUSP_TANGENT_ADJUST).perp().norm());
 				const Vector p(curve(n));
@@ -285,7 +309,7 @@ Outline::sync()
 			}
 		}
 		else
-			for(float n=0.0f;n<1.0f;n+=1.0f/SAMPLES)
+			for(float n=0.0f;n<0.999999f;n+=1.0f/SAMPLES)
 			{
 				const Vector d(deriv(n>CUSP_TANGENT_ADJUST?n:CUSP_TANGENT_ADJUST).perp().norm());
 				const Vector p(curve(n));
@@ -297,6 +321,8 @@ Outline::sync()
 		last_tangent=deriv(1.0-CUSP_TANGENT_ADJUST);
 		side_a.push_back(curve(1.0)+last_tangent.perp().norm()*next_w);
 		side_b.push_back(curve(1.0)-last_tangent.perp().norm()*next_w);
+
+		first=false;
 	}
 
 	if(loop)
@@ -324,11 +350,8 @@ Outline::sync()
 			-tangent*w*ROUND_END_FACTOR
 		);
 
-		for(float n=0.0f;n<1.0f;n+=1.0f/SAMPLES)
+		for(float n=0.0f;n<0.999999f;n+=1.0f/SAMPLES)
 			side_a.push_back(curve(n));
-
-		// remove the last point
-		side_a.pop_back();
 	}
 
 	for(;!side_b.empty();side_b.pop_back())
@@ -341,7 +364,7 @@ Outline::sync()
 		side_a.pop_back();
 
 		const Point vertex(bline.front().get_vertex());
-		const Vector tangent(bline.front().get_tangent2().norm());
+		const Vector tangent(first_tangent.norm());
 		const float w((bline.front().get_width()*width)*0.5f+expand);
 
 		hermite<Vector> curve(
@@ -351,11 +374,8 @@ Outline::sync()
 			tangent*w*ROUND_END_FACTOR
 		);
 
-		for(float n=0.0f;n<1.0f;n+=1.0f/SAMPLES)
+		for(float n=0.0f;n<0.999999f;n+=1.0f/SAMPLES)
 			side_a.push_back(curve(n));
-
-		// remove the last point
-		side_a.pop_back();
 	}
 
 	add_polygon(side_a);