X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=ec99b8f1424ab248fddfa87d275fb5f1f46dff95;hb=9e5f3fdabe900f176be3dc4fc42595836ec53068;hp=b89ff83846edacc84279ec87f3ba0a338c868caf;hpb=4c343e415bc02343d7b65322240fe758a1d992e4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index b89ff83..ec99b8f 100644
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -44,6 +44,9 @@
 #include <synfig/valuenode_composite.h>
 #include <synfig/valuenode_scale.h>
 #include <synfig/valuenode_bline.h>
+#include <synfig/valuenode_blinecalctangent.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_blinecalcwidth.h>
 
 #include <synfig/curve_helper.h>
 
@@ -505,21 +508,91 @@ DuckDrag_Translate::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector
 
 	synfig::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_);
 	int i;
+	Time time(duckmatic->get_time());
 
-	for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
+	// drag the vertex and position ducks first
+	for (i=0,iter=selected_ducks.begin(); iter!=selected_ducks.end(); ++iter,i++)
 	{
-		if((*iter)->get_type()!=Duck::TYPE_VERTEX &&
-		   (*iter)->get_type()!=Duck::TYPE_POSITION)
-			continue;
-		(*iter)->set_trans_point(positions[i]+vect);
+		etl::handle<Duck> duck(*iter);
+		if(duck->get_type() == Duck::TYPE_VERTEX || duck->get_type() == Duck::TYPE_POSITION)
+		{
+			duck->set_trans_point(positions[i]+vect);
+
+			if (ValueNode_BLineCalcVertex::Handle bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node()))
+			{
+				synfig::Point closest_point = duck->get_point();
+				synfig::Real radius = 0.0;
+				ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")));
+				synfig::find_closest_point(
+					(*bline)(time),
+					duck->get_point(),
+					radius,
+					bline->get_loop(),
+					&closest_point);
+				duck->set_point(closest_point);
+			}
+		}
 	}
-	for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
+
+	// then drag the others
+	for (i=0,iter=selected_ducks.begin(); iter!=selected_ducks.end(); ++iter,i++)
+		if ((*iter)->get_type() != Duck::TYPE_VERTEX && (*iter)->get_type() != Duck::TYPE_POSITION)
+			(*iter)->set_trans_point(positions[i]+vect);
+
+	// then patch up the tangents for the vertices we've moved
+	DuckList duck_list(duckmatic->get_duck_list());
+	for (iter=selected_ducks.begin(); iter!=selected_ducks.end(); ++iter)
 	{
-		if((*iter)->get_type()==Duck::TYPE_VERTEX ||
-		   (*iter)->get_type()==Duck::TYPE_POSITION)
-			continue;
-		(*iter)->set_trans_point(positions[i]+vect);
+		etl::handle<Duck> duck(*iter);
+		if (duck->get_type() == Duck::TYPE_VERTEX || duck->get_type() == Duck::TYPE_POSITION)
+		{
+			ValueNode_BLineCalcVertex::Handle bline_vertex(ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node()));
+			if (bline_vertex)
+			{
+				synfig::Real radius = 0.0;
+				ValueNode_BLine::Handle bline(ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline"))));
+				Real amount = synfig::find_closest_point((*bline)(time), duck->get_point(), radius, bline->get_loop());
+
+				int vertex_amount_index(bline_vertex->get_link_index_from_name("amount"));
+				ValueNode::Handle vertex_amount_value_node(bline_vertex->get_link(vertex_amount_index));
+
+				DuckList::iterator iter;
+				for (iter=duck_list.begin(); iter!=duck_list.end(); iter++)
+				{
+					ValueNode::Handle duck_value_node((*iter)->get_value_desc().get_value_node());
+					if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(duck_value_node))
+					{
+						if (bline_tangent->get_link(bline_tangent->get_link_index_from_name("amount")) == vertex_amount_value_node)
+						{
+							switch (bline_tangent->get_type())
+							{
+							case ValueBase::TYPE_ANGLE:
+							{
+								Angle angle((*bline_tangent)(time, amount).get(Angle()));
+								(*iter)->set_point(Point(Angle::cos(angle).get(), Angle::sin(angle).get()));
+								break;
+							}
+							case ValueBase::TYPE_REAL:
+								(*iter)->set_point(Point((*bline_tangent)(time, amount).get(Real()), 0));
+								break;
+							case ValueBase::TYPE_VECTOR:
+								(*iter)->set_point((*bline_tangent)(time, amount).get(Vector()));
+								break;
+							default:
+								break;
+							}
+						}
+					}
+					else if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(duck_value_node))
+					{
+						if (bline_width->get_link(bline_width->get_link_index_from_name("amount")) == vertex_amount_value_node)
+							(*iter)->set_point(Point((*bline_width)(time, amount).get(Real()), 0));
+					}
+				}
+			}
+		}
 	}
+
 	last_translate_=vect;
 }
 
@@ -1242,7 +1315,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 			return true;
 		}
 		break;
-/*	case ValueBase::TYPE_SEGMENT:
+	case ValueBase::TYPE_SEGMENT:
 		{
 			etl::handle<Bezier> bezier(new Bezier());
 			ValueNode_Composite::Handle value_node;
@@ -1297,12 +1370,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 					name=guid_string(value_desc);
 				}
 
-				duck_p=new class Duck(segment.p1);
+				duck_p=new Duck(segment.p1);
 				duck_p->set_name(name+".P1");
 				duck_p->set_type(Duck::TYPE_VERTEX);
 				add_duck(duck_p);
 
-				duck_c=new class Duck(segment.t1);
+				duck_c=new Duck(segment.t1);
 				duck_c->set_name(name+".T1");
 				duck_c->set_type(Duck::TYPE_TANGENT);
 				add_duck(duck_c);
@@ -1313,12 +1386,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 				bezier->p1=duck_p;
 				bezier->c1=duck_c;
 
-				duck_p=new class Duck(segment.p2);
+				duck_p=new Duck(segment.p2);
 				duck_p->set_name(name+".P2");
 				duck_p->set_type(Duck::TYPE_VERTEX);
 				add_duck(duck_p);
 
-				duck_c=new class Duck(segment.t2);
+				duck_c=new Duck(segment.t2);
 				duck_c->set_type(Duck::TYPE_TANGENT);
 				duck_c->set_name(name+".T2");
 				add_duck(duck_c);
@@ -1334,7 +1407,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 			return true;
 		}
 		break;
-*/
 	case ValueBase::TYPE_BLINEPOINT:
 	{
 
@@ -1436,7 +1508,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 										false),
 									1.0f),
 								synfigapp::ValueDesc(value_node,i)));
-						duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
 
 						if(param_desc)
 						{
@@ -1566,7 +1637,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 									false),
 								1.0f),
 							synfigapp::ValueDesc(value_node,i)));
-					duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
 
 					add_bezier(bezier);
 					bezier=0;
@@ -1623,7 +1693,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 									false),
 								1.0f),
 							synfigapp::ValueDesc(value_node,i)));
-					duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
 
 				}
 
@@ -1691,7 +1760,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 								false),
 							1.0f),
 						synfigapp::ValueDesc(value_node,first)));
-				duck->set_value_desc(synfigapp::ValueDesc(value_node,first));
 
 				add_bezier(bezier);
 				bezier=0;
@@ -1781,7 +1849,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 							synfigapp::ValueDesc(value_node,first)));
 				}
 			}
-			/*else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT)
+			else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT)
 			{
 				for(i=0;i<value_node->link_count();i++)
 				{
@@ -1791,7 +1859,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 						return false;
 				}
 			}
-			*/
 			else
 				return false;
 		}