}
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();
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;
return strprintf("%s",x.get_value_node()->get_guid().get_string().c_str());
}
-inline GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::TransformStack& transform_stack)
+inline synfig::GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::TransformStack& transform_stack)
{
- GUID ret(0);
+ synfig::GUID ret(0);
if(x.parent_is_layer_param())
{
- ret=x.get_layer()->get_guid()^GUID::hasher(x.get_param_name());
+ ret=x.get_layer()->get_guid()^synfig::GUID::hasher(x.get_param_name());
}
else
{
Duck::Handle
Duckmatic::create_duck_from(const synfigapp::ValueDesc& value_desc,etl::handle<CanvasView> canvas_view, const synfig::TransformStack& transform_stack, int modifier, synfig::ParamDesc *param_desc)
{
- GUID duck_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(modifier));
+ synfig::GUID duck_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(modifier));
etl::handle<Duck> duck=new Duck();
return duck;
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())
{
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
0.0f),
value_desc));
- duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
+ duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
add_duck(duck);
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
0.0f),
value_desc));
- duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
+ duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
add_duck(duck);
{
synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_connect());
Duck::Handle connect_duck;
- if(duck_map.find(calc_duck_guid(value_desc_origin,transform_stack)^GUID::hasher(0))!=duck_map.end())
+ if(duck_map.find(calc_duck_guid(value_desc_origin,transform_stack)^synfig::GUID::hasher(0))!=duck_map.end())
{
- connect_duck=duck_map[calc_duck_guid(value_desc_origin,transform_stack)^GUID::hasher(0)];
+ connect_duck=duck_map[calc_duck_guid(value_desc_origin,transform_stack)^synfig::GUID::hasher(0)];
}
else
{
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
1.0f),
value_desc));
- duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
+ duck->set_guid(calc_duck_guid(value_desc,transform_stack)^synfig::GUID::hasher(multiple));
add_duck(duck);
return true;
}
break;
-/* case ValueBase::TYPE_SEGMENT:
+ case ValueBase::TYPE_SEGMENT:
{
etl::handle<Bezier> bezier(new Bezier());
ValueNode_Composite::Handle value_node;
name=guid_string(value_desc);
}
- duck_p=new class Duck(segment.p1);
+ duck_p=new Duck(segment.p1);
duck_p->set_name(name+".P1");
duck_p->set_type(Duck::TYPE_VERTEX);
add_duck(duck_p);
- duck_c=new class Duck(segment.t1);
+ duck_c=new Duck(segment.t1);
duck_c->set_name(name+".T1");
duck_c->set_type(Duck::TYPE_TANGENT);
add_duck(duck_c);
bezier->p1=duck_p;
bezier->c1=duck_c;
- duck_p=new class Duck(segment.p2);
+ duck_p=new Duck(segment.p2);
duck_p->set_name(name+".P2");
duck_p->set_type(Duck::TYPE_VERTEX);
add_duck(duck_p);
- duck_c=new class Duck(segment.t2);
+ duck_c=new Duck(segment.t2);
duck_c->set_type(Duck::TYPE_TANGENT);
duck_c->set_name(name+".T2");
add_duck(duck_c);
return true;
}
break;
-*/
case ValueBase::TYPE_BLINEPOINT:
{
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
1.0f),
synfigapp::ValueDesc(value_node,i)));
duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
*/
}
}
- duck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".v"));
+ duck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^synfig::GUID::hasher(".v"));
duck=add_similar_duck(duck);
// add_duck(duck);
}
tduck->set_editable(false);
tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".t1");
// tduck->set_name(strprintf("%x-tangent1",value_node->get_link(i).get()));
- tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".t1"));
+ tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^synfig::GUID::hasher(".t1"));
tduck=add_similar_duck(tduck);
// add_duck(duck);
}
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
1.0f),
synfigapp::ValueDesc(value_node,i)));
duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
tduck->set_transform_stack(transform_stack);
tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".t2");
- tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".t2"));
+ tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^synfig::GUID::hasher(".t2"));
tduck->set_editable(false);
tduck=add_similar_duck(tduck);
// add_duck(duck);
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
1.0f),
synfigapp::ValueDesc(value_node,i)));
duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,first))+".t1");
//tduck->set_name(strprintf("%x-tangent1",value_node->get_link(first).get()));
tduck=add_similar_duck(tduck);
- tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,first),transform_stack)^GUID::hasher(".t1"));
+ tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,first),transform_stack)^synfig::GUID::hasher(".t1"));
//add_duck(duck);
}
duck->signal_user_click(2).connect(
sigc::bind(
sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu),
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu),
+ false),
1.0f),
synfigapp::ValueDesc(value_node,first)));
duck->set_value_desc(synfigapp::ValueDesc(value_node,first));
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)
+ else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT)
{
for(i=0;i<value_node->link_count();i++)
{
return false;
}
}
- */
else
return false;
}