X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_sine.cpp;h=6e42dc778c482cd597578362e58e0deb09574d61;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=d3dec4e19e4c0a41fde8f90c4b14d05839237850;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_sine.cpp b/synfig-core/trunk/src/synfig/valuenode_sine.cpp
index d3dec4e..6e42dc7 100644
--- a/synfig-core/trunk/src/synfig/valuenode_sine.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_sine.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_sine.cpp
-**	\brief Template File
+**	\brief Implementation of the "Sine" valuenode conversion.
 **
 **	$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
@@ -49,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()
@@ -79,6 +86,9 @@ ValueNode_Sine::~ValueNode_Sine()
 ValueBase
 ValueNode_Sine::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	return
 		Angle::sin(
 			(*angle_)(t).get(Angle())
@@ -106,20 +116,14 @@ ValueNode_Sine::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Sine::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i==0 || i==1);
-	if(i==0)
-	{
-		angle_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	assert(i>=0 && i<link_count());
+
+	switch(i)
 	{
-		amp_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(angle_, ValueBase::TYPE_ANGLE);
+	case 1: CHECK_TYPE_AND_SET_VALUE(amp_,   ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -127,7 +131,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)
@@ -145,7 +150,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)
@@ -156,7 +162,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)
@@ -174,9 +181,3 @@ ValueNode_Sine::get_link_index_from_name(const String &name)const
 
 	throw Exception::BadLinkName(name);
 }
-
-LinkableValueNode*
-ValueNode_Sine::create_new()const
-{
-	return new ValueNode_Sine(get_type());
-}