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

diff --git a/synfig-core/trunk/src/synfig/valuenode_cos.cpp b/synfig-core/trunk/src/synfig/valuenode_cos.cpp
index 6b08859..f3e4793 100644
--- a/synfig-core/trunk/src/synfig/valuenode_cos.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_cos.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	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
@@ -60,7 +60,7 @@ ValueNode_Cos::ValueNode_Cos(const ValueBase &value):
 		set_link("amp",ValueNode_Const::create(value.get(Real())));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(value.get_type()));
+		throw Exception::BadType(ValueBase::type_local_name(value.get_type()));
 	}
 
 	DCAST_HACK_ENABLE();
@@ -86,11 +86,13 @@ ValueNode_Cos::~ValueNode_Cos()
 ValueBase
 ValueNode_Cos::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	return
 		Angle::cos(
 			(*angle_)(t).get(Angle())
-		).get() * (*amp_)(t).get(Real())
-	;
+		).get() * (*amp_)(t).get(Real());
 }
 
 
@@ -113,22 +115,16 @@ ValueNode_Cos::check_type(ValueBase::Type type)
 }
 
 bool
-ValueNode_Cos::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Cos::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<link_count());
 
-	if(i==0)
-	{
-		angle_=x;
-		signal_child_changed()(i);signal_value_changed()();
-		return true;
-	}
-	if(i==1)
+	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;
 }
 
@@ -137,10 +133,11 @@ ValueNode_Cos::get_link_vfunc(int i)const
 {
 	assert(i>=0 && i<link_count());
 
-	if(i==0)
-		return angle_;
-	if(i==1)
-		return amp_;
+	switch(i)
+	{
+	case 0: return angle_;
+	case 1: return amp_;
+	}
 
 	return 0;
 }
@@ -156,10 +153,12 @@ ValueNode_Cos::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
 
-	if(i==0)
-		return "angle";
-	if(i==1)
-		return "amp";
+	switch(i)
+	{
+	case 0: return "angle";
+	case 1: return "amp";
+	}
+
 	return String();
 }
 
@@ -168,20 +167,20 @@ ValueNode_Cos::link_local_name(int i)const
 {
 	assert(i>=0 && i<link_count());
 
-	if(i==0)
-		return _("Angle");
-	if(i==1)
-		return _("Amplitude");
+	switch(i)
+	{
+	case 0: return _("Angle");
+	case 1: return _("Amplitude");
+	}
+
 	return String();
 }
 
 int
 ValueNode_Cos::get_link_index_from_name(const String &name)const
 {
-	if(name=="angle")
-		return 0;
-	if(name=="amp")
-		return 1;
+	if(name=="angle")	return 0;
+	if(name=="amp")		return 1;
 
 	throw Exception::BadLinkName(name);
 }