X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_timedswap.cpp;h=378535a83e4269eed9ca5fbfc5bdddf9dec05023;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=20be99f823b2775872040d23e55af89074f8751f;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
index 20be99f..378535a 100644
--- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
@@ -1,12 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_timedswap.cpp
-**	\brief Template File
+**	\brief Implementation of the "Timed Swap" valuenode conversion.
 **
 **	$Id$
 **
 **	\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
@@ -35,6 +35,7 @@
 #include "valuenode_const.h"
 #include <stdexcept>
 #include "color.h"
+#include <ETL/misc>
 
 #endif
 
@@ -82,7 +83,7 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value):
 		set_link("after",ValueNode_Const::create(value.get(Vector())));
 		break;
 	default:
-		throw Exception::BadType(ValueBase::type_name(get_type()));
+		throw Exception::BadType(ValueBase::type_local_name(get_type()));
 	}
 
 	set_link("time",ValueNode_Const::create(Time(2)));
@@ -97,98 +98,23 @@ ValueNode_TimedSwap::create(const ValueBase& x)
 	return new ValueNode_TimedSwap(x);
 }
 
-
 LinkableValueNode*
 ValueNode_TimedSwap::create_new()const
 {
 	return new ValueNode_TimedSwap(get_type());
 }
 
-
 synfig::ValueNode_TimedSwap::~ValueNode_TimedSwap()
 {
 	unlink_all();
 }
 
-
-
-bool
-ValueNode_TimedSwap::set_before(const ValueNode::Handle &x)
-{
-	if(!x || x->get_type()!=get_type()
-		&& !PlaceholderValueNode::Handle::cast_dynamic(x))
-		return false;
-
-	before=x;
-
-	return true;
-}
-
-ValueNode::Handle
-ValueNode_TimedSwap::get_before()const
-{
-	return before;
-}
-
-
-bool
-ValueNode_TimedSwap::set_after(const ValueNode::Handle &x)
-{
-	if(!x || x->get_type()!=get_type()
-		&& !PlaceholderValueNode::Handle::cast_dynamic(x))
-		return false;
-
-	after=x;
-
-	return true;
-}
-
-ValueNode::Handle
-ValueNode_TimedSwap::get_after()const
-{
-	return after;
-}
-
-
-bool
-ValueNode_TimedSwap::set_swap_time(const ValueNode::Handle &x)
-{
-	if(!x || (!ValueBase(x->get_type()).same_type_as(ValueBase::TYPE_TIME) &&
-			  !PlaceholderValueNode::Handle::cast_dynamic(x)))
-		return false;
-
-	swap_time=x;
-	return true;
-}
-
-ValueNode::Handle
-ValueNode_TimedSwap::get_swap_time()const
-{
-	return swap_time;
-}
-
-bool
-ValueNode_TimedSwap::set_swap_length(const ValueNode::Handle &x)
-{
-	if(!x || (!ValueBase(x->get_type()).same_type_as(ValueBase::TYPE_TIME) &&
-			  !PlaceholderValueNode::Handle::cast_dynamic(x)))
-		return false;
-
-	swap_length=x;
-	return true;
-}
-
-ValueNode::Handle
-ValueNode_TimedSwap::get_swap_length()const
-{
-	return swap_length;
-}
-
-
-
 synfig::ValueBase
 synfig::ValueNode_TimedSwap::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	Time swptime=(*swap_time)(t).get(Time());
 	Time swplength=(*swap_length)(t).get(Time());
 
@@ -220,7 +146,7 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 			{
 				float a=(float)(*after)(t).get(int());
 				float b=(float)(*before)(t).get(int());
-				return static_cast<int>((b-a)*amount+a+0.5f);
+				return round_to_int((b-a)*amount+a);
 			}
 		case ValueBase::TYPE_REAL:
 			{
@@ -245,7 +171,6 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 		}
 	}
 
-
 	/*! \todo this should interpolate from
 	**	before to after over the period defined
 	**	by swap_length */
@@ -253,17 +178,17 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 	return (*before)(t);
 }
 
-
 bool
-ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-	case 0: return set_before(x);
-	case 1: return set_after(x);
-	case 2: return set_swap_time(x);
-	case 3: return set_swap_length(x);
+	case 0: CHECK_TYPE_AND_SET_VALUE(before,      get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(after,       get_type());
+	case 2: CHECK_TYPE_AND_SET_VALUE(swap_time,   ValueBase::TYPE_TIME);
+	case 3: CHECK_TYPE_AND_SET_VALUE(swap_length, ValueBase::TYPE_TIME);
 	}
 	return false;
 }
@@ -271,13 +196,14 @@ ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_TimedSwap::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-	case 0: return get_before();
-	case 1: return get_after();
-	case 2: return get_swap_time();
-	case 3: return get_swap_length();
+	case 0: return before;
+	case 1: return after;
+	case 2: return swap_time;
+	case 3: return swap_length;
 	}
 	return 0;
 }
@@ -291,7 +217,8 @@ ValueNode_TimedSwap::link_count()const
 String
 ValueNode_TimedSwap::link_local_name(int i)const
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return _("Before");
@@ -305,7 +232,8 @@ ValueNode_TimedSwap::link_local_name(int i)const
 String
 ValueNode_TimedSwap::link_name(int i)const
 {
-	assert(i>=0 && i<4);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 	case 0: return "before";