X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_bline.cpp;h=fc3e9165aa20d711f580683a454ad619e733ac12;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=dde8a459afbd2b57203ac696fcd7b6718e3aeaef;hpb=8c959946a8e6cacbc91a42b468af71b399cf014c;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp index dde8a45..fc3e916 100644 --- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp @@ -277,7 +277,7 @@ synfig::find_closest_point(const ValueBase &bline, const Point &pos, Real &radiu Real amount = (best_index + best_time + loop_adjust) / (size + loop_adjust); return amount; } - + return 0.0; } @@ -445,9 +445,14 @@ ValueNode_BLine::create_list_entry(int index, Time time, Real origin) return ret; } +static int instance_count; + ValueBase ValueNode_BLine::operator()(Time t)const { + if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS")) + printf("%s:%d operator()\n", __FILE__, __LINE__); + std::vector ret_list; std::vector::const_iterator iter,first_iter; @@ -814,35 +819,6 @@ ValueNode_BLine::link_local_name(int i)const return etl::strprintf(_("Vertex %03d"),i+1); } -ValueNode* -ValueNode_BLine::clone(const GUID& deriv_guid)const -{ - { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; } - - ValueNode_BLine* ret=new ValueNode_BLine(); - ret->set_guid(get_guid()^deriv_guid); - - std::vector::const_iterator iter; - - for(iter=list.begin();iter!=list.end();++iter) - { - if(iter->value_node->is_exported()) - ret->add(*iter); - else - { - ListEntry list_entry(*iter); - //list_entry.value_node=find_value_node(iter->value_node->get_guid()^deriv_guid).get(); - //if(!list_entry.value_node) - list_entry.value_node=iter->value_node->clone(deriv_guid); - ret->add(list_entry); - //ret->list.back().value_node=iter->value_node.clone(); - } - } - ret->set_loop(get_loop()); - - return ret; -} - String ValueNode_BLine::get_name()const { @@ -858,8 +834,7 @@ ValueNode_BLine::get_local_name()const LinkableValueNode* ValueNode_BLine::create_new()const { - assert(0); - return 0; + return new ValueNode_BLine(); } bool