X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_bline.cpp;h=fc3e9165aa20d711f580683a454ad619e733ac12;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=a5dc1def09180ed3f4ce338b5b049bdf26568ade;hpb=f444974043946c071373c9caf7e7c85f9e1f9354;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp
index a5dc1de..fc3e916 100644
--- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp
@@ -79,7 +79,12 @@ radial_interpolation(const Vector& a, const Vector& b, float c)
 	affine_combo<Angle,float> ang_combo;
 
 	Real mag(mag_combo(a.mag(),b.mag(),c));
-	Angle ang(ang_combo(Angle::tan(a[1],a[0]),Angle::tan(b[1],b[0]),c));
+	Angle angle_a(Angle::tan(a[1],a[0]));
+	Angle angle_b(Angle::tan(b[1],b[0]));
+	float diff = Angle::deg(angle_b - angle_a).get();
+	if (diff < -180) angle_b += Angle::deg(360);
+	else if (diff > 180) angle_a += Angle::deg(360);
+	Angle ang(ang_combo(angle_a, angle_b, c));
 
 	return Point( mag*Angle::cos(ang).get(),mag*Angle::sin(ang).get() );
 }
@@ -272,7 +277,7 @@ synfig::find_closest_point(const ValueBase &bline, const Point &pos, Real &radiu
 		Real amount = (best_index + best_time + loop_adjust) / (size + loop_adjust);
 		return amount;
 	}
-	
+
 	return 0.0;
 
 }
@@ -440,9 +445,14 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin)
 	return ret;
 }
 
+static int instance_count;
+
 ValueBase
 ValueNode_BLine::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	std::vector<BLinePoint> ret_list;
 
 	std::vector<ListEntry>::const_iterator iter,first_iter;
@@ -809,35 +819,6 @@ ValueNode_BLine::link_local_name(int i)const
 	return etl::strprintf(_("Vertex %03d"),i+1);
 }
 
-ValueNode*
-ValueNode_BLine::clone(const GUID& deriv_guid)const
-{
-	{ ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; }
-
-	ValueNode_BLine* ret=new ValueNode_BLine();
-	ret->set_guid(get_guid()^deriv_guid);
-
-	std::vector<ListEntry>::const_iterator iter;
-
-	for(iter=list.begin();iter!=list.end();++iter)
-	{
-		if(iter->value_node->is_exported())
-			ret->add(*iter);
-		else
-		{
-			ListEntry list_entry(*iter);
-			//list_entry.value_node=find_value_node(iter->value_node->get_guid()^deriv_guid).get();
-			//if(!list_entry.value_node)
-				list_entry.value_node=iter->value_node->clone(deriv_guid);
-			ret->add(list_entry);
-			//ret->list.back().value_node=iter->value_node.clone();
-		}
-	}
-	ret->set_loop(get_loop());
-
-	return ret;
-}
-
 String
 ValueNode_BLine::get_name()const
 {
@@ -853,8 +834,7 @@ ValueNode_BLine::get_local_name()const
 LinkableValueNode*
 ValueNode_BLine::create_new()const
 {
-	assert(0);
-	return 0;
+	return new ValueNode_BLine();
 }
 
 bool