X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_subtract.cpp;h=f9293bb3df9f7fa65b3e6d663d865a674cf5ea4b;hb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;hp=94e564a6813d65e2437e5c6f68893020d31f73d0;hpb=ff6c7f011dfce7ec762c4f2fb38cd0ae5fc63a6e;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
index 94e564a..f9293bb 100644
--- a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_subtract.cpp
-**	\brief Template File
+**	\brief Implementation of the "Subtract" 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
@@ -37,6 +38,7 @@
 #include "vector.h"
 #include "angle.h"
 #include "real.h"
+#include <ETL/misc>
 
 #endif
 
@@ -78,6 +80,10 @@ synfig::ValueNode_Subtract::ValueNode_Subtract(const ValueBase &value):
 		set_link("lhs",ValueNode_Const::create(value.get(Real())));
 		set_link("rhs",ValueNode_Const::create(Real(0)));
 		break;
+	case ValueBase::TYPE_TIME:
+		set_link("lhs",ValueNode_Const::create(value.get(Time())));
+		set_link("rhs",ValueNode_Const::create(Time(0)));
+		break;
 	case ValueBase::TYPE_VECTOR:
 		set_link("lhs",ValueNode_Const::create(value.get(Vector())));
 		set_link("rhs",ValueNode_Const::create(Vector(0,0)));
@@ -168,13 +174,11 @@ synfig::ValueNode_Subtract::operator()(Time t)const
 	case ValueBase::TYPE_COLOR:
 		return ((*ref_a)(t).get(Color())-(*ref_b)(t).get(Color()))*(*scalar)(t).get(Real());
 	case ValueBase::TYPE_INTEGER:
-	{
-		Real ret = ((*ref_a)(t).get(int())-(*ref_b)(t).get(int()))*(*scalar)(t).get(Real()) + 0.5f;
-		if (ret < 0) return static_cast<int>(ret-1);
-		return static_cast<int>(ret); 
-	}
+		return round_to_int(((*ref_a)(t).get(int())-(*ref_b)(t).get(int()))*(*scalar)(t).get(Real()));
 	case ValueBase::TYPE_REAL:
 		return ((*ref_a)(t).get(Vector::value_type())-(*ref_b)(t).get(Vector::value_type()))*(*scalar)(t).get(Real());
+	case ValueBase::TYPE_TIME:
+		return ((*ref_a)(t).get(Time())-(*ref_b)(t).get(Time()))*(*scalar)(t).get(Real());
 	case ValueBase::TYPE_VECTOR:
 		return ((*ref_a)(t).get(Vector())-(*ref_b)(t).get(Vector()))*(*scalar)(t).get(Real());
 	default:
@@ -187,7 +191,8 @@ synfig::ValueNode_Subtract::operator()(Time t)const
 bool
 ValueNode_Subtract::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0:
@@ -208,7 +213,8 @@ ValueNode_Subtract::set_link_vfunc(int i,ValueNode::Handle value)
 ValueNode::LooseHandle
 ValueNode_Subtract::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return ref_a;
@@ -227,7 +233,8 @@ ValueNode_Subtract::link_count()const
 String
 ValueNode_Subtract::link_local_name(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return _("LHS");
@@ -240,7 +247,8 @@ ValueNode_Subtract::link_local_name(int i)const
 String
 ValueNode_Subtract::link_name(int i)const
 {
-	assert(i>=0 && i<3);
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return "lhs";
@@ -253,7 +261,6 @@ ValueNode_Subtract::link_name(int i)const
 int
 ValueNode_Subtract::get_link_index_from_name(const String &name)const
 {
-	printf("%s:%d link_index_from_name\n", __FILE__, __LINE__);
 	if(name=="lhs") return 0;
 	if(name=="rhs") return 1;
 	if(name=="scalar") return 2;
@@ -279,5 +286,6 @@ ValueNode_Subtract::check_type(ValueBase::Type type)
 		|| type==ValueBase::TYPE_COLOR
 		|| type==ValueBase::TYPE_INTEGER
 		|| type==ValueBase::TYPE_REAL
+		|| type==ValueBase::TYPE_TIME
 		|| type==ValueBase::TYPE_VECTOR;
 }