From 990720c031be929d9f635100fb80fb92f1abf6a0 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 12 Apr 2007 09:34:48 +0000 Subject: [PATCH] There was a large lump of code inside an "if (false)" block. I commented it all out to make it clearer that it's not being used. git-svn-id: http://svn.voria.com/code@459 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/valuenode_bline.cpp | 66 ++++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/synfig-core/trunk/src/synfig/valuenode_bline.cpp b/synfig-core/trunk/src/synfig/valuenode_bline.cpp index b0b7de1..7b95a20 100644 --- a/synfig-core/trunk/src/synfig/valuenode_bline.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_bline.cpp @@ -521,39 +521,39 @@ ValueNode_BLine::operator()(Time t)const next_scale=next_tangent_scalar; //ret.set_vertex((curr.get_vertex()-ret.get_vertex())*amount+ret.get_vertex()); - if(false) - { - // My first try - Point ref_point_begin( - ( - (*begin_iter->value_node)(off_time).get(prev).get_vertex() + - (*end_iter->value_node)(off_time).get(prev).get_vertex() - ) * 0.5 - ); - Point ref_point_end( - ( - (*begin_iter->value_node)(on_time).get(prev).get_vertex() + - (*end_iter->value_node)(on_time).get(prev).get_vertex() - ) * 0.5 - ); - Point ref_point_now( - ( - (*begin_iter->value_node)(t).get(prev).get_vertex() + - (*end_iter->value_node)(t).get(prev).get_vertex() - ) * 0.5 - ); - Point ref_point_linear((ref_point_end-ref_point_begin)*amount+ref_point_begin); - - ret.set_vertex( - (curr.get_vertex()-ret.get_vertex())*amount+ret.get_vertex() + - (ref_point_now-ref_point_linear) - ); - ret.set_tangent1((curr.get_tangent1()-ret.get_tangent1())*amount+ret.get_tangent1()); - ret.set_split_tangent_flag(curr.get_split_tangent_flag()); - if(ret.get_split_tangent_flag()) - ret.set_tangent2((curr.get_tangent2()-ret.get_tangent2())*amount+ret.get_tangent2()); - } - else +// if(false) +// { +// // My first try +// Point ref_point_begin( +// ( +// (*begin_iter->value_node)(off_time).get(prev).get_vertex() + +// (*end_iter->value_node)(off_time).get(prev).get_vertex() +// ) * 0.5 +// ); +// Point ref_point_end( +// ( +// (*begin_iter->value_node)(on_time).get(prev).get_vertex() + +// (*end_iter->value_node)(on_time).get(prev).get_vertex() +// ) * 0.5 +// ); +// Point ref_point_now( +// ( +// (*begin_iter->value_node)(t).get(prev).get_vertex() + +// (*end_iter->value_node)(t).get(prev).get_vertex() +// ) * 0.5 +// ); +// Point ref_point_linear((ref_point_end-ref_point_begin)*amount+ref_point_begin); +// +// ret.set_vertex( +// (curr.get_vertex()-ret.get_vertex())*amount+ret.get_vertex() + +// (ref_point_now-ref_point_linear) +// ); +// ret.set_tangent1((curr.get_tangent1()-ret.get_tangent1())*amount+ret.get_tangent1()); +// ret.set_split_tangent_flag(curr.get_split_tangent_flag()); +// if(ret.get_split_tangent_flag()) +// ret.set_tangent2((curr.get_tangent2()-ret.get_tangent2())*amount+ret.get_tangent2()); +// } +// else { // My second try -- 2.7.4