Improve the derivative class for hermites. Compare http://synfig.org/images/a/a8...

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_segcalctangent.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
index 9e05001..a4b735c 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     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
@@ -84,12 +84,7 @@ ValueNode_SegCalcTangent::operator()(Time t)const
        etl::hermite<Vector> curve(segment.p1,segment.p2,segment.t1,segment.t2);
        etl::derivative< etl::hermite<Vector> > deriv(curve);
 
-#ifdef ETL_FIXED_DERIVATIVE
-       return deriv((*amount_)(t).get(Real()))*(0.5);
-#else
-       return deriv((*amount_)(t).get(Real()))*(-0.5);
-#endif
-
+       return deriv((*amount_)(t).get(Real()));
 }
 
 
@@ -112,21 +107,14 @@ ValueNode_SegCalcTangent::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle value)
 {
        assert(i>=0 && i<link_count());
 
-       if(i==0)
-       {
-               segment_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
-       }
-       if(i==1)
+       switch(i)
        {
-               amount_=x;
-               signal_child_changed()(i);signal_value_changed()();
-               return true;
+       case 0: CHECK_TYPE_AND_SET_VALUE(segment_, ValueBase::TYPE_SEGMENT);
+       case 1: CHECK_TYPE_AND_SET_VALUE(amount_,  ValueBase::TYPE_REAL);
        }
        return false;
 }