X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=4169503146f0c5aa1485d273a0353a35e22b1f5e;hb=1f453e8ab546a357781372fe98aa1d004387d4b1;hp=5b46ddaa97f7be51375cc035462ffde9d897ef62;hpb=2a35e3479c23f8045bbf46d6354ff2e2c02be35d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 5b46dda..4169503 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 @@ -251,9 +254,10 @@ Duckmatic::is_duck_group_selectable(const etl::handle& 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& 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; @@ -505,17 +541,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()); // 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) - (*iter)->set_trans_point(positions[i]+vect); + for (i=0,iter=selected_ducks.begin(); iter!=selected_ducks.end(); ++iter,i++) + { + etl::handle 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); + } + } + } // 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) + 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) + { + etl::handle 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; } @@ -1431,6 +1552,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_value_desc(synfigapp::ValueDesc(value_node,i)); if(param_desc) { @@ -1560,6 +1682,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_value_desc(synfigapp::ValueDesc(value_node,i)); add_bezier(bezier); bezier=0; @@ -1616,6 +1739,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_value_desc(synfigapp::ValueDesc(value_node,i)); } @@ -1683,6 +1807,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_value_desc(synfigapp::ValueDesc(value_node,first)); add_bezier(bezier); bezier=0;