X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=a0bba53c50da9224ae7db406e4ed9dbedb872ab4;hb=ecff046513a5c0bd64db58b69fdd2fb42736bca7;hp=d6fe03a635307efcd19cf380792bc1b3b0f912cc;hpb=312e59b1685ed1acc688035b62700ca413294c2f;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index d6fe03a..a0bba53 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, 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
@@ -33,11 +34,11 @@
 #include "valuenode_scale.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include <cassert>
 #include "color.h"
 #include "vector.h"
 #include "time.h"
 #include "angle.h"
+#include <ETL/misc>
 
 #endif
 
@@ -58,7 +59,7 @@ using namespace synfig;
 ValueNode_Scale::ValueNode_Scale(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
-	set_scalar(1.0);
+	set_link("scalar",ValueNode::Handle(ValueNode_Const::create(Real(1.0))));
 	ValueBase::Type id(value.get_type());
 
 	switch(id)
@@ -83,11 +84,11 @@ ValueNode_Scale::ValueNode_Scale(const ValueBase &value):
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(value.get_type()));
+		throw runtime_error(get_local_name()+_(":Bad type ")+ValueBase::type_local_name(id));
 	}
 
 	assert(value_node);
-	assert(get_value_node()->get_type()==id);
+	assert(value_node->get_type()==id);
 	assert(get_type()==id);
 }
 
@@ -108,59 +109,12 @@ synfig::ValueNode_Scale::~ValueNode_Scale()
 	unlink_all();
 }
 
-void
-ValueNode_Scale::set_scalar(Real x)
-{
-	set_link("scalar",ValueNode::Handle(ValueNode_Const::create(x)));
-}
-
-bool
-ValueNode_Scale::set_scalar(const ValueNode::Handle &x)
-{
-	if(!x
-		|| x->get_type()!=ValueBase::TYPE_REAL
-		&& !PlaceholderValueNode::Handle::cast_dynamic(x)
-	)
-		return false;
-	scalar=x;
-	return true;
-}
-
-ValueNode::Handle
-ValueNode_Scale::get_scalar()const
-{
-	return scalar;
-}
-
-bool
-ValueNode_Scale::set_value_node(const ValueNode::Handle &x)
-{
-	assert(get_type());
-
-	// if this isn't a proper value
-	if(!x ||
-	   // or we don't have a type, and this value isn't one of the types we accept
-	   (get_type()==ValueBase::TYPE_NIL && !check_type(x->get_type())) ||
-	   // or we have a type and this value is a different type and (placeholder?)
-	   (get_type()!=ValueBase::TYPE_NIL && x->get_type()!=get_type() && !PlaceholderValueNode::Handle::cast_dynamic(x)))
-		// then fail to set the value
-		return false;
-
-	value_node=x;
-
-	return true;
-}
-
-ValueNode::Handle
-ValueNode_Scale::get_value_node()const
-{
-	return value_node;
-}
-
-
 synfig::ValueBase
 synfig::ValueNode_Scale::operator()(Time t)const
 {
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
 	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_ANGLE)
@@ -175,11 +129,7 @@ synfig::ValueNode_Scale::operator()(Time t)const
 		return ret;
 	}
 	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);
-	}
+		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)
@@ -193,26 +143,23 @@ synfig::ValueNode_Scale::operator()(Time t)const
 
 
 bool
-ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	if(!(i==0 || i==1))
-		return false;
+	assert(i>=0 && i<link_count());
 
-	if(i==0 && !set_value_node(x))
-		return false;
-	else
-	if(i==1 && !set_scalar(x))
-		return false;
-
-	signal_child_changed()(i);signal_value_changed()();
-
-	return true;
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(value_node, get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(scalar,     ValueBase::TYPE_REAL);
+	}
+	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_Scale::get_link_vfunc(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return value_node;
 	else if(i==1)
@@ -229,7 +176,8 @@ ValueNode_Scale::link_count()const
 String
 ValueNode_Scale::link_local_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return _("Link");
 	else if(i==1)
@@ -240,7 +188,8 @@ ValueNode_Scale::link_local_name(int i)const
 String
 ValueNode_Scale::link_name(int i)const
 {
-	assert(i==0 || i==1);
+	assert(i>=0 && i<link_count());
+
 	if(i==0)
 		return "link";
 	else if(i==1)