X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=0d889827cdf3668883a5755d0edbc6e522eda794;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=a8b2751128795db20036f47a950eea31cca43f97;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index a8b2751..0d88982 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \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 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -34,16 +36,19 @@ #include #include "duckmatic.h" -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include @@ -54,17 +59,26 @@ #include "onemoment.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; 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 ================================================= */ @@ -78,7 +92,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); @@ -88,7 +102,12 @@ Duckmatic::Duckmatic(): Duckmatic::~Duckmatic() { clear_ducks(); - //sinfg::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 @@ -101,8 +120,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 @@ -113,7 +132,7 @@ Duckmatic::duck_is_selected(const etl::handle &duck)const } void -Duckmatic::set_grid_size(const sinfg::Vector &s) +Duckmatic::set_grid_size(const synfig::Vector &s) { if(grid_size!=s) { @@ -142,10 +161,8 @@ Duckmatic::set_guide_snap(bool x) } } - - Duckmatic::GuideList::iterator -Duckmatic::find_guide_x(sinfg::Point pos, float radius) +Duckmatic::find_guide_x(synfig::Point pos, float radius) { GuideList::iterator iter,best(guide_list_x_.end()); float dist(radius); @@ -162,7 +179,7 @@ Duckmatic::find_guide_x(sinfg::Point pos, float radius) } Duckmatic::GuideList::iterator -Duckmatic::find_guide_y(sinfg::Point pos, float radius) +Duckmatic::find_guide_y(synfig::Point pos, float radius) { GuideList::iterator iter,best(guide_list_y_.end()); float dist(radius); @@ -205,7 +222,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)); @@ -218,7 +235,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) @@ -233,42 +250,91 @@ 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) + + synfigapp::ValueDesc value_desc(x->get_value_desc()); + if(value_desc.parent_is_layer_param() && type & Duck::TYPE_POSITION) { - Layer::Handle layer(x->get_value_desc().get_layer()); + Layer::Handle layer(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; } + else if (value_desc.parent_is_value_node()) + { + if (ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node())) + return false; + if (value_desc.parent_is_linkable_value_node()) + { + LinkableValueNode::Handle parent_value_node(value_desc.get_parent_value_node()); + if (ValueNode_Composite::Handle::cast_dynamic(parent_value_node)) + { + if (parent_value_node->get_type() == ValueBase::TYPE_BLINEPOINT && + ValueNode_BLineCalcVertex::Handle::cast_dynamic( + parent_value_node->get_link("point"))) + return false; + } + else if (ValueNode_BLine::Handle::cast_dynamic(parent_value_node)) + { + ValueNode_Composite::Handle composite(ValueNode_Composite::Handle::cast_dynamic( + value_desc.get_value_node())); + if (composite && + ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("point"))) + return false; + } + } + } return true; } 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); + else + unselect_duck(iter->second); +} + +void +Duckmatic::unselect_all_ducks() +{ + DuckMap::const_iterator iter; + for(iter=duck_map.begin();iter!=duck_map.end();++iter) + unselect_duck(iter->second); } void -Duckmatic::select_ducks_in_box(const sinfg::Vector& tl,const sinfg::Vector& br) +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; vmin[0]=std::min(tl[0],br[0]); @@ -277,8 +343,8 @@ Duckmatic::select_ducks_in_box(const sinfg::Vector& tl,const sinfg::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()); @@ -312,14 +378,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; @@ -333,8 +399,14 @@ Duckmatic::get_duck_list()const { 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; } @@ -357,16 +429,15 @@ Duckmatic::toggle_select_duck(const etl::handle &duck) select_duck(duck); } - void -Duckmatic::translate_selected_ducks(const sinfg::Vector& vector) +Duckmatic::translate_selected_ducks(const synfig::Vector& vector) { if(duck_dragger_) duck_dragger_->duck_drag(this,vector); } void -Duckmatic::start_duck_drag(const sinfg::Vector& offset) +Duckmatic::start_duck_drag(const synfig::Vector& offset) { if(duck_dragger_) duck_dragger_->begin_duck_drag(this,offset); @@ -384,13 +455,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; @@ -403,8 +474,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; @@ -419,7 +489,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_; @@ -429,12 +499,12 @@ Duckmatic::snap_point_to_grid(const Point& x, float radius)const ret[1]=0; ret+=drag_offset_; } - + return ret; } void -DuckDrag_Translate::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& offset) +DuckDrag_Translate::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& offset) { last_translate_=Vector(0,0); { @@ -442,10 +512,10 @@ DuckDrag_Translate::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& o 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) { @@ -470,35 +540,111 @@ DuckDrag_Translate::end_duck_drag(Duckmatic* duckmatic) } void -DuckDrag_Translate::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector) +DuckDrag_Translate::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector) { const DuckList selected_ducks(duckmatic->get_selected_ducks()); DuckList::const_iterator iter; - sinfg::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_); + 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; - (*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; - (*iter)->set_trans_point(positions[i]+vect); - } - last_translate_=vect; -} + Time time(duckmatic->get_time()); + // drag the vertex and position ducks first + for (i=0,iter=selected_ducks.begin(); iter!=selected_ducks.end(); ++iter,i++) + { + etl::handle duck(*iter); + if(duck->get_type() == Duck::TYPE_VERTEX || duck->get_type() == Duck::TYPE_POSITION) + { + duck->set_trans_point(positions[i]+vect); + ValueNode_BLineCalcVertex::Handle bline_vertex; + ValueNode_Composite::Handle composite; + if ((bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) || + ((composite = ValueNode_Composite::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) && + composite->get_type() == ValueBase::TYPE_BLINEPOINT && + (bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("point"))))) + { + synfig::Point closest_point = duck->get_point(); + synfig::Real radius = 0.0; + ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline"))); + synfig::find_closest_point( + (*bline)(time), + duck->get_point(), + radius, + bline->get_loop(), + &closest_point); + duck->set_point(closest_point); + } + } + } + // then drag the others + 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) + (*iter)->set_trans_point(positions[i]+vect); + // then patch up the tangents for the vertices we've moved + DuckList duck_list(duckmatic->get_duck_list()); + for (iter=selected_ducks.begin(); iter!=selected_ducks.end(); ++iter) + { + etl::handle duck(*iter); + if (duck->get_type() == Duck::TYPE_VERTEX || duck->get_type() == Duck::TYPE_POSITION) + { + ValueNode_BLineCalcVertex::Handle bline_vertex; + ValueNode_Composite::Handle composite; + if ((bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) || + ((composite = ValueNode_Composite::Handle::cast_dynamic(duck->get_value_desc().get_value_node())) && + composite->get_type() == ValueBase::TYPE_BLINEPOINT && + (bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(composite->get_link("point"))))) + { + synfig::Real radius = 0.0; + ValueNode_BLine::Handle bline(ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")))); + Real amount = synfig::find_closest_point((*bline)(time), duck->get_point(), radius, bline->get_loop()); + int vertex_amount_index(bline_vertex->get_link_index_from_name("amount")); + ValueNode::Handle vertex_amount_value_node(bline_vertex->get_link(vertex_amount_index)); + DuckList::iterator iter; + for (iter=duck_list.begin(); iter!=duck_list.end(); iter++) + { + ValueNode::Handle duck_value_node((*iter)->get_value_desc().get_value_node()); + if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(duck_value_node)) + { + if (bline_tangent->get_link(bline_tangent->get_link_index_from_name("amount")) == vertex_amount_value_node) + { + switch (bline_tangent->get_type()) + { + case ValueBase::TYPE_ANGLE: + { + Angle angle((*bline_tangent)(time, amount).get(Angle())); + (*iter)->set_point(Point(Angle::cos(angle).get(), Angle::sin(angle).get())); + break; + } + case ValueBase::TYPE_REAL: + (*iter)->set_point(Point((*bline_tangent)(time, amount).get(Real()), 0)); + break; + case ValueBase::TYPE_VECTOR: + (*iter)->set_point((*bline_tangent)(time, amount).get(Vector())); + break; + default: + break; + } + } + } + else if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(duck_value_node)) + { + if (bline_width->get_link(bline_width->get_link_index_from_name("amount")) == vertex_amount_value_node) + (*iter)->set_point(Point((*bline_width)(time, amount).get(Real()), 0)); + } + } + } + } + } + last_translate_=vect; +} void Duckmatic::signal_edited_selected_ducks() @@ -506,19 +652,55 @@ Duckmatic::signal_edited_selected_ducks() const DuckList ducks(get_selected_ducks()); DuckList::const_iterator iter; - sinfg::GUIDSet old_set(selected_ducks); - + 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) { - selected_ducks=old_set; - throw String("Bad edit"); + 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()) + { + Point point((*iter)->get_point()); + bool changed = false; + + if (point[0] < 0) + { + point[0] = 0; + changed = true; + } + if (point[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; @@ -536,10 +718,6 @@ Duckmatic::signal_user_click_selected_ducks(int button) } } - - - - void Duckmatic::add_duck(const etl::handle &duck) { @@ -551,11 +729,11 @@ Duckmatic::add_duck(const etl::handle &duck) } else { - etl::smart_ptr point(new Point(duck->get_point())); + etl::smart_ptr point(new Point(duck->get_point())); duck->set_shared_point(point); duck_data_share_map[duck->get_data_guid()]=point; } - + duck_map.insert(duck); } @@ -569,7 +747,7 @@ Duckmatic::add_bezier(const etl::handle &bezier) } void -Duckmatic::add_stroke(etl::smart_ptr > stroke_point_list, const sinfg::Color& color) +Duckmatic::add_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color) { assert(stroke_point_list); @@ -586,30 +764,30 @@ Duckmatic::add_stroke(etl::smart_ptr > stroke_point_list 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 sinfg::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(); } @@ -618,7 +796,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 @@ -628,14 +806,14 @@ 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) { if(*iter!=duck && **iter==*duck) { - //sinfg::info("Found similar duck! (iter:%08x vs. duck:%08x)",iter->get(), duck.get()); + //synfig::info("Found similar duck! (iter:%08x vs. duck:%08x)",iter->get(), duck.get()); return *iter; } } @@ -668,7 +846,7 @@ Duckmatic::erase_bezier(const etl::handle &bezier) return; } } - sinfg::warning("Unable to find bezier to erase!"); + synfig::warning("Unable to find bezier to erase!"); } etl::handle @@ -686,15 +864,14 @@ Duckmatic::last_bezier()const return bezier_list_.back(); } - etl::handle -Duckmatic::find_duck(sinfg::Point point, sinfg::Real radius, Duck::Type type) +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; @@ -703,20 +880,24 @@ Duckmatic::find_duck(sinfg::Point point, sinfg::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() || + (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; } } @@ -727,24 +908,24 @@ Duckmatic::find_duck(sinfg::Point point, sinfg::Real radius, Duck::Type type) } etl::handle -Duckmatic::find_bezier(sinfg::Point point, sinfg::Real radius,float* location) +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 -Duckmatic::find_bezier(sinfg::Point pos, sinfg::Real scale, sinfg::Real radius, float* location) +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(); @@ -752,21 +933,21 @@ Duckmatic::find_bezier(sinfg::Point pos, sinfg::Real scale, sinfg::Real radius, 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 @@ -775,41 +956,40 @@ Duckmatic::find_bezier(sinfg::Point pos, sinfg::Real scale, sinfg::Real radius, 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 sinfg::String& filename)const +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()<<' ' <<(*iter)->color.get_g()<<' ' <<(*iter)->color.get_b() <::const_iterator viter; + std::list::const_iterator viter; for(viter=(*iter)->stroke_data->begin();viter!=(*iter)->stroke_data->end();++viter) { file<<"V " @@ -825,10 +1005,11 @@ Duckmatic::save_sketch(const sinfg::String& filename)const } bool -Duckmatic::load_sketch(const sinfg::String& filename) +Duckmatic::load_sketch(const synfig::String& filename) { + ChangeLocale change_locale(LC_NUMERIC, "C"); std::ifstream file(filename.c_str()); - + if(!file) return false; @@ -837,20 +1018,19 @@ Duckmatic::load_sketch(const sinfg::String& filename) if(line!="SKETCH") { - sinfg::error("Not a sketch"); + synfig::error("Not a sketch"); return false; } + etl::smart_ptr > stroke_data; - etl::smart_ptr > stroke_data; - while(file) { getline(file,line); if(line.empty()) continue; - + switch(line[0]) { case 'C': @@ -860,10 +1040,10 @@ Duckmatic::load_sketch(const sinfg::String& filename) float r,g,b; if(!strscanf(line,"C %f %f %f",&r, &g, &b)) { - sinfg::warning("Bad color line \"%s\"",line.c_str()); + synfig::warning("Bad color line \"%s\"",line.c_str()); r=0;g=0;b=0; } - add_persistant_stroke(stroke_data, sinfg::Color(r,g,b)); + add_persistent_stroke(stroke_data, synfig::Color(r,g,b)); } break; case 'V': @@ -871,36 +1051,29 @@ Duckmatic::load_sketch(const sinfg::String& filename) if(!stroke_data) { stroke_data.spawn(); - add_persistant_stroke(stroke_data, sinfg::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)) - sinfg::warning("Bad vertex \"%s\"",line.c_str()); + synfig::warning("Bad vertex \"%s\"",line.c_str()); else - stroke_data->push_back(sinfg::Vector(x,y)); + stroke_data->push_back(synfig::Vector(x,y)); break; default: - sinfg::warning("Unexpected sketch token '%c'",line[0]); + synfig::warning("Unexpected sketch token '%c'",line[0]); 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_; @@ -916,37 +1089,29 @@ 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 sinfgapp::ValueDesc& x) +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()); } -inline GUID calc_duck_guid(const sinfgapp::ValueDesc& x,const sinfg::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 { @@ -954,29 +1119,29 @@ inline GUID calc_duck_guid(const sinfgapp::ValueDesc& x,const sinfg::TransformSt } ret^=transform_stack.get_guid(); - return ret; + return ret; } /* Duck::Handle -Duckmatic::create_duck_from(const sinfgapp::ValueDesc& value_desc,etl::handle canvas_view, const sinfg::TransformStack& transform_stack, int modifier, sinfg::ParamDesc *param_desc) +Duckmatic::create_duck_from(const synfigapp::ValueDesc& value_desc,etl::handle 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=new Duck(); - + return duck; } */ bool -Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handle canvas_view, const sinfg::TransformStack& transform_stack, sinfg::ParamDesc *param_desc, int multiple) +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(); @@ -984,26 +1149,27 @@ Duckmatic::add_to_ducks(const sinfgapp::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 + 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 the ValueNode can be directly manipulated, // then set it as so. - duck->set_editable(sinfgapp::is_editable(value_desc.get_value_node())); + duck->set_editable(synfigapp::is_editable(value_desc.get_value_node())); } else { duck->set_editable(true); } - + if(param_desc && param_desc!=REAL_COOKIE) { if(!param_desc->get_origin().empty()) { - sinfgapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); + synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); /* - duck->set_origin(value_desc_origin.get_value(get_time()).get(sinfg::Point())); + duck->set_origin(value_desc_origin.get_value(get_time()).get(synfig::Point())); */ add_to_ducks(value_desc_origin,canvas_view, transform_stack); duck->set_origin(last_duck()); @@ -1011,33 +1177,28 @@ Duckmatic::add_to_ducks(const sinfgapp::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( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu - ), - 0.0f - ), - value_desc - ) - ); - - duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple)); - + 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)^synfig::GUID::hasher(multiple)); + add_duck(duck); return true; @@ -1045,14 +1206,14 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handleget_origin().empty()) { etl::handle duck=new Duck(); duck->set_type(Duck::TYPE_ANGLE); duck->set_transform_stack(transform_stack); - sinfg::Angle angle; - + 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)); @@ -1060,10 +1221,10 @@ Duckmatic::add_to_ducks(const sinfgapp::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(sinfgapp::is_editable(value_desc.get_value_node())); + duck->set_editable(synfigapp::is_editable(value_desc.get_value_node())); } else { @@ -1072,14 +1233,14 @@ Duckmatic::add_to_ducks(const sinfgapp::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()) { - sinfgapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); + synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); /* - duck->set_origin(value_desc_origin.get_value(get_time()).get(sinfg::Point())); + duck->set_origin(value_desc_origin.get_value(get_time()).get(synfig::Point())); */ add_to_ducks(value_desc_origin,canvas_view, transform_stack); duck->set_origin(last_duck()); @@ -1087,52 +1248,48 @@ Duckmatic::add_to_ducks(const sinfgapp::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( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu - ), - 0.0f - ), - value_desc - ) - ); - duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple)); + 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)^synfig::GUID::hasher(multiple)); add_duck(duck); return true; } break; - + case ValueBase::TYPE_VECTOR: { 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(sinfgapp::is_editable(value_desc.get_value_node())); + duck->set_editable(synfigapp::is_editable(value_desc.get_value_node())); } else { @@ -1140,17 +1297,17 @@ Duckmatic::add_to_ducks(const sinfgapp::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) { if(!param_desc->get_connect().empty()) { - sinfgapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_connect()); + 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 { @@ -1161,17 +1318,17 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handleget_box().empty()) { - sinfgapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_box()); + synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_box()); add_to_ducks(value_desc_origin,canvas_view, transform_stack); duck->set_box_duck(last_duck()); } - + // If we have an origin if(!param_desc->get_origin().empty()) { - sinfgapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); + synfigapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); /* - duck->set_origin(value_desc_origin.get_value(get_time()).get(sinfg::Point())); + duck->set_origin(value_desc_origin.get_value(get_time()).get(synfig::Point())); */ add_to_ducks(value_desc_origin,canvas_view, transform_stack); duck->set_origin(last_duck()); @@ -1179,94 +1336,83 @@ Duckmatic::add_to_ducks(const sinfgapp::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( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu - ), - 1.0f - ), - value_desc - ) - ); - duck->set_guid(calc_duck_guid(value_desc,transform_stack)^GUID::hasher(multiple)); + 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)^synfig::GUID::hasher(multiple)); add_duck(duck); return true; } break; -/* case ValueBase::TYPE_SEGMENT: + case ValueBase::TYPE_SEGMENT: { 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(sinfgapp::ValueDesc(value_node,0),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,0),canvas_view,transform_stack)) return false; bezier->p1=last_duck(); bezier->p1->set_type(Duck::TYPE_VERTEX); - if(!add_to_ducks(sinfgapp::ValueDesc(value_node,1),canvas_view,transform_stack)) + 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(sinfgapp::ValueDesc(value_node,2),canvas_view,transform_stack)) + 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(sinfgapp::ValueDesc(value_node,3),canvas_view,transform_stack)) + 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()) { Segment segment=value_desc.get_value(); etl::handle duck_p,duck_c; - sinfg::String name; + synfig::String name; if(param_desc) { name=param_desc->get_local_name(); @@ -1276,128 +1422,127 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handleset_name(name+".P1"); + duck_p=new 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 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 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 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(sinfgapp::ValueDesc(value_node,0),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,0),canvas_view,transform_stack)) return false; etl::handle vertex_duck(last_duck()); vertex_duck->set_type(Duck::TYPE_VERTEX); - if(!add_to_ducks(sinfgapp::ValueDesc(value_node,4),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack)) return false; 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())) { - if(!add_to_ducks(sinfgapp::ValueDesc(value_node,5),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,5),canvas_view,transform_stack)) return false; t2_duck=last_duck(); t2_duck->set_origin(vertex_duck); - t2_duck->set_scalar(0.33333333333333333); + t2_duck->set_scalar(TANGENT_HANDLE_SCALE); t2_duck->set_tangent(true); } else { - if(!add_to_ducks(sinfgapp::ValueDesc(value_node,4),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,4),canvas_view,transform_stack)) return false; t2_duck=last_duck(); t2_duck->set_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(sinfgapp::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) @@ -1408,28 +1553,26 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handlesignal_user_click(2).connect( sigc::bind( sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu - ), - 1.0f - ), - sinfgapp::ValueDesc(value_node,i) - ) - ); - duck->set_value_desc(sinfgapp::ValueDesc(value_node,i)); - + 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)); + if(param_desc) { if(!param_desc->get_origin().empty()) { - sinfgapp::ValueDesc value_desc_origin(value_desc.get_layer(),param_desc->get_origin()); + 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(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(sinfg::Point())) - duck->set_origin(value.get(sinfg::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())); */ } } @@ -1437,6 +1580,7 @@ Duckmatic::add_to_ducks(const sinfgapp::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(guid_string(sinfgapp::ValueDesc(value_node,i))+".v"); + //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); if(param_desc) { if(!param_desc->get_origin().empty()) { - sinfgapp::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(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(sinfg::Point())) - duck->set_origin(value.get(sinfg::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())); */ } } - duck->set_guid(calc_duck_guid(sinfgapp::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); +// 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(sinfgapp::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(sinfgapp::ValueDesc(value_node,i))+".w"); + 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(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_hint()).get_value(get_time())); - if(value.same_as(sinfg::Real())) - width->set_scalar(value.get(sinfg::Real())*0.5f); + 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 - sinfg::error("Unable to add width duck!"); + 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(sinfgapp::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(); } @@ -1501,17 +1658,17 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handleset_transform_stack(transform_stack); tduck->set_editable(false); - tduck->set_name(guid_string(sinfgapp::ValueDesc(value_node,i))+".t1"); -// tduck->set_name(strprintf("%x-tangent1",value_node->get_link(i).get())); - tduck->set_guid(calc_duck_guid(sinfgapp::ValueDesc(value_node,i),transform_stack)^GUID::hasher(".t1")); + 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)^synfig::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; @@ -1519,238 +1676,198 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handlesignal_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 - ), - sinfgapp::ValueDesc(value_node,i) - ) - ); - duck->set_value_desc(sinfgapp::ValueDesc(value_node,i)); + 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)); 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(sinfgapp::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(sinfgapp::ValueDesc(value_node,i))+".t2"); - tduck->set_guid(calc_duck_guid(sinfgapp::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(sinfgapp::ValueDesc(value_node,i))+".t1"); - tduck->set_guid(calc_duck_guid(sinfgapp::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)^synfig::GUID::hasher(".t2")); tduck->set_editable(false); tduck=add_similar_duck(tduck); // add_duck(duck); if(param_desc) { - sinfgapp::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(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(sinfg::Point())) - duck->set_origin(value.get(sinfg::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(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()).get(sinfg::Point())); +// duck->set_origin(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()).get(synfig::Point())); } 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 - ), - sinfgapp::ValueDesc(value_node,0) - ) - ); - duck->set_value_desc(sinfgapp::ValueDesc(value_node,0)); + 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_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(sinfgapp::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(sinfg::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(sinfg::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)^synfig::GUID::hasher(".t1")); + //add_duck(duck); } - */ - - // Add the tangent1 duck - if(vertex_value_node) - { - if(!add_to_ducks(sinfgapp::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(sinfgapp::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(sinfgapp::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( - sigc::bind( - sigc::mem_fun( - *canvas_view, - &studio::CanvasView::popup_param_menu_bezier - ), - sinfgapp::ValueDesc(value_node,first) - ) - ); - duck->signal_user_click(2).clear(); - duck->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::bind( sigc::mem_fun( *canvas_view, - &studio::CanvasView::popup_param_menu - ), - 1.0f - ), - sinfgapp::ValueDesc(value_node,first) - ) - ); - duck->set_value_desc(sinfgapp::ValueDesc(value_node,first)); + &studio::CanvasView::popup_param_menu), + false), + 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; + etl::handle first_duck, duck; + int first = -1; for(i=0;ilink_count();i++) - { + { if(!value_node->list[i].status_at_time(get_time())) continue; - if(!add_to_ducks(sinfgapp::ValueDesc(value_node,i),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,i),canvas_view,transform_stack)) return false; - etl::handle duck(last_duck()); - - if(param_desc) + duck = last_duck(); + + // remember the index of the first vertex we didn't skip + if (first == -1) { - sinfgapp::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()); + first = i; + first_duck = duck; + } + + 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()); /* - ValueBase value(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time())); - if(value.same_as(sinfg::Point())) - duck->set_origin(value.get(sinfg::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(sinfgapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()).get(sinfg::Point())); +// last_duck()->set_origin(synfigapp::ValueDesc(value_desc.get_layer(),param_desc->get_origin()).get_value(get_time()).get(synfig::Point())); } duck->set_type(Duck::TYPE_VERTEX); bezier.p1=bezier.p2;bezier.c1=bezier.c2; bezier.p2=bezier.c2=duck; - if(i>0) + if (first != i) { handle bezier_(new Bezier()); bezier_->p1=bezier.p1; @@ -1762,25 +1879,42 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handleget_loop() && first != -1 && first_duck != duck) + { + duck = first_duck; + + bezier.p1=bezier.p2;bezier.c1=bezier.c2; + bezier.p2=bezier.c2=duck; + + handle 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;ilink_count();i++) { if(!value_node->list[i].status_at_time(get_time())) continue; - if(!add_to_ducks(sinfgapp::ValueDesc(value_node,i),canvas_view,transform_stack)) + if(!add_to_ducks(synfigapp::ValueDesc(value_node,i),canvas_view,transform_stack)) return false; } } - */ else return false; } @@ -1788,11 +1922,10 @@ Duckmatic::add_to_ducks(const sinfgapp::ValueDesc& value_desc,etl::handle