!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" ||
!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;
}
}
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;
{
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;
}
{
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()))
+ 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;
etl::handle<Duck> duck(*iter);
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_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"))));
case ValueBase::TYPE_VECTOR:
(*iter)->set_point((*bline_tangent)(time, amount).get(Vector()));
break;
+ default:
+ break;
}
}
}
{
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;
}
}
false),
1.0f),
synfigapp::ValueDesc(value_node,i)));
+ duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
if(param_desc)
{
{
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()));
*/
}
}
false),
1.0f),
synfigapp::ValueDesc(value_node,i)));
+ duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
add_bezier(bezier);
bezier=0;
// 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()));
false),
1.0f),
synfigapp::ValueDesc(value_node,i)));
+ duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
}
false),
1.0f),
synfigapp::ValueDesc(value_node,first)));
+ duck->set_value_desc(synfigapp::ValueDesc(value_node,first));
add_bezier(bezier);
bezier=0;
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()));