X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_segcalcvertex.cpp;h=91c55e0063442335bc973d6c1fd38300e7f0e7bf;hb=6c27d1b6cf4694a873542cb264c650893f2c6e0e;hp=57cf589820632ae9a35b091065cfc8d885841d81;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
index 57cf589..91c55e0 100644
--- a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_segcalcvertex.cpp
-**	\brief Template File
+**	\brief Implementation of the "Segment Vertex" valuenode conversion.
 **
-**	$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
 */
 /* ========================================================================= */
@@ -56,11 +58,10 @@ ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(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_SegCalcVertex*
@@ -80,7 +81,7 @@ ValueNode_SegCalcVertex::operator()(Time t)const
 	Segment segment((*segment_)(t).get(Segment()));
 
 	etl::hermite<Vector> 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)
 {
@@ -106,7 +107,8 @@ ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
 bool
 ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 	{
 		segment_=x;
@@ -125,7 +127,8 @@ ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_SegCalcVertex::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)
@@ -143,7 +146,8 @@ ValueNode_SegCalcVertex::link_count()const
 String
 ValueNode_SegCalcVertex::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "segment";
 	if(i==1)
@@ -154,7 +158,8 @@ ValueNode_SegCalcVertex::link_name(int i)const
 String
 ValueNode_SegCalcVertex::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)
@@ -169,7 +174,7 @@ ValueNode_SegCalcVertex::get_link_index_from_name(const String &name)const
 		return 0;
 	if(name=="amount")
 		return 1;
-	
+
 	throw Exception::BadLinkName(name);
 }