From fb8370e0abee3275c3b7d80aa8bff2a04656542d Mon Sep 17 00:00:00 2001 From: dooglus Date: Mon, 2 Apr 2007 17:09:54 +0000 Subject: [PATCH] When merging tangents, use the average of the two tangents we're merging, rather than arbitrarily using the old value of one of them. git-svn-id: http://svn.voria.com/code@420 1f10aa63-cdf2-0310-b900-c93c546f37ac --- .../synfigapp/actions/blinepointtangentmerge.cpp | 28 ++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp index 91759ae..fd32ef1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp @@ -159,16 +159,22 @@ Action::BLinePointTangentMerge::prepare() add_action(action); } + + // the merged tangent should be the average of the 2 tangents we're merging + ValueBase average(((Vector)((*value_node->get_link("t1"))(time)) + + (Vector)((*value_node->get_link("t2"))(time))) / 2); + { + // set tangent1 action=Action::create("value_desc_set"); if(!action) throw Error(_("Couldn't find action \"value_desc_set\"")); action->set_param("canvas",get_canvas()); action->set_param("canvas_interface",get_canvas_interface()); - action->set_param("value_desc",ValueDesc(value_node,5)); + action->set_param("value_desc",ValueDesc(value_node,4)); action->set_param("time",time); - action->set_param("new_value",(*value_node->get_link("t1"))(time)); + action->set_param("new_value",average); assert(action->is_ready()); if(!action->is_ready()) @@ -177,4 +183,22 @@ Action::BLinePointTangentMerge::prepare() add_action(action); } + { + // set tangent2 + action=Action::create("value_desc_set"); + if(!action) + throw Error(_("Couldn't find action \"value_desc_set\"")); + + action->set_param("canvas",get_canvas()); + action->set_param("canvas_interface",get_canvas_interface()); + action->set_param("value_desc",ValueDesc(value_node,5)); + action->set_param("time",time); + action->set_param("new_value",average); + + assert(action->is_ready()); + if(!action->is_ready()) + throw Error(Error::TYPE_NOTREADY); + + add_action(action); + } } -- 2.7.4