X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_blinecalctangent.cpp;h=822de68a0bf0c513ae69375b2702b04c4afce344;hb=6c27d1b6cf4694a873542cb264c650893f2c6e0e;hp=778fb429ad43a70c61b911792b2c90f521311a1c;hpb=1e9792b864c8565ac9d05796eb91fb03fb09a64d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
index 778fb42..822de68 100644
--- a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_blinecalctangent.cpp
-**	\brief Template File
+**	\brief Implementation of the "BLine Tangent" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -57,8 +58,8 @@ using namespace synfig;
 ValueNode_BLineCalcTangent::ValueNode_BLineCalcTangent(const ValueBase::Type &x):
 	LinkableValueNode(x)
 {
-	if(x!=ValueBase::TYPE_VECTOR)
-		throw Exception::BadType(ValueBase::type_name(x));
+	if(x!=ValueBase::TYPE_ANGLE && x!=ValueBase::TYPE_VECTOR)
+		throw Exception::BadType(ValueBase::type_local_name(x));
 
 	ValueNode_BLine* value_node(new ValueNode_BLine());
 	set_link("bline",value_node);
@@ -69,7 +70,7 @@ ValueNode_BLineCalcTangent::ValueNode_BLineCalcTangent(const ValueBase::Type &x)
 LinkableValueNode*
 ValueNode_BLineCalcTangent::create_new()const
 {
-	return new ValueNode_BLineCalcTangent(ValueBase::TYPE_VECTOR);
+	return new ValueNode_BLineCalcTangent(get_type());
 }
 
 ValueNode_BLineCalcTangent*
@@ -95,7 +96,13 @@ ValueNode_BLineCalcTangent::operator()(Time t)const
 	BLinePoint blinepoint0, blinepoint1;
 
 	if (!looped) size--;
-	if (size < 1) return Vector();
+	if (size < 1)
+		switch (get_type())
+		{
+			case ValueBase::TYPE_ANGLE:  return Angle();
+			case ValueBase::TYPE_VECTOR: return Vector();
+			default: assert(0); return ValueBase();
+		}
 	if (loop)
 	{
 		amount = amount - int(amount);
@@ -121,9 +128,19 @@ ValueNode_BLineCalcTangent::operator()(Time t)const
 	etl::derivative< etl::hermite<Vector> > deriv(curve);
 
 #ifdef ETL_FIXED_DERIVATIVE
-	return deriv(amount-from_vertex)*(0.5);
+	switch (get_type())
+	{
+		case ValueBase::TYPE_ANGLE:  return (deriv(amount-from_vertex)*(0.5)).angle();
+		case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex)*(0.5);
+		default: assert(0); return ValueBase();
+	}
 #else
-	return deriv(amount-from_vertex)*(-0.5);
+	switch (get_type())
+	{
+		case ValueBase::TYPE_ANGLE:  return (deriv(amount-from_vertex)*(-0.5)).angle();
+		case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex)*(-0.5);
+		default: assert(0); return ValueBase();
+	}
 #endif
 }
 
@@ -219,5 +236,6 @@ ValueNode_BLineCalcTangent::get_link_index_from_name(const String &name)const
 bool
 ValueNode_BLineCalcTangent::check_type(ValueBase::Type type)
 {
-	return type==ValueBase::TYPE_VECTOR;
+	return (type==ValueBase::TYPE_ANGLE ||
+			type==ValueBase::TYPE_VECTOR);
 }