X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=0d889827cdf3668883a5755d0edbc6e522eda794;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=cfdb9cdf975cbeefbc312a79b0007f5ebf49fda5;hpb=bdceba8965ac43be8081b7d26c8c3ef3eff9213b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index cfdb9cd..0d88982 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>
 
@@ -251,9 +254,10 @@ Duckmatic::is_duck_group_selectable(const etl::handle<Duck>& x)const
 		 !x->get_editable()))
 		return false;
 
-	if(x->get_value_desc().parent_is_layer_param() && type & Duck::TYPE_POSITION)
+	synfigapp::ValueDesc value_desc(x->get_value_desc());
+	if(value_desc.parent_is_layer_param() && type & Duck::TYPE_POSITION)
 	{
-		Layer::Handle layer(x->get_value_desc().get_layer());
+		Layer::Handle layer(value_desc.get_layer());
 		String layer_name(layer->get_name());
 
 		if (layer_name == "outline" || layer_name == "region" || layer_name == "plant" ||
@@ -264,6 +268,30 @@ Duckmatic::is_duck_group_selectable(const etl::handle<Duck>& x)const
 		   !layer->get_param("children_lock").get(bool()))
 			return false;
 	}
+	else if (value_desc.parent_is_value_node())
+	{
+		if (ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node()))
+			return false;
+		if (value_desc.parent_is_linkable_value_node())
+		{
+			LinkableValueNode::Handle parent_value_node(value_desc.get_parent_value_node());
+			if (ValueNode_Composite::Handle::cast_dynamic(parent_value_node))
+			{
+				if (parent_value_node->get_type() == ValueBase::TYPE_BLINEPOINT &&
+					ValueNode_BLineCalcVertex::Handle::cast_dynamic(
+						parent_value_node->get_link("point")))
+					return false;
+			}
+			else if (ValueNode_BLine::Handle::cast_dynamic(parent_value_node))
+			{
+				ValueNode_Composite::Handle composite(ValueNode_Composite::Handle::cast_dynamic(
+														  value_desc.get_value_node()));
+				if (composite &&
+					ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("point")))
+					return false;
+			}
+		}
+	}
 	return true;
 }
 
@@ -279,6 +307,14 @@ Duckmatic::select_all_ducks()
 }
 
 void
+Duckmatic::unselect_all_ducks()
+{
+	DuckMap::const_iterator iter;
+	for(iter=duck_map.begin();iter!=duck_map.end();++iter)
+		unselect_duck(iter->second);
+}
+
+void
 Duckmatic::toggle_select_ducks_in_box(const synfig::Vector& tl,const synfig::Vector& br)
 {
 	Vector vmin, vmax;
@@ -363,8 +399,14 @@ Duckmatic::get_duck_list()const
 {
 	DuckList ret;
 	DuckMap::const_iterator iter;
+	for(iter=duck_map.begin();iter!=duck_map.end();++iter) if (iter->second->get_type()&Duck::TYPE_POSITION) ret.push_back(iter->second);
+	for(iter=duck_map.begin();iter!=duck_map.end();++iter) if (iter->second->get_type()&Duck::TYPE_VERTEX  ) ret.push_back(iter->second);
+	for(iter=duck_map.begin();iter!=duck_map.end();++iter) if (iter->second->get_type()&Duck::TYPE_TANGENT ) ret.push_back(iter->second);
 	for(iter=duck_map.begin();iter!=duck_map.end();++iter)
-		ret.push_back(iter->second);
+		if (!(iter->second->get_type()&Duck::TYPE_POSITION) &&
+			!(iter->second->get_type()&Duck::TYPE_VERTEX) &&
+			!(iter->second->get_type()&Duck::TYPE_TANGENT))
+			ret.push_back(iter->second);
 	return ret;
 }
 
@@ -505,21 +547,102 @@ 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);
+
+			ValueNode_BLineCalcVertex::Handle bline_vertex;
+			ValueNode_Composite::Handle composite;
+
+			if ((bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) ||
+				((composite = ValueNode_Composite::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) &&
+				 composite->get_type() == ValueBase::TYPE_BLINEPOINT &&
+				 (bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("point")))))
+			{
+				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_Composite::Handle composite;
+
+			if ((bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) ||
+				((composite = ValueNode_Composite::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) &&
+				 composite->get_type() == ValueBase::TYPE_BLINEPOINT &&
+				 (bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("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"))));
+				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;
 }
 
@@ -758,21 +881,23 @@ Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type)
 	{
 		const Duck::Handle& duck(iter->second);
 
-		if(duck->get_ignore())
+		if(duck->get_ignore() ||
+		   (duck->get_type() && !(type & duck->get_type())))
 			continue;
+
 		Real dist((duck->get_trans_point()-point).mag_squared());
 
 		if(duck->get_type()&Duck::TYPE_VERTEX)
 			dist*=1.0001;
+		else if(duck->get_type()&Duck::TYPE_TANGENT && duck->get_scalar()>0)
+			dist*=1.00005;
 		else if(duck->get_type()&Duck::TYPE_RADIUS)
 			dist*=0.9999;
 
-		if(dist<=closest && !( duck->get_type() && (!(type & duck->get_type())) ) )
+		if(dist<=closest)
 		{
-			{
-				closest=dist;
-				ret=duck;
-			}
+			closest=dist;
+			ret=duck;
 		}
 	}
 
@@ -1471,13 +1596,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 					{
 						if(!param_desc->get_origin().empty())
 						{
-								synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin());
-								add_to_ducks(value_desc_origin,canvas_view, transform_stack);
-								duck->set_origin(last_duck());
+							synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin());
+							add_to_ducks(value_desc_origin,canvas_view, transform_stack);
+							duck->set_origin(last_duck());
 /*
-								ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-								if(value.same_type_as(synfig::Point()))
-									duck->set_origin(value.get(synfig::Point()));
+							ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
+							if(value.same_type_as(synfig::Point()))
+								duck->set_origin(value.get(synfig::Point()));
 */
 						}
 					}
@@ -1600,13 +1725,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 //					add_duck(duck);
 					if(param_desc)
 					{
-								synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin());
-								add_to_ducks(value_desc_origin,canvas_view, transform_stack);
-								duck->set_origin(last_duck());
+						synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin());
+						add_to_ducks(value_desc_origin,canvas_view, transform_stack);
+						duck->set_origin(last_duck());
 /*
-								ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-								if(value.same_type_as(synfig::Point()))
-									duck->set_origin(value.get(synfig::Point()));
+						ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
+						if(value.same_type_as(synfig::Point()))
+							duck->set_origin(value.get(synfig::Point()));
 */
 //						if(!param_desc->get_origin().empty())
 //							duck->set_origin(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()).get(synfig::Point()));
@@ -1725,15 +1850,15 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 						first_duck = duck;
 					}
 
-					if(param_desc)
+					if(param_desc && !param_desc->get_origin().empty())
 					{
-								synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin());
-								add_to_ducks(value_desc_origin,canvas_view, transform_stack);
-								duck->set_origin(last_duck());
+						synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin());
+						add_to_ducks(value_desc_origin,canvas_view, transform_stack);
+						duck->set_origin(last_duck());
 /*
-								ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
-								if(value.same_type_as(synfig::Point()))
-									duck->set_origin(value.get(synfig::Point()));
+						ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()));
+						if(value.same_type_as(synfig::Point()))
+							duck->set_origin(value.get(synfig::Point()));
 */
 //						if(!param_desc->get_origin().empty())
 //							last_duck()->set_origin(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()).get(synfig::Point()));