X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=ccedcae544775866c2d56fc213cd74cc3b40f679;hb=282b5162f219e2114a59a00743180b45c238680f;hp=15ee0c9b5b529de791be039bfd2e2bf4341bead8;hpb=41063fc828642a7ae12aeb50694f1cd4580eb467;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index 15ee0c9..ccedcae 100644
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -980,13 +980,13 @@ inline String guid_string(const synfigapp::ValueDesc& x)
 		return strprintf("%s",x.get_value_node()->get_guid().get_string().c_str());
 }
 
-inline GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::TransformStack& transform_stack)
+inline synfig::GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::TransformStack& transform_stack)
 {
-	GUID ret(0);
+	synfig::GUID ret(0);
 
 	if(x.parent_is_layer_param())
 	{
-		ret=x.get_layer()->get_guid()^GUID::hasher(x.get_param_name());
+		ret=x.get_layer()->get_guid()^synfig::GUID::hasher(x.get_param_name());
 	}
 	else
 	{
@@ -1001,7 +1001,7 @@ inline GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::Transform
 Duck::Handle
 Duckmatic::create_duck_from(const synfigapp::ValueDesc& value_desc,etl::handle<CanvasView> canvas_view, const synfig::TransformStack& transform_stack, int modifier, synfig::ParamDesc *param_desc)
 {
-	GUID duck_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(modifier));
+	synfig::GUID duck_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(modifier));
 	etl::handle<Duck> duck=new Duck();
 
 	return duck;
@@ -1070,7 +1070,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 						0.0f),
 					value_desc));
 
-			duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
+			duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
 
 			add_duck(duck);
 
@@ -1139,7 +1139,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 							&studio::CanvasView::popup_param_menu),
 						0.0f),
 					value_desc));
-			duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
+			duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
 
 			add_duck(duck);
 
@@ -1176,9 +1176,9 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 				{
 					synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_connect());
 					Duck::Handle connect_duck;
-					if(duck_map.find(calc_duck_guid(value_desc_origin,transform_stack)^GUID::hasher(0))!=duck_map.end())
+					if(duck_map.find(calc_duck_guid(value_desc_origin,transform_stack)^synfig::GUID::hasher(0))!=duck_map.end())
 					{
-						connect_duck=duck_map[calc_duck_guid(value_desc_origin,transform_stack)^GUID::hasher(0)];
+						connect_duck=duck_map[calc_duck_guid(value_desc_origin,transform_stack)^synfig::GUID::hasher(0)];
 					}
 					else
 					{
@@ -1230,7 +1230,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 							&studio::CanvasView::popup_param_menu),
 						1.0f),
 					value_desc));
-			duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
+			duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
 			add_duck(duck);
 
 			return true;
@@ -1474,7 +1474,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 */
 						}
 					}
-					duck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".v"));
+					duck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^synfig::GUID::hasher(".v"));
 					duck=add_similar_duck(duck);
 //					add_duck(duck);
 				}
@@ -1528,7 +1528,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 						tduck->set_editable(false);
 						tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".t1");
 //						tduck->set_name(strprintf("%x-tangent1",value_node->get_link(i).get()));
-						tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".t1"));
+						tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^synfig::GUID::hasher(".t1"));
 						tduck=add_similar_duck(tduck);
 //						add_duck(duck);
 					}
@@ -1585,7 +1585,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 
 					tduck->set_transform_stack(transform_stack);
 					tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".t2");
-					tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".t2"));
+					tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^synfig::GUID::hasher(".t2"));
 					tduck->set_editable(false);
 					tduck=add_similar_duck(tduck);
 //					add_duck(duck);
@@ -1650,7 +1650,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 					tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,first))+".t1");
 					//tduck->set_name(strprintf("%x-tangent1",value_node->get_link(first).get()));
 					tduck=add_similar_duck(tduck);
-					tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,first),transform_stack)^GUID::hasher(".t1"));
+					tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,first),transform_stack)^synfig::GUID::hasher(".t1"));
 					//add_duck(duck);
 				}
 
@@ -1695,13 +1695,22 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 			if(value_node->get_contained_type()==ValueBase::TYPE_VECTOR)
 			{
 				Bezier bezier;
+				etl::handle<Duck> first_duck, duck;
+				int first = -1;
 				for(i=0;i<value_node->link_count();i++)
 				{
 					if(!value_node->list[i].status_at_time(get_time()))
 						continue;
 					if(!add_to_ducks(synfigapp::ValueDesc(value_node,i),canvas_view,transform_stack))
 						return false;
-					etl::handle<Duck> duck(last_duck());
+					duck = last_duck();
+
+					// remember the index of the first vertex we didn't skip
+					if (first == -1)
+					{
+						first = i;
+						first_duck = duck;
+					}
 
 					if(param_desc)
 					{
@@ -1720,7 +1729,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 					bezier.p1=bezier.p2;bezier.c1=bezier.c2;
 					bezier.p2=bezier.c2=duck;
 
-					if(i>0)
+					if (first != i)
 					{
 						handle<Bezier> bezier_(new Bezier());
 						bezier_->p1=bezier.p1;
@@ -1736,6 +1745,27 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle<Canva
 								synfigapp::ValueDesc(value_node,i)));
 					}
 				}
+
+				if (value_node->get_loop() && first != -1 && first_duck != duck)
+				{
+					duck = first_duck;
+
+					bezier.p1=bezier.p2;bezier.c1=bezier.c2;
+					bezier.p2=bezier.c2=duck;
+
+					handle<Bezier> bezier_(new Bezier());
+					bezier_->p1=bezier.p1;
+					bezier_->c1=bezier.c1;
+					bezier_->p2=bezier.p2;
+					bezier_->c2=bezier.c2;
+					add_bezier(bezier_);
+					last_bezier()->signal_user_click(2).connect(
+						sigc::bind(
+							sigc::mem_fun(
+								*canvas_view,
+								&studio::CanvasView::popup_param_menu_bezier),
+							synfigapp::ValueDesc(value_node,first)));
+				}
 			}
 			/*else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT)
 			{