X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_segcalctangent.cpp;h=245bf62fe6d62f0780235cc6e550656466ad8a77;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b875c6227caa53a087c992296db790772cd4fc06;hpb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
index b875c62..245bf62 100644
--- 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
@@ -59,7 +59,7 @@ ValueNode_SegCalcTangent::ValueNode_SegCalcTangent(const ValueBase::Type &x):
 	LinkableValueNode(x)
 {
 	if(x!=ValueBase::TYPE_VECTOR)
-		throw Exception::BadType(ValueBase::type_name(x));
+		throw Exception::BadType(ValueBase::type_local_name(x));
 
 	set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
 	set_link("amount",ValueNode_Const::create(Real(0.5)));
@@ -79,17 +79,15 @@ ValueNode_SegCalcTangent::~ValueNode_SegCalcTangent()
 ValueBase
 ValueNode_SegCalcTangent::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	Segment segment((*segment_)(t).get(Segment()));
 
 	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 +110,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;
 }