X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=fb1470662dd6f6afd510ff775d9562e8bca1be54;hb=5ebb2e2459eee96a4cee0c62eee33480b95ba503;hp=0be4a9e71b855abb7723606f05a4ed3c4bda5795;hpb=071939c9c44d0080e0843381adc19a6600f0fd69;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 0be4a9e..fb14706 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include @@ -253,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" || @@ -266,6 +268,21 @@ 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) && + parent_value_node->get_type() == ValueBase::TYPE_BLINEPOINT && + ValueNode_BLineCalcVertex::Handle::cast_dynamic( + synfigapp::ValueDesc(parent_value_node, + parent_value_node->get_link_index_from_name("point")).get_value_node())) + return false; + } + } return true; } @@ -281,6 +298,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; @@ -543,49 +568,50 @@ DuckDrag_Translate::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector 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) && - duck->get_value_desc().parent_is_value_node()) + 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) { - 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")); - 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_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)); - - if (bline_tangent_1 || bline_tangent_2) - { - 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()); + 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) - { - 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); - } + 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)); - if (bline_tangent_2) + 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) { - 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); + 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)); + } } } }