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

diff --git a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
index b456bf9..39cc91d 100644
--- a/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timedswap.cpp
@@ -1,11 +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
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -34,6 +35,7 @@
 #include "valuenode_const.h"
 #include <stdexcept>
 #include "color.h"
+#include <ETL/misc>
 
 #endif
 
@@ -56,14 +58,6 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value):
 {
 	switch(get_type())
 	{
-	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_VECTOR:
-		set_link("before",ValueNode_Const::create(value.get(Vector())));
-		set_link("after",ValueNode_Const::create(value.get(Vector())));
-		break;
 	case ValueBase::TYPE_ANGLE:
 		set_link("before",ValueNode_Const::create(value.get(Angle())));
 		set_link("after",ValueNode_Const::create(value.get(Angle())));
@@ -76,10 +70,18 @@ ValueNode_TimedSwap::ValueNode_TimedSwap(const ValueBase &value):
 		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()));
 	}
@@ -202,18 +204,6 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 
 		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());
@@ -231,7 +221,13 @@ 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:
 			{
@@ -239,6 +235,12 @@ synfig::ValueNode_TimedSwap::operator()(Time t)const
 				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;
 		}
@@ -342,10 +344,10 @@ bool
 ValueNode_TimedSwap::check_type(ValueBase::Type type)
 {
 	return
-		type==ValueBase::TYPE_REAL ||
-		type==ValueBase::TYPE_VECTOR ||
 		type==ValueBase::TYPE_ANGLE ||
 		type==ValueBase::TYPE_COLOR ||
 		type==ValueBase::TYPE_INTEGER ||
-		type==ValueBase::TYPE_TIME;
+		type==ValueBase::TYPE_REAL ||
+		type==ValueBase::TYPE_TIME ||
+		type==ValueBase::TYPE_VECTOR;
 }