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

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
index c58bf3e..245bf62 100644
--- a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_segcalctangent.cpp
-**	\brief Template File
+**	\brief Implementation of the "Segment Tangent" valuenode conversion.
 **
-**	$Id: valuenode_segcalctangent.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -57,10 +59,10 @@ ValueNode_SegCalcTangent::ValueNode_SegCalcTangent(const ValueBase::Type &x):
 	LinkableValueNode(x)
 {
 	if(x!=ValueBase::TYPE_VECTOR)
-		throw Exception::BadType(ValueBase::type_name(x));
-	
-	segment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT);
-	amount_=ValueNode_Const::create(Real(0.5));
+		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)));
 }
 
 ValueNode_SegCalcTangent*
@@ -77,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()));
 }
 
 
@@ -100,9 +100,9 @@ ValueNode_SegCalcTangent::get_name()const
 String
 ValueNode_SegCalcTangent::get_local_name()const
 {
-	return _("SegCalcTangent");
+	return _("Segment Tangent");
 }
-		
+
 bool
 ValueNode_SegCalcTangent::check_type(ValueBase::Type type)
 {
@@ -110,20 +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==1);
-	if(i==0)
-	{
-		segment_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	assert(i>=0 && i<link_count());
+
+	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;
 }
@@ -131,7 +125,8 @@ ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_SegCalcTangent::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return segment_;
 	if(i==1)
@@ -149,7 +144,8 @@ ValueNode_SegCalcTangent::link_count()const
 String
 ValueNode_SegCalcTangent::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "segment";
 	if(i==1)
@@ -160,7 +156,8 @@ ValueNode_SegCalcTangent::link_name(int i)const
 String
 ValueNode_SegCalcTangent::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("Segment");
 	if(i==1)
@@ -175,7 +172,7 @@ ValueNode_SegCalcTangent::get_link_index_from_name(const String &name)const
 		return 0;
 	if(name=="amount")
 		return 1;
-	
+
 	throw Exception::BadLinkName(name);
 }