X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_timedswap.cpp;h=39cc91d97ca0800fe16cbe79b8ec23e5fbdf27ff;hb=b37086823c5bfee9c76f6b265584a414100963ef;hp=fda0eeb59c1bfa3ea09704dcc7f861d4838897f8;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
index fda0eeb..39cc91d 100644
--- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
@@ -1,20 +1,22 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_timedswap.cpp
-**	\brief Template File
+**	\brief Implementation of the "Timed Swap" valuenode conversion.
 **
-**	$Id: valuenode_timedswap.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
 */
 /* ========================================================================= */
@@ -33,6 +35,7 @@
 #include "valuenode_const.h"
 #include <stdexcept>
 #include "color.h"
+#include <ETL/misc>
 
 #endif
 
@@ -50,13 +53,41 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-ValueNode_TimedSwap::ValueNode_TimedSwap(ValueBase::Type type):
-	LinkableValueNode(type)
+ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value):
+	LinkableValueNode(value.get_type())
 {
-	set_before(ValueNode_Const::create(type));
-	set_after(ValueNode_Const::create(type));
-	set_swap_time_real(1.0);
-	set_swap_length_real(1.0);
+	switch(get_type())
+	{
+	case ValueBase::TYPE_ANGLE:
+		set_link("before",ValueNode_Const::create(value.get(Angle())));
+		set_link("after",ValueNode_Const::create(value.get(Angle())));
+		break;
+	case ValueBase::TYPE_COLOR:
+		set_link("before",ValueNode_Const::create(value.get(Color())));
+		set_link("after",ValueNode_Const::create(value.get(Color())));
+		break;
+	case ValueBase::TYPE_INTEGER:
+		set_link("before",ValueNode_Const::create(value.get(int())));
+		set_link("after",ValueNode_Const::create(value.get(int())));
+		break;
+	case ValueBase::TYPE_REAL:
+		set_link("before",ValueNode_Const::create(value.get(Real())));
+		set_link("after",ValueNode_Const::create(value.get(Real())));
+		break;
+	case ValueBase::TYPE_TIME:
+		set_link("before",ValueNode_Const::create(value.get(Time())));
+		set_link("after",ValueNode_Const::create(value.get(Time())));
+		break;
+	case ValueBase::TYPE_VECTOR:
+		set_link("before",ValueNode_Const::create(value.get(Vector())));
+		set_link("after",ValueNode_Const::create(value.get(Vector())));
+		break;
+	default:
+		throw Exception::BadType(ValueBase::type_name(get_type()));
+	}
+
+	set_link("time",ValueNode_Const::create(Time(2)));
+	set_link("length",ValueNode_Const::create(Time(1)));
 
 	DCAST_HACK_ENABLE();
 }
@@ -64,7 +95,7 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(ValueBase::Type type):
 ValueNode_TimedSwap*
 ValueNode_TimedSwap::create(const ValueBase& x)
 {
-	return new ValueNode_TimedSwap(x.get_type());
+	return new ValueNode_TimedSwap(x);
 }
 
 
@@ -120,20 +151,13 @@ ValueNode_TimedSwap::get_after()const
 }
 
 
-void
-ValueNode_TimedSwap::set_swap_time_real(Time x)
-{
-	set_swap_time(ValueNode_Const::create(x));
-}
-
 bool
 ValueNode_TimedSwap::set_swap_time(const ValueNode::Handle &x)
 {
-	if(!x
-		|| !ValueBase(ValueBase::TYPE_TIME).same_as(x->get_type())
-		&& !PlaceholderValueNode::Handle::cast_dynamic(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;
 }
@@ -144,21 +168,13 @@ ValueNode_TimedSwap::get_swap_time()const
 	return swap_time;
 }
 
-void
-ValueNode_TimedSwap::set_swap_length_real(Time x)
-{
-	set_swap_length(ValueNode_Const::create(x));
-}
-
 bool
 ValueNode_TimedSwap::set_swap_length(const ValueNode::Handle &x)
 {
-	if(!x || (
-		!ValueBase(ValueBase::TYPE_TIME).same_as(x->get_type())
-		&& !PlaceholderValueNode::Handle::cast_dynamic(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;
 }
@@ -179,27 +195,15 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 
 	if(t>swptime)
 		return (*after)(t);
-	
+
 	if(t<=swptime && t>swptime-swplength)
 	{
 		Real amount=(swptime-t)/swplength;
 		// if amount==0.0, then we are after
 		// if amount==1.0, then we are before
-		
+
 		switch(get_type())
 		{
-		case ValueBase::TYPE_REAL:
-			{
-				Real a=(*after)(t).get(Real());
-				Real b=(*before)(t).get(Real());
-				return (b-a)*amount+a;
-			}
-		case ValueBase::TYPE_VECTOR:
-			{
-				Vector a=(*after)(t).get(Vector());
-				Vector b=(*before)(t).get(Vector());
-				return (b-a)*amount+a;
-			}
 		case ValueBase::TYPE_ANGLE:
 			{
 				Angle a=(*after)(t).get(Angle());
@@ -217,7 +221,25 @@ 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:
+			{
+				Real a=(*after)(t).get(Real());
+				Real b=(*before)(t).get(Real());
+				return (b-a)*amount+a;
+			}
+		case ValueBase::TYPE_TIME:
+			{
+				Time a=(*after)(t).get(Time());
+				Time b=(*before)(t).get(Time());
+				return (b-a)*amount+a;
+			}
+		case ValueBase::TYPE_VECTOR:
+			{
+				Vector a=(*after)(t).get(Vector());
+				Vector b=(*before)(t).get(Vector());
+				return (b-a)*amount+a;
 			}
 		default:
 			break;
@@ -239,16 +261,12 @@ ValueNode_TimedSwap::set_link_vfunc(int i,ValueNode::Handle x)
 	assert(i>=0 && i<4);
 	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: return set_before(x);
+	case 1: return set_after(x);
+	case 2: return set_swap_time(x);
+	case 3: return set_swap_length(x);
 	}
-	return 0;
+	return false;
 }
 
 ValueNode::LooseHandle
@@ -257,14 +275,10 @@ ValueNode_TimedSwap::get_link_vfunc(int i)const
 	assert(i>=0 && i<4);
 	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 get_before();
+	case 1: return get_after();
+	case 2: return get_swap_time();
+	case 3: return get_swap_length();
 	}
 	return 0;
 }
@@ -281,17 +295,13 @@ ValueNode_TimedSwap::link_local_name(int i)const
 	assert(i>=0 && i<4);
 	switch(i)
 	{
-	case 0:
-		return _("Before");
-	case 1:
-		return _("After");
-	case 2:
-		return _("Swap Time");
-	case 3:
-		return _("Swap Duration");
+	case 0: return _("Before");
+	case 1: return _("After");
+	case 2: return _("Swap Time");
+	case 3: return _("Swap Duration");
+	default:return String();
 	}
-	return 0;
-}	
+}
 
 String
 ValueNode_TimedSwap::link_name(int i)const
@@ -299,29 +309,21 @@ ValueNode_TimedSwap::link_name(int i)const
 	assert(i>=0 && i<4);
 	switch(i)
 	{
-	case 0:
-		return "before";
-	case 1:
-		return "after";
-	case 2:
-		return "time";
-	case 3:
-		return "length";
+	case 0: return "before";
+	case 1: return "after";
+	case 2: return "time";
+	case 3: return "length";
+	default:return String();
 	}
-	return 0;
-}	
+}
 
 int
 ValueNode_TimedSwap::get_link_index_from_name(const String &name)const
 {
-	if(name=="before")
-		return 0;
-	if(name=="after")
-		return 1;
-	if(name=="time")
-		return 2;
-	if(name=="length")
-		return 3;
+	if(name=="before")	return 0;
+	if(name=="after")	return 1;
+	if(name=="time")	return 2;
+	if(name=="length")	return 3;
 
 	throw Exception::BadLinkName(name);
 }
@@ -341,7 +343,11 @@ ValueNode_TimedSwap::get_local_name()const
 bool
 ValueNode_TimedSwap::check_type(ValueBase::Type type)
 {
-	if(!type)
-		return false;
-	return true;
+	return
+		type==ValueBase::TYPE_ANGLE ||
+		type==ValueBase::TYPE_COLOR ||
+		type==ValueBase::TYPE_INTEGER ||
+		type==ValueBase::TYPE_REAL ||
+		type==ValueBase::TYPE_TIME ||
+		type==ValueBase::TYPE_VECTOR;
 }