X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=817a79c9484db9bdcc57a6aea05b7551c2aed1f4;hb=21124aa83bc2cd89dbdfc95838010571c937ad19;hp=a477fed43ac228ddf329c68c6ee39b765be4fd90;hpb=9ac68847d4da5e243b7a3da57f48604ad4f6a50d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index a477fed..817a79c 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -44,6 +44,9 @@ #include #include #include +#include +#include +#include #include @@ -108,18 +111,6 @@ Duckmatic::~Duckmatic() } void -Duckmatic::set_flip_x(bool flip_x) -{ - flip_x_ = flip_x; -} - -void -Duckmatic::set_flip_y(bool flip_y) -{ - flip_y_ = flip_y; -} - -void Duckmatic::clear_ducks() { duck_data_share_map.clear(); @@ -286,6 +277,8 @@ Duckmatic::select_all_ducks() for(iter=duck_map.begin();iter!=duck_map.end();++iter) if(is_duck_group_selectable(iter->second)) select_duck(iter->second); + else + unselect_duck(iter->second); } void @@ -515,21 +508,114 @@ 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(*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(*iter); + if ((duck->get_type() == Duck::TYPE_VERTEX || duck->get_type() == Duck::TYPE_POSITION) && + duck->get_value_desc().parent_is_value_node()) + { + ValueNode_BLineCalcVertex::Handle bline_vertex(ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node())); + if (bline_vertex) + { + ValueNode_Composite::Handle value_node_composite(ValueNode_Composite::Handle::cast_dynamic(duck->get_value_desc().get_parent_value_node())); + if (value_node_composite && + value_node_composite->get_type() == ValueBase::TYPE_BLINEPOINT) + { + int t1_index(value_node_composite->get_link_index_from_name("t1")); + int t2_index(value_node_composite->get_link_index_from_name("t2")); + int width_index(value_node_composite->get_link_index_from_name("width")); + + ValueNode::Handle t1_value_node(value_node_composite->get_link(t1_index)); + ValueNode::Handle t2_value_node(value_node_composite->get_link(t2_index)); + ValueNode::Handle width_value_node(value_node_composite->get_link(width_index)); + + ValueNode_BLineCalcTangent::Handle bline_tangent_1(ValueNode_BLineCalcTangent::Handle::cast_dynamic(t1_value_node)); + ValueNode_BLineCalcTangent::Handle bline_tangent_2(ValueNode_BLineCalcTangent::Handle::cast_dynamic(t2_value_node)); + ValueNode_BLineCalcWidth::Handle bline_width(ValueNode_BLineCalcWidth::Handle::cast_dynamic(width_value_node)); + + // these 3 are all the same at the moment, but let's play it safe, just in case it changes + int tangent_amount_index(bline_tangent_1->get_link_index_from_name("amount")); + int vertex_amount_index(bline_vertex->get_link_index_from_name("amount")); + int width_amount_index(bline_width->get_link_index_from_name("amount")); + + ValueNode::Handle amount_value_node(bline_vertex->get_link(vertex_amount_index)); + + if (bline_tangent_1 || bline_tangent_2 || bline_width) + { + 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()); + + // we need to update the position of the tangent ducks - but how do we find these ducks? + // this is a brute force search - but is there a better way to do it? + if (bline_tangent_1 && + bline_tangent_1->get_link(tangent_amount_index) == amount_value_node) + { + Vector tangent = (*bline_tangent_1)(time, amount).get(Vector()); + DuckList::iterator iter; + for (iter=duck_list.begin(); iter!=duck_list.end(); iter++) + if ((*iter)->get_value_desc().get_value_node() == t1_value_node) + (*iter)->set_point(tangent); + } + + if (bline_tangent_2 && + bline_tangent_2->get_link(tangent_amount_index) == amount_value_node) + { + Vector tangent = (*bline_tangent_2)(time, amount).get(Vector()); + DuckList::iterator iter; + for (iter=duck_list.begin(); iter!=duck_list.end(); iter++) + if ((*iter)->get_value_desc().get_value_node() == t2_value_node) + (*iter)->set_point(tangent); + } + + if (bline_width && + bline_width->get_link(width_amount_index) == amount_value_node) + { + Real width = (*bline_width)(time, amount).get(Real()); + DuckList::iterator iter; + for (iter=duck_list.begin(); iter!=duck_list.end(); iter++) + if ((*iter)->get_value_desc().get_value_node() == width_value_node) + (*iter)->set_point(Point(width, 0)); + } + } + } + } + } } + last_translate_=vect; } @@ -562,12 +648,12 @@ Duckmatic::signal_edited_selected_ducks() Point point((*iter)->get_point()); bool changed = false; - if (point[0] * (flip_x_ ? -1 : 1) < 0) + if (point[0] < 0) { point[0] = 0; changed = true; } - if (point[1] * (flip_y_ ? -1 : 1) < 0) + if (point[1] < 0) { point[1] = 0; changed = true; @@ -990,13 +1076,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 { @@ -1011,7 +1097,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 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=new Duck(); return duck; @@ -1034,8 +1120,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_radius(true); duck->set_type(Duck::TYPE_RADIUS); - // put the duck on the right hand side of the center, whether the display is flipped or not - duck->set_point(Point(value_desc.get_value(get_time()).get(Real()) * (flip_x_ ? -1 : 1), 0)); + // put the duck on the right hand side of the center + duck->set_point(Point(value_desc.get_value(get_time()).get(Real()), 0)); duck->set_name(guid_string(value_desc)); if(value_desc.is_value_node()) { @@ -1074,13 +1160,15 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 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); @@ -1144,12 +1232,14 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 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); @@ -1186,9 +1276,9 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_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 { @@ -1235,18 +1325,20 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 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; } break; -/* case ValueBase::TYPE_SEGMENT: + case ValueBase::TYPE_SEGMENT: { etl::handle bezier(new Bezier()); ValueNode_Composite::Handle value_node; @@ -1301,12 +1393,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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); @@ -1317,12 +1409,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlep1=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); @@ -1338,7 +1430,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 1.0f), synfigapp::ValueDesc(value_node,i))); - duck->set_value_desc(synfigapp::ValueDesc(value_node,i)); if(param_desc) { @@ -1484,7 +1576,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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); } @@ -1538,7 +1630,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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); } @@ -1561,12 +1653,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 1.0f), synfigapp::ValueDesc(value_node,i))); - duck->set_value_desc(synfigapp::ValueDesc(value_node,i)); add_bezier(bezier); bezier=0; @@ -1595,7 +1688,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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); @@ -1616,12 +1709,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 1.0f), - synfigapp::ValueDesc(value_node,0))); - duck->set_value_desc(synfigapp::ValueDesc(value_node,0)); + synfigapp::ValueDesc(value_node,i))); } @@ -1660,7 +1754,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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); } @@ -1682,12 +1776,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu), + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu), + false), 1.0f), synfigapp::ValueDesc(value_node,first))); - duck->set_value_desc(synfigapp::ValueDesc(value_node,first)); add_bezier(bezier); bezier=0; @@ -1705,13 +1800,22 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_contained_type()==ValueBase::TYPE_VECTOR) { Bezier bezier; + etl::handle first_duck, duck; + int first = -1; for(i=0;ilink_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(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) { @@ -1730,7 +1834,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle0) + if (first != i) { handle bezier_(new Bezier()); bezier_->p1=bezier.p1; @@ -1746,8 +1850,29 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_loop() && first != -1 && first_duck != duck) + { + duck = first_duck; + + bezier.p1=bezier.p2;bezier.c1=bezier.c2; + bezier.p2=bezier.c2=duck; + + handle 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) + else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT) { for(i=0;ilink_count();i++) { @@ -1757,7 +1882,6 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle