X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=ae01119a447add1e701be98f857db2d9fc3f30a2;hb=207785229d58cdebc3012076596fdc255dcf9879;hp=23acd79e3d12cd683994f86bc462a5bfb3f8fbb0;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 23acd79..ae01119 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -2,10 +2,11 @@ /*! \file duckmatic.cpp ** \brief Template File ** -** $Id: duckmatic.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** 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 @@ -55,6 +56,8 @@ #include "onemoment.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -66,6 +69,13 @@ using namespace studio; /* === M A C R O S ========================================================= */ +/* 0.33333333333333333 makes for nice short tangent handles, + 1.0 makes them draw as their real length */ +#define TANGENT_HANDLE_SCALE 0.33333333333333333 + +/* leave this alone or the bezier won't lie on top of the bline */ +#define TANGENT_BEZIER_SCALE 0.33333333333333333 + /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ @@ -79,7 +89,7 @@ Duckmatic::Duckmatic(): grid_snap(false), guide_snap(false), grid_size(1.0/4.0,1.0/4.0), - show_persistant_strokes(true) + show_persistent_strokes(true) { axis_lock=false; drag_offset_=Point(0,0); @@ -89,7 +99,24 @@ Duckmatic::Duckmatic(): 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 @@ -102,8 +129,8 @@ Duckmatic::clear_ducks() bezier_list_.clear(); stroke_list_.clear(); - if(show_persistant_strokes) - stroke_list_=persistant_stroke_list_; + if(show_persistent_strokes) + stroke_list_=persistent_stroke_list_; } //! Returns \a true if the given duck is currently selected @@ -143,8 +170,6 @@ Duckmatic::set_guide_snap(bool x) } } - - Duckmatic::GuideList::iterator Duckmatic::find_guide_x(synfig::Point pos, float radius) { @@ -206,7 +231,7 @@ Duckmatic::refresh_selected_ducks() signal_duck_selection_changed_(); return; } - + for(iter=selected_duck_list.begin();iter!=selected_duck_list.end();++iter) { etl::handle similar(find_similar_duck(*iter)); @@ -219,7 +244,7 @@ Duckmatic::refresh_selected_ducks() */ GUIDSet old_set(selected_ducks); GUIDSet::const_iterator iter; - + for(iter=old_set.begin();iter!=old_set.end();++iter) { if(duck_map.count(*iter)==0) @@ -234,26 +259,21 @@ Duckmatic::is_duck_group_selectable(const etl::handle& x)const { 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()) - ) + + if((layer_name=="PasteCanvas"|| layer_name=="paste_canvas") && + !layer->get_param("children_lock").get(bool())) return false; } return true; @@ -262,13 +282,32 @@ Duckmatic::is_duck_group_selectable(const etl::handle& x)const void Duckmatic::select_all_ducks() { - DuckMap::const_iterator iter; + DuckMap::const_iterator iter; for(iter=duck_map.begin();iter!=duck_map.end();++iter) if(is_duck_group_selectable(iter->second)) select_duck(iter->second); } void +Duckmatic::toggle_select_ducks_in_box(const synfig::Vector& tl,const synfig::Vector& br) +{ + Vector vmin, vmax; + vmin[0]=std::min(tl[0],br[0]); + vmin[1]=std::min(tl[1],br[1]); + vmax[0]=std::max(tl[0],br[0]); + vmax[1]=std::max(tl[1],br[1]); + + DuckMap::const_iterator iter; + for(iter=duck_map.begin();iter!=duck_map.end();++iter) + { + Point p(iter->second->get_trans_point()); + if(p[0]<=vmax[0] && p[0]>=vmin[0] && p[1]<=vmax[1] && p[1]>=vmin[1] && + is_duck_group_selectable(iter->second)) + toggle_select_duck(iter->second); + } +} + +void Duckmatic::select_ducks_in_box(const synfig::Vector& tl,const synfig::Vector& br) { Vector vmin, vmax; @@ -278,8 +317,8 @@ Duckmatic::select_ducks_in_box(const synfig::Vector& tl,const synfig::Vector& br vmax[1]=std::max(tl[1],br[1]); // Type type(get_type_mask()); - - DuckMap::const_iterator iter; + + DuckMap::const_iterator iter; for(iter=duck_map.begin();iter!=duck_map.end();++iter) { Point p(iter->second->get_trans_point()); @@ -313,14 +352,14 @@ Duckmatic::get_selected_ducks()const DuckList ret; GUIDSet::const_iterator iter; const Type type(get_type_mask()); - + for(iter=selected_ducks.begin();iter!=selected_ducks.end();++iter) { const DuckMap::const_iterator d_iter(duck_map.find(*iter)); - + if(d_iter==duck_map.end()) continue; - + if(( d_iter->second->get_type() && (!(type & d_iter->second->get_type())) ) ) continue; @@ -358,7 +397,6 @@ Duckmatic::toggle_select_duck(const etl::handle &duck) select_duck(duck); } - void Duckmatic::translate_selected_ducks(const synfig::Vector& vector) { @@ -385,13 +423,13 @@ Duckmatic::end_duck_drag() } 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); GuideList::const_iterator guide_x,guide_y; bool has_guide_x(false), has_guide_y(false); - + guide_x=find_guide_x(ret,radius); if(guide_x!=guide_list_x_.end()) has_guide_x=true; @@ -404,8 +442,7 @@ Duckmatic::snap_point_to_grid(const Point& x, float radius)const { 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; @@ -420,7 +457,7 @@ Duckmatic::snap_point_to_grid(const Point& x, float radius)const if(has_guide_y) ret[1]=*guide_y; } - + if(axis_lock) { ret-=drag_offset_; @@ -430,7 +467,7 @@ Duckmatic::snap_point_to_grid(const Point& x, float radius)const ret[1]=0; ret+=drag_offset_; } - + return ret; } @@ -443,10 +480,10 @@ DuckDrag_Translate::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& snap=Vector(0,0); } - + const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; - + positions.clear(); for(iter=selected_ducks.begin();iter!=selected_ducks.end();++iter) { @@ -478,29 +515,24 @@ DuckDrag_Translate::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector synfig::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_); int i; - + for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { - if((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION)continue; + if((*iter)->get_type()!=Duck::TYPE_VERTEX && + (*iter)->get_type()!=Duck::TYPE_POSITION) + continue; (*iter)->set_trans_point(positions[i]+vect); } for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++) { - if((*iter)->get_type()==Duck::TYPE_VERTEX||(*iter)->get_type()==Duck::TYPE_POSITION)continue; + if((*iter)->get_type()==Duck::TYPE_VERTEX || + (*iter)->get_type()==Duck::TYPE_POSITION) + continue; (*iter)->set_trans_point(positions[i]+vect); } last_translate_=vect; } - - - - - - - - - void Duckmatic::signal_edited_selected_ducks() { @@ -508,18 +540,54 @@ Duckmatic::signal_edited_selected_ducks() DuckList::const_iterator iter; synfig::GUIDSet old_set(selected_ducks); - + // If we have more than 20 things to move, then display // something to explain that it may take a moment smart_ptr wait; if(ducks.size()>20)wait.spawn(); - + // Go ahead and call everyone's signals for(iter=ducks.begin();iter!=ducks.end();++iter) { - if(!(*iter)->signal_edited()((*iter)->get_point())) + if ((*iter)->get_type() == Duck::TYPE_ANGLE) + { + if(!(*iter)->signal_edited_angle()((*iter)->get_rotations())) + { + selected_ducks=old_set; + throw String("Bad edit"); + } + } + else if (App::restrict_radius_ducks && + (*iter)->is_radius()) { - selected_ducks=old_set; - throw String("Bad edit"); + 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())) + { + selected_ducks=old_set; + throw String("Bad edit"); + } } } selected_ducks=old_set; @@ -537,10 +605,6 @@ Duckmatic::signal_user_click_selected_ducks(int button) } } - - - - void Duckmatic::add_duck(const etl::handle &duck) { @@ -556,7 +620,7 @@ Duckmatic::add_duck(const etl::handle &duck) duck->set_shared_point(point); duck_data_share_map[duck->get_data_guid()]=point; } - + duck_map.insert(duck); } @@ -587,30 +651,30 @@ Duckmatic::add_stroke(etl::smart_ptr > stroke_point_lis stroke->stroke_data=stroke_point_list; stroke->color=color; - stroke_list_.push_back(stroke); + stroke_list_.push_back(stroke); } void -Duckmatic::add_persistant_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color) +Duckmatic::add_persistent_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color) { add_stroke(stroke_point_list,color); - persistant_stroke_list_.push_back(stroke_list_.back()); + persistent_stroke_list_.push_back(stroke_list_.back()); } void -Duckmatic::clear_persistant_strokes() +Duckmatic::clear_persistent_strokes() { - persistant_stroke_list_.clear(); + persistent_stroke_list_.clear(); } void -Duckmatic::set_show_persistant_strokes(bool x) +Duckmatic::set_show_persistent_strokes(bool x) { - if(x!=show_persistant_strokes) + if(x!=show_persistent_strokes) { - show_persistant_strokes=x; + show_persistent_strokes=x; if(x) - stroke_list_=persistant_stroke_list_; + stroke_list_=persistent_stroke_list_; else stroke_list_.clear(); } @@ -619,7 +683,7 @@ Duckmatic::set_show_persistant_strokes(bool x) void Duckmatic::erase_duck(const etl::handle &duck) { - duck_map.erase(duck->get_guid()); + duck_map.erase(duck->get_guid()); } etl::handle @@ -629,7 +693,7 @@ Duckmatic::find_similar_duck(etl::handle duck) if(iter!=duck_map.end()) return iter->second; return 0; - + /* std::list >::reverse_iterator iter; for(iter=duck_list_.rbegin();iter!=duck_list_.rend();++iter) @@ -687,15 +751,14 @@ Duckmatic::last_bezier()const return bezier_list_.back(); } - etl::handle Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type) { if(radius==0)radius=10000000; - + if(type==Duck::TYPE_DEFAULT) type=get_type_mask(); - + Real closest(10000000); etl::handle ret; @@ -704,13 +767,15 @@ Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type) for(iter=duck_map.begin();iter!=duck_map.end();++iter) { 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())) ) ) { @@ -730,22 +795,22 @@ Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type) etl::handle Duckmatic::find_bezier(synfig::Point point, synfig::Real radius,float* location) { - return find_bezier(point,radius,radius,location); + return find_bezier(point,radius,radius,location); } -etl::handle +etl::handle Duckmatic::find_bezier(synfig::Point pos, synfig::Real scale, synfig::Real radius, float* location) { if(radius==0)radius=10000000; Real closest(10000000); etl::handle ret; - + bezier curve; - + Real d,step; float time = 0; float best_time = 0; - + for(std::list >::const_iterator iter=bezier_list().begin();iter!=bezier_list().end();++iter) { curve[0] = (*iter)->p1->get_trans_point(); @@ -753,21 +818,21 @@ Duckmatic::find_bezier(synfig::Point pos, synfig::Real scale, synfig::Real radiu curve[2] = (*iter)->c2->get_trans_point(); curve[3] = (*iter)->p2->get_trans_point(); curve.sync(); - + #if 0 // I don't know why this doesn't work time=curve.find_closest(pos,6); d=((curve(time)-pos).mag_squared()); -#else +#else //set the step size based on the size of the picture d = (curve[1] - curve[0]).mag() + (curve[2]-curve[1]).mag() + (curve[3]-curve[2]).mag(); - + step = d/(2*scale); //want to make the distance between lines happy - + step = max(step,0.01); //100 samples should be plenty - step = min(step,0.1); //10 is minimum - + step = min(step,0.1); //10 is minimum + d = find_closest(curve,pos,step,&closest,&time); #endif @@ -776,34 +841,33 @@ Duckmatic::find_bezier(synfig::Point pos, synfig::Real scale, synfig::Real radiu closest = d; ret = *iter; best_time=time; - } + } } if(closest < radius*radius) { if(location) *location = best_time; // We need to square-root this because we were dealing with squared distances - + return ret; } - - return 0; -} - + return 0; +} 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; file<<"SKETCH"< >::const_iterator iter; - - for(iter=persistant_stroke_list_.begin();iter!=persistant_stroke_list_.end();++iter) + + for(iter=persistent_stroke_list_.begin();iter!=persistent_stroke_list_.end();++iter) { file<<"C " <<(*iter)->color.get_r()<<' ' @@ -828,8 +892,9 @@ Duckmatic::save_sketch(const synfig::String& filename)const bool Duckmatic::load_sketch(const synfig::String& filename) { + ChangeLocale change_locale(LC_NUMERIC, "C"); std::ifstream file(filename.c_str()); - + if(!file) return false; @@ -842,16 +907,15 @@ Duckmatic::load_sketch(const synfig::String& filename) return false; } - etl::smart_ptr > stroke_data; - + while(file) { getline(file,line); if(line.empty()) continue; - + switch(line[0]) { case 'C': @@ -864,7 +928,7 @@ Duckmatic::load_sketch(const synfig::String& filename) synfig::warning("Bad color line \"%s\"",line.c_str()); r=0;g=0;b=0; } - add_persistant_stroke(stroke_data, synfig::Color(r,g,b)); + add_persistent_stroke(stroke_data, synfig::Color(r,g,b)); } break; case 'V': @@ -872,7 +936,7 @@ Duckmatic::load_sketch(const synfig::String& filename) if(!stroke_data) { stroke_data.spawn(); - add_persistant_stroke(stroke_data, synfig::Color(0,0,0)); + add_persistent_stroke(stroke_data, synfig::Color(0,0,0)); } float x,y; if(!strscanf(line,"V %f %f",&x, &y)) @@ -885,23 +949,16 @@ Duckmatic::load_sketch(const synfig::String& filename) break; } } - + sketch_filename_=filename; return true; } - - - - - - - Duckmatic::Push::Push(Duckmatic *duckmatic_): duckmatic_(duckmatic_) { - duck_map=duckmatic_->duck_map; - bezier_list_=duckmatic_->bezier_list_; + duck_map=duckmatic_->duck_map; + bezier_list_=duckmatic_->bezier_list_; duck_data_share_map=duckmatic_->duck_data_share_map; stroke_list_=duckmatic_->stroke_list_; duck_dragger_=duckmatic_->duck_dragger_; @@ -917,26 +974,18 @@ Duckmatic::Push::~Push() void Duckmatic::Push::restore() { - duckmatic_->duck_map=duck_map; - duckmatic_->bezier_list_=bezier_list_; + duckmatic_->duck_map=duck_map; + duckmatic_->bezier_list_=bezier_list_; duckmatic_->duck_data_share_map=duck_data_share_map; duckmatic_->stroke_list_=stroke_list_; duckmatic_->duck_dragger_=duck_dragger_; needs_restore=false; } - - - - - - - - inline String guid_string(const synfigapp::ValueDesc& x) { if(x.parent_is_layer_param()) - return strprintf("%s",x.get_layer()->get_guid().get_string().c_str())+x.get_param_name(); + return strprintf("%s",x.get_layer()->get_guid().get_string().c_str())+x.get_param_name(); //if(x.is_value_node()) return strprintf("%s",x.get_value_node()->get_guid().get_string().c_str()); } @@ -944,7 +993,7 @@ inline String guid_string(const synfigapp::ValueDesc& x) inline GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::TransformStack& transform_stack) { GUID ret(0); - + if(x.parent_is_layer_param()) { ret=x.get_layer()->get_guid()^GUID::hasher(x.get_param_name()); @@ -955,7 +1004,7 @@ inline GUID calc_duck_guid(const synfigapp::ValueDesc& x,const synfig::Transform } ret^=transform_stack.get_guid(); - return ret; + return ret; } /* @@ -964,7 +1013,7 @@ Duckmatic::create_duck_from(const synfigapp::ValueDesc& value_desc,etl::handle duck=new Duck(); - + return duck; } */ @@ -973,11 +1022,11 @@ bool Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle canvas_view, const synfig::TransformStack& transform_stack, synfig::ParamDesc *param_desc, int multiple) { ValueBase::Type type=value_desc.get_value_type(); -#define REAL_COOKIE reinterpret_cast(28) +#define REAL_COOKIE reinterpret_cast(28) switch(type) { case ValueBase::TYPE_REAL: - + if(!param_desc || param_desc==REAL_COOKIE || !param_desc->get_origin().empty()) { etl::handle duck=new Duck(); @@ -985,7 +1034,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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()) { @@ -997,7 +1047,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_editable(true); } - + if(param_desc && param_desc!=REAL_COOKIE) { if(!param_desc->get_origin().empty()) @@ -1012,16 +1062,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_scalar(param_desc->get_scalar()); } - duck->signal_edited().clear(); + duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_REAL: 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( @@ -1029,16 +1076,12 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple)); - + add_duck(duck); return true; @@ -1046,14 +1089,14 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_origin().empty()) { etl::handle duck=new Duck(); duck->set_type(Duck::TYPE_ANGLE); duck->set_transform_stack(transform_stack); synfig::Angle angle; - + angle=value_desc.get_value(get_time()).get(Angle()); duck->set_point(Point(Angle::cos(angle).get(),Angle::sin(angle).get())); duck->set_name(guid_string(value_desc)); @@ -1061,7 +1104,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_name(strprintf("%x",value_node.get())); - + // If the ValueNode can be directly manipulated, // then set it as so. duck->set_editable(synfigapp::is_editable(value_desc.get_value_node())); @@ -1073,7 +1116,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_name(strprintf("%x",value_desc.get_layer().get())+value_desc.get_param_name()); duck->set_editable(true); } - + if(param_desc && param_desc!=REAL_COOKIE) { if(!param_desc->get_origin().empty()) @@ -1088,16 +1131,14 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_scalar(param_desc->get_scalar()); } - duck->signal_edited().clear(); - duck->signal_edited().connect( + duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_ANGLE: + duck->signal_edited_angle().clear(); + duck->signal_edited_angle().connect( sigc::bind( sigc::mem_fun( *canvas_view, - &studio::CanvasView::on_duck_changed - ), - value_desc - ) - ); + &studio::CanvasView::on_duck_angle_changed), + value_desc)); duck->set_value_desc(value_desc); duck->signal_user_click(2).connect( @@ -1105,13 +1146,9 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple)); add_duck(duck); @@ -1119,18 +1156,18 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle duck=new Duck(); duck->set_transform_stack(transform_stack); - + duck->set_point(value_desc.get_value(get_time()).get(Point())); duck->set_name(guid_string(value_desc)); if(value_desc.is_value_node()) { //duck->set_name(strprintf("%x",value_desc.get_value_node().get())); - + // If the ValueNode can be directly manipulated, // then set it as so. duck->set_editable(synfigapp::is_editable(value_desc.get_value_node())); @@ -1141,7 +1178,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_name(strprintf("%x",value_desc.get_layer().get())+value_desc.get_param_name()); duck->set_editable(true); } - + // If we were passed a parameter description if(param_desc) { @@ -1166,7 +1203,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_box_duck(last_duck()); } - + // If we have an origin if(!param_desc->get_origin().empty()) { @@ -1180,23 +1217,19 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_type(Duck::TYPE_POSITION); - + duck->set_scalar(param_desc->get_scalar()); } else duck->set_type(Duck::TYPE_POSITION); - - duck->signal_edited().clear(); + duck->signal_edited().clear(); // value_desc.get_value_type() == ValueBase::TYPE_VECTOR: 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( @@ -1204,13 +1237,9 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple)); add_duck(duck); @@ -1221,10 +1250,9 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle bezier(new Bezier()); 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; @@ -1232,35 +1260,31 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlep1->set_type(Duck::TYPE_VERTEX); if(!add_to_ducks(synfigapp::ValueDesc(value_node,1),canvas_view,transform_stack)) return false; - bezier->c1=last_duck(); + bezier->c1=last_duck(); bezier->c1->set_type(Duck::TYPE_TANGENT); bezier->c1->set_origin(bezier->p1); - bezier->c1->set_scalar(0.33333333333333333); + bezier->c1->set_scalar(TANGENT_BEZIER_SCALE); bezier->c1->set_tangent(true); - if(!add_to_ducks(synfigapp::ValueDesc(value_node,2),canvas_view,transform_stack)) return false; bezier->p2=last_duck(); bezier->p2->set_type(Duck::TYPE_VERTEX); if(!add_to_ducks(synfigapp::ValueDesc(value_node,3),canvas_view,transform_stack)) return false; - bezier->c2=last_duck(); + bezier->c2=last_duck(); bezier->c2->set_type(Duck::TYPE_TANGENT); bezier->c2->set_origin(bezier->p2); - bezier->c2->set_scalar(-0.33333333333333333); + bezier->c2->set_scalar(-TANGENT_BEZIER_SCALE); bezier->c2->set_tangent(true); bezier->signal_user_click(2).connect( 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); } else if(value_desc.get_value().is_valid()) @@ -1277,55 +1301,53 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_name(name+".P1"); + duck_p=new class Duck(segment.p1); + duck_p->set_name(name+".P1"); duck_p->set_type(Duck::TYPE_VERTEX); - add_duck(duck_p); + add_duck(duck_p); - duck_c=new class Duck(segment.t1); - duck_c->set_name(name+".T1"); + duck_c=new class Duck(segment.t1); + duck_c->set_name(name+".T1"); duck_c->set_type(Duck::TYPE_TANGENT); - add_duck(duck_c); + add_duck(duck_c); duck_c->set_origin(duck_p); - duck_c->set_scalar(0.33333333333333333); + duck_c->set_scalar(TANGENT_HANDLE_SCALE); duck_c->set_tangent(true); bezier->p1=duck_p; bezier->c1=duck_c; - duck_p=new class Duck(segment.p2); - duck_p->set_name(name+".P2"); + duck_p=new class Duck(segment.p2); + duck_p->set_name(name+".P2"); duck_p->set_type(Duck::TYPE_VERTEX); - add_duck(duck_p); + add_duck(duck_p); - duck_c=new class Duck(segment.t2); + duck_c=new class Duck(segment.t2); duck_c->set_type(Duck::TYPE_TANGENT); - duck_c->set_name(name+".T2"); - add_duck(duck_c); + duck_c->set_name(name+".T2"); + add_duck(duck_c); duck_c->set_origin(duck_p); - duck_c->set_scalar(-0.33333333333333333); + duck_c->set_scalar(-TANGENT_HANDLE_SCALE); duck_c->set_tangent(true); bezier->p2=duck_p; bezier->c2=duck_c; add_bezier(bezier); } - + return true; } break; */ case ValueBase::TYPE_BLINEPOINT: { - + 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()); - if(!add_to_ducks(synfigapp::ValueDesc(value_node,0),canvas_view,transform_stack)) return false; etl::handle vertex_duck(last_duck()); @@ -1333,13 +1355,13 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle t1_duck(last_duck()); - + t1_duck->set_origin(vertex_duck); - t1_duck->set_scalar(-0.33333333333333333); + t1_duck->set_scalar(-TANGENT_HANDLE_SCALE); t1_duck->set_tangent(true); - + etl::handle t2_duck; - + // If the tangents are split if((*value_node->get_link("split"))(get_time()).get(bool())) { @@ -1347,7 +1369,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(vertex_duck); - t2_duck->set_scalar(0.33333333333333333); + t2_duck->set_scalar(TANGENT_HANDLE_SCALE); t2_duck->set_tangent(true); } else @@ -1356,49 +1378,51 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(vertex_duck); - t2_duck->set_scalar(0.33333333333333333); + t2_duck->set_scalar(TANGENT_HANDLE_SCALE); t2_duck->set_tangent(true); } return true; } - + } break; 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()); - + int i,first=-1; etl::handle bezier; etl::handle first_duck; etl::handle duck, tduck; - - for(i=0;ilink_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) - ) - ); - - // Add the vertex duck - if(vertex_value_node) + + // 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 - 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) @@ -1411,15 +1435,11 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_value_desc(synfigapp::ValueDesc(value_node,i)); - + if(param_desc) { if(!param_desc->get_origin().empty()) @@ -1429,7 +1449,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(last_duck()); /* ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(synfig::Point())) + if(value.same_type_as(synfig::Point())) duck->set_origin(value.get(synfig::Point())); */ } @@ -1438,6 +1458,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_transform_stack(transform_stack); duck->set_editable(false); - //duck->set_name(strprintf("%x-vertex",value_node->get_link(i).get())); + //duck->set_name(strprintf("%x-vertex",value_node->get_link(i).get())); duck->set_name(guid_string(synfigapp::ValueDesc(value_node,i))+".v"); duck->set_type(Duck::TYPE_VERTEX); @@ -1458,42 +1479,55 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(last_duck()); /* ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(synfig::Point())) + if(value.same_type_as(synfig::Point())) duck->set_origin(value.get(synfig::Point())); */ } } duck->set_guid(calc_duck_guid(synfigapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".v")); duck=add_similar_duck(duck); -// add_duck(duck); +// 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 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_as(synfig::Real())) + 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(); } @@ -1503,16 +1537,16 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_transform_stack(transform_stack); 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_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=add_similar_duck(tduck); // add_duck(duck); } tduck->set_origin(duck); - tduck->set_scalar(-0.33333333333333333); + tduck->set_scalar(-TANGENT_BEZIER_SCALE); tduck->set_tangent(true); - + bezier->p2=duck; bezier->c2=tduck; @@ -1520,11 +1554,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).clear(); duck->signal_user_click(2).connect( @@ -1532,50 +1563,39 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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); @@ -1586,7 +1606,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(last_duck()); /* ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(synfig::Point())) + if(value.same_type_as(synfig::Point())) duck->set_origin(value.get(synfig::Point())); */ // if(!param_desc->get_origin().empty()) @@ -1598,142 +1618,101 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_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)); } tduck->set_origin(duck); - tduck->set_scalar(0.33333333333333333); + tduck->set_scalar(TANGENT_BEZIER_SCALE); tduck->set_tangent(true); - + 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(-0.33333333333333333); - tduck->set_tangent(true); - - bezier->p2=duck; - bezier->c2=tduck; - bezier->signal_user_click(2).connect( + tduck->set_origin(duck); + tduck->set_scalar(-TANGENT_BEZIER_SCALE); + tduck->set_tangent(true); + + bezier->p2=duck; + bezier->c2=tduck; + + 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)); + &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; - + add_bezier(bezier); + bezier=0; } return true; } - else // Check for DynamicList + 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()); int i; - + if(value_node->get_contained_type()==ValueBase::TYPE_VECTOR) { Bezier bezier; for(i=0;ilink_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(last_duck()); - + if(param_desc) { synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); @@ -1741,7 +1720,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_origin(last_duck()); /* ValueBase value(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(synfig::Point())) + if(value.same_type_as(synfig::Point())) duck->set_origin(value.get(synfig::Point())); */ // if(!param_desc->get_origin().empty()) @@ -1763,11 +1742,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle