X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_segcalcvertex.cpp;h=ac3bd66a87733b6fdfb91a35f30841c83d9f14b1;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=8684f11708fd50f9677feaaf33a483d376a4fb34;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp index 8684f11..ac3bd66 100644 --- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file valuenode_segcalcvertex.cpp ** \brief Template File ** -** $Id: valuenode_segcalcvertex.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 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 */ /* ========================================================================= */ @@ -42,7 +44,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ @@ -57,10 +59,9 @@ ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &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)); - + + set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT)); + set_link("amount",ValueNode_Const::create(Real(0.5))); } ValueNode_SegCalcVertex* @@ -80,7 +81,7 @@ ValueNode_SegCalcVertex::operator()(Time t)const Segment segment((*segment_)(t).get(Segment())); etl::hermite curve(segment.p1,segment.p2,segment.t1,segment.t2); - + return curve((*amount_)(t).get(Real())); } @@ -94,9 +95,9 @@ ValueNode_SegCalcVertex::get_name()const String ValueNode_SegCalcVertex::get_local_name()const { - return _("SegCalcVertex"); + return _("Segment Vertex"); } - + bool ValueNode_SegCalcVertex::check_type(ValueBase::Type type) { @@ -169,7 +170,7 @@ ValueNode_SegCalcVertex::get_link_index_from_name(const String &name)const return 0; if(name=="amount") return 1; - + throw Exception::BadLinkName(name); }