}
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();
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
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;
duck->set_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())
{
if(value_node->get_contained_type()==ValueBase::TYPE_VECTOR)
{
Bezier bezier;
+ etl::handle<Duck> first_duck, duck;
+ int first = -1;
for(i=0;i<value_node->link_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> 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)
{
bezier.p1=bezier.p2;bezier.c1=bezier.c2;
bezier.p2=bezier.c2=duck;
- if(i>0)
+ if (first != i)
{
handle<Bezier> bezier_(new Bezier());
bezier_->p1=bezier.p1;
synfigapp::ValueDesc(value_node,i)));
}
}
+
+ if (value_node->get_loop() && first != -1 && first_duck != duck)
+ {
+ duck = first_duck;
+
+ bezier.p1=bezier.p2;bezier.c1=bezier.c2;
+ bezier.p2=bezier.c2=duck;
+
+ handle<Bezier> 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)
{