X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=ffe90d6459635c372b0620b08b456fd58486fcaa;hb=82f8b521a55c8985cd0189c9c71940a7312eccaa;hp=181cc29d62b1e6203cb9fb9c4a2aa878562c2d80;hpb=ed67b2cf8837fad1816498bc0ed403e8bd6252ca;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index 181cc29..ffe90d6 100644
--- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_scale.cpp
-**	\brief Template File
+**	\brief Implementation of the "Scale" 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
@@ -38,6 +39,7 @@
 #include "vector.h"
 #include "time.h"
 #include "angle.h"
+#include <ETL/misc>
 
 #endif
 
@@ -163,27 +165,9 @@ synfig::ValueNode_Scale::operator()(Time t)const
 {
 	if(!value_node || !scalar)
 		throw runtime_error(strprintf("ValueNode_Scale: %s",_("One or both of my parameters aren't set!")));
-	else
-	if(get_type()==ValueBase::TYPE_VECTOR)
-		return (*value_node)(t).get(Vector())*(*scalar)(t).get(Real());
-	else
-	if(get_type()==ValueBase::TYPE_REAL)
-		return (*value_node)(t).get(Real())*(*scalar)(t).get(Real());
-	else
-	if(get_type()==ValueBase::TYPE_TIME)
-		return (*value_node)(t).get(Time())*(*scalar)(t).get(Time());
-	else
-	if(get_type()==ValueBase::TYPE_INTEGER)
-	{
-		Real ret = (*value_node)(t).get(int())*(*scalar)(t).get(Real()) + 0.5f;
-		if (ret < 0) return static_cast<int>(ret-1);
-		return static_cast<int>(ret);
-	}
-	else
-	if(get_type()==ValueBase::TYPE_ANGLE)
+	else if(get_type()==ValueBase::TYPE_ANGLE)
 		return (*value_node)(t).get(Angle())*(*scalar)(t).get(Real());
-	else
-	if(get_type()==ValueBase::TYPE_COLOR)
+	else if(get_type()==ValueBase::TYPE_COLOR)
 	{
 		Color ret((*value_node)(t).get(Color()));
 		Real s((*scalar)(t).get(Real()));
@@ -192,6 +176,14 @@ synfig::ValueNode_Scale::operator()(Time t)const
 		ret.set_b(ret.get_b()*s);
 		return ret;
 	}
+	else if(get_type()==ValueBase::TYPE_INTEGER)
+		return round_to_int((*value_node)(t).get(int())*(*scalar)(t).get(Real()));
+	else if(get_type()==ValueBase::TYPE_REAL)
+		return (*value_node)(t).get(Real())*(*scalar)(t).get(Real());
+	else if(get_type()==ValueBase::TYPE_TIME)
+		return (*value_node)(t).get(Time())*(*scalar)(t).get(Time());
+	else if(get_type()==ValueBase::TYPE_VECTOR)
+		return (*value_node)(t).get(Vector())*(*scalar)(t).get(Real());
 
 	assert(0);
 	return ValueBase();
@@ -281,9 +273,10 @@ bool
 ValueNode_Scale::check_type(ValueBase::Type type)
 {
 	return
-		type==ValueBase::TYPE_VECTOR ||
-		type==ValueBase::TYPE_REAL ||
-		type==ValueBase::TYPE_INTEGER ||
+		type==ValueBase::TYPE_ANGLE ||
 		type==ValueBase::TYPE_COLOR ||
-		type==ValueBase::TYPE_ANGLE;
+		type==ValueBase::TYPE_INTEGER ||
+		type==ValueBase::TYPE_REAL ||
+		type==ValueBase::TYPE_TIME ||
+		type==ValueBase::TYPE_VECTOR;
 }