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

diff --git a/synfig-core/trunk/src/synfig/valuenode_sine.cpp b/synfig-core/trunk/src/synfig/valuenode_sine.cpp
index 6dd19a4..df01850 100644
--- a/synfig-core/trunk/src/synfig/valuenode_sine.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_sine.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_sine.cpp
-**	\brief Template File
+**	\brief Implementation of the "Sine" valuenode conversion.
 **
-**	$Id: valuenode_sine.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
 */
 /* ========================================================================= */
@@ -48,26 +50,32 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-ValueNode_Sine::ValueNode_Sine(const ValueBase::Type &x):
-	LinkableValueNode(x)
+ValueNode_Sine::ValueNode_Sine(const ValueBase &value):
+	LinkableValueNode(value.get_type())
 {
-	switch(x)
+	switch(value.get_type())
 	{
 	case ValueBase::TYPE_REAL:
-		set_link("angle",ValueNode_Const::create(Angle::zero()));
-		set_link("amp",ValueNode_Const::create(Real(1)));
+		set_link("angle",ValueNode_Const::create(Angle::deg(90)));
+		set_link("amp",ValueNode_Const::create(value.get(Real())));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(x));
+		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
 	}
 
 	DCAST_HACK_ENABLE();
 }
 
+LinkableValueNode*
+ValueNode_Sine::create_new()const
+{
+	return new ValueNode_Sine(get_type());
+}
+
 ValueNode_Sine*
 ValueNode_Sine::create(const ValueBase &x)
 {
-	return new ValueNode_Sine(x.get_type());
+	return new ValueNode_Sine(x);
 }
 
 ValueNode_Sine::~ValueNode_Sine()
@@ -97,7 +105,7 @@ ValueNode_Sine::get_local_name()const
 {
 	return _("Sine");
 }
-		
+
 bool
 ValueNode_Sine::check_type(ValueBase::Type type)
 {
@@ -107,7 +115,8 @@ ValueNode_Sine::check_type(ValueBase::Type type)
 bool
 ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 	{
 		angle_=x;
@@ -126,7 +135,8 @@ ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Sine::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return angle_;
 	if(i==1)
@@ -144,7 +154,8 @@ ValueNode_Sine::link_count()const
 String
 ValueNode_Sine::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "angle";
 	if(i==1)
@@ -155,7 +166,8 @@ ValueNode_Sine::link_name(int i)const
 String
 ValueNode_Sine::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("Angle");
 	if(i==1)
@@ -170,12 +182,6 @@ ValueNode_Sine::get_link_index_from_name(const String &name)const
 		return 0;
 	if(name=="amp")
 		return 1;
-	
-	throw Exception::BadLinkName(name);
-}
 
-LinkableValueNode*
-ValueNode_Sine::create_new()const
-{
-	return new ValueNode_Sine(get_type());
+	throw Exception::BadLinkName(name);
 }