**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007, 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
Duckmatic::~Duckmatic()
{
clear_ducks();
- //synfig::info("Duckmatic::~Duckmatic(): Deleted. Duck Count=%d",Duck::duck_count);
+
+ if (Duck::duck_count)
+ synfig::error("%d ducks not yet deleted!", Duck::duck_count);
+
+ if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+ synfig::info("Duckmatic::~Duckmatic(): Deleted");
+}
+
+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
{
const Type type(get_type_mask());
- if(( x->get_type() && (!(type & x->get_type())) ) )
- {
+ if (((x->get_type() && (!(type & x->get_type()))) ||
+ !x->get_editable()))
return false;
- }
+
if(x->get_value_desc().parent_is_layer_param() && type & Duck::TYPE_POSITION)
{
Layer::Handle layer(x->get_value_desc().get_layer());
String layer_name(layer->get_name());
- if(
- layer_name=="outline" ||
- layer_name=="region" ||
- layer_name=="polygon" ||
- layer_name=="curve_gradient"
- )
+
+ if (layer_name == "outline" || layer_name == "region" || layer_name == "plant" ||
+ layer_name == "polygon" || layer_name == "curve_gradient")
return false;
+
if((layer_name=="PasteCanvas"|| layer_name=="paste_canvas") &&
!layer->get_param("children_lock").get(bool()))
return false;
}
Point
-Duckmatic::snap_point_to_grid(const Point& x, float radius)const
+Duckmatic::snap_point_to_grid(const synfig::Point& x, float radius)const
{
Point ret(x);
{
Point snap(
floor(ret[0]/get_grid_size()[0]+0.5)*get_grid_size()[0],
- floor(ret[1]/get_grid_size()[1]+0.5)*get_grid_size()[1]
- );
+ floor(ret[1]/get_grid_size()[1]+0.5)*get_grid_size()[1]);
if(abs(snap[0]-ret[0])<=radius && (!has_guide_x || abs(snap[0]-ret[0])<=abs(*guide_x-ret[0])))
ret[0]=snap[0],has_guide_x=false;
// Go ahead and call everyone's signals
for(iter=ducks.begin();iter!=ducks.end();++iter)
{
- if ((*iter)->get_type() == Duck::TYPE_ANGLE ||
- (*iter)->get_type() == Duck::TYPE_TANGENT)
+ if ((*iter)->get_type() == Duck::TYPE_ANGLE)
{
if(!(*iter)->signal_edited_angle()((*iter)->get_rotations()))
{
throw String("Bad edit");
}
}
+ else if (App::restrict_radius_ducks &&
+ (*iter)->is_radius())
+ {
+ Point point((*iter)->get_point());
+ bool changed = false;
+
+ if (point[0] * (flip_x_ ? -1 : 1) < 0)
+ {
+ point[0] = 0;
+ changed = true;
+ }
+ if (point[1] * (flip_y_ ? -1 : 1) < 0)
+ {
+ point[1] = 0;
+ changed = true;
+ }
+
+ if (changed) (*iter)->set_point(point);
+
+ if(!(*iter)->signal_edited()(point))
+ {
+ selected_ducks=old_set;
+ throw String("Bad edit");
+ }
+ }
else
{
if(!(*iter)->signal_edited()((*iter)->get_point()))
{
const Duck::Handle& duck(iter->second);
- if(!duck->get_editable())
+ if(duck->get_ignore())
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_RADIUS)
+ dist*=0.9999;
if(dist<=closest && !( duck->get_type() && (!(type & duck->get_type())) ) )
{
bool
Duckmatic::save_sketch(const synfig::String& filename)const
{
+ ChangeLocale change_locale(LC_NUMERIC, "C");
std::ofstream file(filename.c_str());
if(!file)return false;
bool
Duckmatic::load_sketch(const synfig::String& filename)
{
+ ChangeLocale change_locale(LC_NUMERIC, "C");
std::ifstream file(filename.c_str());
if(!file)
duck->set_radius(true);
duck->set_type(Duck::TYPE_RADIUS);
- duck->set_point(Point(value_desc.get_value(get_time()).get(Real()),0));
+ // 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));
duck->set_name(guid_string(value_desc));
if(value_desc.is_value_node())
{
}
duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_REAL:
- printf("DESC REAL, DUCK %d\n", int(duck->get_type()));
duck->signal_edited().connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::on_duck_changed
- ),
- value_desc
- )
- );
+ &studio::CanvasView::on_duck_changed),
+ value_desc));
duck->set_value_desc(value_desc);
duck->signal_user_click(2).connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 0.0f
- ),
- value_desc
- )
- );
+ &studio::CanvasView::popup_param_menu),
+ 0.0f),
+ value_desc));
duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
}
duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_ANGLE:
- printf("DESC ANGLE, DUCK %d\n", int(duck->get_type()));
duck->signal_edited_angle().clear();
duck->signal_edited_angle().connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::on_duck_angle_changed
- ),
- value_desc
- )
- );
+ &studio::CanvasView::on_duck_angle_changed),
+ value_desc));
duck->set_value_desc(value_desc);
duck->signal_user_click(2).connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 0.0f
- ),
- value_desc
- )
- );
+ &studio::CanvasView::popup_param_menu),
+ 0.0f),
+ value_desc));
duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
add_duck(duck);
duck->set_type(Duck::TYPE_POSITION);
duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_VECTOR:
- printf("DESC VECTOR, DUCK %d\n", int(duck->get_type()));
duck->signal_edited().connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::on_duck_changed
- ),
- value_desc
- )
- );
+ &studio::CanvasView::on_duck_changed),
+ value_desc));
duck->set_value_desc(value_desc);
duck->signal_user_click(2).connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 1.0f
- ),
- value_desc
- )
- );
+ &studio::CanvasView::popup_param_menu),
+ 1.0f),
+ value_desc));
duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple));
add_duck(duck);
ValueNode_Composite::Handle value_node;
if(value_desc.is_value_node() &&
- (value_node=ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()))
- )
+ (value_node=ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())))
{
if(!add_to_ducks(synfigapp::ValueDesc(value_node,0),canvas_view,transform_stack))
return false;
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu_bezier
- ),
- value_desc
- )
- );
+ &studio::CanvasView::popup_param_menu_bezier),
+ value_desc));
add_bezier(bezier);
}
{
if(value_desc.is_value_node() &&
- ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node())
- )
+ ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node()))
{
ValueNode_Composite::Handle value_node;
value_node=ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node());
case ValueBase::TYPE_LIST:
{
// Check for BLine
- if(value_desc.is_value_node() &&
- ValueNode_BLine::Handle::cast_dynamic(value_desc.get_value_node())
- )
+ if (value_desc.is_value_node() &&
+ ValueNode_BLine::Handle::cast_dynamic(value_desc.get_value_node()))
{
ValueNode_BLine::Handle value_node;
value_node=ValueNode_BLine::Handle::cast_dynamic(value_desc.get_value_node());
etl::handle<Duck> first_duck;
etl::handle<Duck> duck, tduck;
- for(i=0;i<value_node->link_count();i++)
+ for (i = 0; i < value_node->link_count(); i++)
{
float amount(value_node->list[i].amount_at_time(get_time()));
- if(amount<0.9999f)
+
+ // skip vertices that aren't fully on
+ if (amount < 0.9999f)
continue;
- if(first==-1)first=i;
+
+ // remember the index of the first vertex we didn't skip
+ if (first == -1)
+ first = i;
BLinePoint bline_point((*value_node->get_link(i))(get_time()));
- ValueNode_Composite::Handle vertex_value_node(
- ValueNode_Composite::Handle::cast_dynamic(
- value_node->get_link(i)
- )
- );
+ // try casting the vertex to Composite - this tells us whether it is composite or not
+ ValueNode_Composite::Handle composite_vertex_value_node(
+ ValueNode_Composite::Handle::cast_dynamic(value_node->get_link(i)));
- // Add the vertex duck
- if(vertex_value_node)
+ // add the vertex duck - it's a composite
+ if(composite_vertex_value_node)
{
- if(add_to_ducks(synfigapp::ValueDesc(vertex_value_node,0),canvas_view,transform_stack))
+ if (add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,0),canvas_view,transform_stack))
{
duck=last_duck();
if(i==first)
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 1.0f
- ),
- synfigapp::ValueDesc(value_node,i)
- )
- );
+ &studio::CanvasView::popup_param_menu),
+ 1.0f),
+ synfigapp::ValueDesc(value_node,i)));
duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
if(param_desc)
else
return false;
}
+ // else it's not a composite
else
{
duck=new Duck(bline_point.get_vertex());
// add_duck(duck);
}
- // Add the width duck only if we have a hint of scale
- if(param_desc && !param_desc->get_hint().empty())
+ // Add the width duck if it is a parameter with a hint (ie. "width") or if it isn't a parameter
+ if ((param_desc && !param_desc->get_hint().empty()) ||
+ !param_desc)
{
etl::handle<Duck> width;
- if(add_to_ducks(synfigapp::ValueDesc(vertex_value_node,1),canvas_view,transform_stack,REAL_COOKIE))
+ if (add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,1),canvas_view,transform_stack,REAL_COOKIE))
{
width=last_duck();
width->set_origin(duck);
width->set_type(Duck::TYPE_WIDTH);
width->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".w");
+
+ // if the bline is a layer's parameter, scale the width duck by the layer's "width" parameter
+ if (param_desc)
{
ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_hint()).get_value(get_time()));
if(value.same_type_as(synfig::Real()))
width->set_scalar(value.get(synfig::Real())*0.5f);
+ // if it doesn't have a "width" parameter, scale by 0.5f instead
+ else
+ width->set_scalar(0.5f);
}
+ // otherwise just present the raw unscaled width
+ else
+ width->set_scalar(0.5f);
}
else
synfig::error("Unable to add width duck!");
}
+ // each bezier uses t2 of one point and t1 of the next
+ // the first time through this loop we won't have the t2 duck from the previous vertex
+ // and so we don't make a bezier. instead we skip on to t2 for this point
if(bezier)
{
// Add the tangent1 duck
- if(vertex_value_node)
+ if(composite_vertex_value_node)
{
- if(!add_to_ducks(synfigapp::ValueDesc(vertex_value_node,4),canvas_view,transform_stack))
+ if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,4),canvas_view,transform_stack))
return false;
tduck=last_duck();
}
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu_bezier
- ),
- synfigapp::ValueDesc(value_node,i)
- )
- );
+ &studio::CanvasView::popup_param_menu_bezier),
+ synfigapp::ValueDesc(value_node,i)));
duck->signal_user_click(2).clear();
duck->signal_user_click(2).connect(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 1.0f
- ),
- synfigapp::ValueDesc(value_node,i)
- )
- );
+ &studio::CanvasView::popup_param_menu),
+ 1.0f),
+ synfigapp::ValueDesc(value_node,i)));
duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
add_bezier(bezier);
bezier=0;
}
+ // don't start a new bezier for the last point in the line if we're not looped
if(i+1>=value_node->link_count() && !value_node->get_loop())
continue;
bezier=new Bezier();
// Add the tangent2 duck
- if(vertex_value_node)
+ if(composite_vertex_value_node)
{
int i=bline_point.get_split_tangent_flag()?5:4;
- if(!add_to_ducks(synfigapp::ValueDesc(vertex_value_node,i),canvas_view,transform_stack,0,2))
+ if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,i),canvas_view,transform_stack,0,2))
return false;
tduck=last_duck();
}
else
{
if(bline_point.get_split_tangent_flag())
- {
tduck=new Duck(bline_point.get_tangent2());
- tduck->set_transform_stack(transform_stack);
- //tduck->set_name(strprintf("%x-tangent2",value_node->get_link(i).get()));
- 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"));
- }
else
- {
tduck=new Duck(bline_point.get_tangent1());
- tduck->set_transform_stack(transform_stack);
- //tduck->set_name(strprintf("%x-tangent1",value_node->get_link(i).get()));
- tduck->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".t1");
- tduck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".t1"));
- }
+
+ 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_editable(false);
tduck=add_similar_duck(tduck);
// add_duck(duck);
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 1.0f
- ),
- synfigapp::ValueDesc(value_node,0)
- )
- );
- duck->set_value_desc(synfigapp::ValueDesc(value_node,0));
+ &studio::CanvasView::popup_param_menu),
+ 1.0f),
+ synfigapp::ValueDesc(value_node,0)));
+ duck->set_value_desc(synfigapp::ValueDesc(value_node,i));
}
bezier->p1=duck;
bezier->c1=tduck;
-
}
+
// Loop if necessary
if(bezier && value_node->get_loop())
{
BLinePoint bline_point((*value_node->get_link(first))(get_time()));
- ValueNode_Composite::Handle vertex_value_node(
+ ValueNode_Composite::Handle composite_vertex_value_node(
ValueNode_Composite::Handle::cast_dynamic(
- value_node->get_link(first)
- )
- );
+ value_node->get_link(first)));
// Add the vertex duck
duck=first_duck;
- /*
- if(vertex_value_node)
+
+ // Add the tangent1 duck
+ if(composite_vertex_value_node)
{
- if(!add_to_ducks(synfigapp::ValueDesc(vertex_value_node,0),canvas_view,transform_stack))
+ if(!add_to_ducks(synfigapp::ValueDesc(composite_vertex_value_node,4),canvas_view,transform_stack))
return false;
- duck=last_duck();
- if(param_desc)
- {
- if(!param_desc->get_origin().empty())
- duck->set_origin(value_desc.get_layer()->get_param(param_desc->get_origin()).get(synfig::Point()));
- }
- duck->set_type(Duck::TYPE_VERTEX);
+ tduck=last_duck();
}
else
{
- duck=new Duck(bline_point.get_vertex());
- duck->set_transform_stack(transform_stack);
- if(param_desc)
- {
- if(!param_desc->get_origin().empty())
- duck->set_origin(value_desc.get_layer()->get_param(param_desc->get_origin()).get(synfig::Point()));
- }
- duck->set_editable(false);
- duck->set_name(strprintf("%x-vertex",value_node->get_link(first).get()));
- duck->set_type(Duck::TYPE_VERTEX);
- duck=add_similar_duck(duck);
+ tduck=new Duck(bline_point.get_tangent1());
+ tduck->set_transform_stack(transform_stack);
+ tduck->set_editable(false);
+ 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"));
+ //add_duck(duck);
}
- */
- // Add the tangent1 duck
- if(vertex_value_node)
- {
- if(!add_to_ducks(synfigapp::ValueDesc(vertex_value_node,4),canvas_view,transform_stack))
- return false;
- tduck=last_duck();
- }
- else
- {
- tduck=new Duck(bline_point.get_tangent1());
- tduck->set_transform_stack(transform_stack);
- tduck->set_editable(false);
- 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,i),transform_stack)^GUID::hasher(".t1"));
- //add_duck(duck);
- }
+ tduck->set_origin(duck);
+ tduck->set_scalar(-TANGENT_BEZIER_SCALE);
+ tduck->set_tangent(true);
- tduck->set_origin(duck);
- tduck->set_scalar(-TANGENT_BEZIER_SCALE);
- tduck->set_tangent(true);
+ bezier->p2=duck;
+ bezier->c2=tduck;
- bezier->p2=duck;
- bezier->c2=tduck;
- bezier->signal_user_click(2).connect(
+ bezier->signal_user_click(2).connect(
+ sigc::bind(
+ sigc::mem_fun(
+ *canvas_view,
+ &studio::CanvasView::popup_param_menu_bezier),
+ synfigapp::ValueDesc(value_node,first)));
+
+ duck->signal_user_click(2).clear();
+ duck->signal_user_click(2).connect(
+ sigc::bind(
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu_bezier
- ),
- synfigapp::ValueDesc(value_node,first)
- )
- );
- duck->signal_user_click(2).clear();
- duck->signal_user_click(2).connect(
- sigc::bind(
- sigc::bind(
- sigc::mem_fun(
- *canvas_view,
- &studio::CanvasView::popup_param_menu
- ),
- 1.0f
- ),
- synfigapp::ValueDesc(value_node,first)
- )
- );
- duck->set_value_desc(synfigapp::ValueDesc(value_node,first));
-
- add_bezier(bezier);
- bezier=0;
+ &studio::CanvasView::popup_param_menu),
+ 1.0f),
+ synfigapp::ValueDesc(value_node,first)));
+ duck->set_value_desc(synfigapp::ValueDesc(value_node,first));
+ add_bezier(bezier);
+ bezier=0;
}
return true;
}
else // Check for DynamicList
if(value_desc.is_value_node() &&
- ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_value_node())
- )
+ ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_value_node()))
{
ValueNode_DynamicList::Handle value_node;
value_node=ValueNode_DynamicList::Handle::cast_dynamic(value_desc.get_value_node());
sigc::bind(
sigc::mem_fun(
*canvas_view,
- &studio::CanvasView::popup_param_menu_bezier
- ),
- synfigapp::ValueDesc(value_node,i)
- )
- );
+ &studio::CanvasView::popup_param_menu_bezier),
+ synfigapp::ValueDesc(value_node,i)));
}
}
}
projects / synfig.git / blobdiff