{
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;
}
{
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;
}
}
{
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()));
*/
}
}
// 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()));
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()));