X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=181cc29d62b1e6203cb9fb9c4a2aa878562c2d80;hb=e802271c263e2a49ab4edb3660f89c27e642d123;hp=9904d14b0ef8d32a2409f3978704db7989453174;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index 9904d14..181cc29 100644
--- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@ -2,19 +2,20 @@
 /*!	\file valuenode_scale.cpp
 **	\brief Template File
 **
-**	$Id: valuenode_scale.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
 **
-**	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
 */
 /* ========================================================================= */
@@ -54,42 +55,52 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-ValueNode_Scale::ValueNode_Scale():LinkableValueNode(synfig::ValueBase::TYPE_NIL)
+ValueNode_Scale::ValueNode_Scale(const ValueBase &value):
+	LinkableValueNode(value.get_type())
 {
 	set_scalar(1.0);
-}
+	ValueBase::Type id(value.get_type());
 
-ValueNode_Scale*
-ValueNode_Scale::create(const ValueBase& x)
-{
-	ValueNode_Scale* value_node;
-	switch(x.get_type())
+	switch(id)
 	{
-	case ValueBase::TYPE_VECTOR:
-	case ValueBase::TYPE_REAL:
-	case ValueBase::TYPE_TIME:
-	case ValueBase::TYPE_INTEGER:
 	case ValueBase::TYPE_ANGLE:
+		set_link("link",ValueNode_Const::create(value.get(Angle())));
+		break;
 	case ValueBase::TYPE_COLOR:
-		value_node=new ValueNode_Scale();
-		if(!value_node->set_value_node(ValueNode_Const::create(x)))
-			return 0;
-		assert(value_node->get_value_node()->get_type()==x.get_type());
+		set_link("link",ValueNode_Const::create(value.get(Color())));
+		break;
+	case ValueBase::TYPE_INTEGER:
+		set_link("link",ValueNode_Const::create(value.get(int())));
+		break;
+	case ValueBase::TYPE_REAL:
+		set_link("link",ValueNode_Const::create(value.get(Real())));
+		break;
+	case ValueBase::TYPE_TIME:
+		set_link("link",ValueNode_Const::create(value.get(Time())));
+		break;
+	case ValueBase::TYPE_VECTOR:
+		set_link("link",ValueNode_Const::create(value.get(Vector())));
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(x.get_type()));			
+		throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(value.get_type()));
 	}
+
 	assert(value_node);
-	assert(value_node->get_type()==x.get_type());
-	
-	return value_node;
+	assert(get_value_node()->get_type()==id);
+	assert(get_type()==id);
 }
 
 LinkableValueNode*
 ValueNode_Scale::create_new()const
 {
-	return new ValueNode_Scale();
+	return new ValueNode_Scale(get_type());
+}
+
+ValueNode_Scale*
+ValueNode_Scale::create(const ValueBase& value)
+{
+	return new ValueNode_Scale(value);
 }
 
 synfig::ValueNode_Scale::~ValueNode_Scale()
@@ -124,22 +135,19 @@ ValueNode_Scale::get_scalar()const
 bool
 ValueNode_Scale::set_value_node(const ValueNode::Handle &x)
 {
-	if(!x
-		|| ( get_type()==ValueBase::TYPE_NIL
-			&& !check_type(x->get_type()) )
-		|| ( get_type()!=ValueBase::TYPE_NIL
-			&& x->get_type()!=get_type() ) &&
-		!PlaceholderValueNode::Handle::cast_dynamic(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;
 
-	assert(!(PlaceholderValueNode::Handle::cast_dynamic(x) && !get_type()));
-
 	value_node=x;
 
-	if(!get_type())
-		set_type(x->get_type());
-
 	return true;
 }
 
@@ -166,7 +174,11 @@ synfig::ValueNode_Scale::operator()(Time t)const
 		return (*value_node)(t).get(Time())*(*scalar)(t).get(Time());
 	else
 	if(get_type()==ValueBase::TYPE_INTEGER)
-		return (*value_node)(t).get(int())*(*scalar)(t).get(Real());
+	{
+		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)
 		return (*value_node)(t).get(Angle())*(*scalar)(t).get(Real());
@@ -176,8 +188,8 @@ synfig::ValueNode_Scale::operator()(Time t)const
 		Color ret((*value_node)(t).get(Color()));
 		Real s((*scalar)(t).get(Real()));
 		ret.set_r(ret.get_r()*s);
-		ret.set_g(ret.get_r()*s);
-		ret.set_b(ret.get_r()*s);
+		ret.set_g(ret.get_g()*s);
+		ret.set_b(ret.get_b()*s);
 		return ret;
 	}
 
@@ -191,13 +203,13 @@ ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
 {
 	if(!(i==0 || i==1))
 		return false;
-	
+
 	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;
@@ -229,7 +241,7 @@ ValueNode_Scale::link_local_name(int i)const
 	else if(i==1)
 		return _("Scalar");
 	return String();
-}	
+}
 
 String
 ValueNode_Scale::link_name(int i)const
@@ -249,7 +261,7 @@ ValueNode_Scale::get_link_index_from_name(const String &name)const
 		return 0;
 	if(name=="scalar")
 		return 1;
-	
+
 	throw Exception::BadLinkName(name);
 }