X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_segcalctangent.cpp;h=245bf62fe6d62f0780235cc6e550656466ad8a77;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=340004241907865dbbe2b51210bd2e8535d67f4e;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp index 3400042..245bf62 100644 --- a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp @@ -1,11 +1,12 @@ /* === 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-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** 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 @@ -58,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)); + throw Exception::BadType(ValueBase::type_local_name(x)); - segment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT); - amount_=ValueNode_Const::create(Real(0.5)); + set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT)); + set_link("amount",ValueNode_Const::create(Real(0.5))); } ValueNode_SegCalcTangent* @@ -78,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 curve(segment.p1,segment.p2,segment.t1,segment.t2); etl::derivative< etl::hermite > 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())); } @@ -101,7 +100,7 @@ ValueNode_SegCalcTangent::get_name()const String ValueNode_SegCalcTangent::get_local_name()const { - return _("SegCalcTangent"); + return _("Segment Tangent"); } bool @@ -111,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=0 && i=0 && i=0 && i