X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_subtract.cpp;h=03727313b57d122ce556551d36225f7ccda436b1;hb=0b72fd69212fc1664b2b536cdfb1d4d50373c87a;hp=ca31e290446ab1c009c529df71a5f9d96119d809;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
index ca31e29..0372731 100644
--- a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
@@ -2,19 +2,20 @@
 /*!	\file valuenode_subtract.cpp
 **	\brief Template File
 **
-**	$Id: valuenode_subtract.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
 */
 /* ========================================================================= */
@@ -68,27 +69,30 @@ ValueNode_Subtract*
 ValueNode_Subtract::create(const ValueBase& x)
 {
 	ValueBase::Type id(x.get_type());
-	
+
 	ValueNode_Subtract* value_node=new ValueNode_Subtract();
 	switch(id)
 	{
 	case ValueBase::TYPE_NIL:
 		return value_node;
-	case ValueBase::TYPE_VECTOR:
-	case ValueBase::TYPE_REAL:
-	case ValueBase::TYPE_INTEGER:
 	case ValueBase::TYPE_ANGLE:
-		value_node->set_link("rhs",ValueNode_Const::create(ValueBase(id)));
+	case ValueBase::TYPE_COLOR:
+	case ValueBase::TYPE_INTEGER:
+	case ValueBase::TYPE_REAL:
+	case ValueBase::TYPE_VECTOR:
 		value_node->set_link("lhs",ValueNode_Const::create(ValueBase(id)));
-		assert(value_node->get_rhs()->get_type()==id);
-		assert(value_node->get_lhs()->get_type()==id);
+		value_node->set_link("rhs",ValueNode_Const::create(ValueBase(id)));
 		break;
 	default:
 		assert(0);
-		throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id));			
+		throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id));
 	}
+
+	assert(value_node->get_lhs()->get_type()==id);
+	assert(value_node->get_rhs()->get_type()==id);
+
 	assert(value_node->get_type()==id);
-	
+
 	return value_node;
 }
 
@@ -116,27 +120,27 @@ bool
 synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle a)
 {
 	ref_a=a;
-	
+
 	if(PlaceholderValueNode::Handle::cast_dynamic(a))
 		return true;
-	
+
 	if(!ref_a || !ref_b)
 		set_type(ValueBase::TYPE_NIL);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_VECTOR && ref_a->get_type()==ValueBase::TYPE_VECTOR)
-		set_type(ValueBase::TYPE_VECTOR);
+	if(ref_a->get_type()==ValueBase::TYPE_ANGLE && ref_a->get_type()==ValueBase::TYPE_ANGLE)
+		set_type(ValueBase::TYPE_ANGLE);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_REAL && ref_a->get_type()==ValueBase::TYPE_REAL)
-		set_type(ValueBase::TYPE_REAL);
+	if(ref_a->get_type()==ValueBase::TYPE_COLOR && ref_a->get_type()==ValueBase::TYPE_COLOR)
+		set_type(ValueBase::TYPE_COLOR);
 	else
 	if(ref_a->get_type()==ValueBase::TYPE_INTEGER && ref_a->get_type()==ValueBase::TYPE_INTEGER)
 		set_type(ValueBase::TYPE_INTEGER);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_ANGLE && ref_a->get_type()==ValueBase::TYPE_ANGLE)
-		set_type(ValueBase::TYPE_ANGLE);
+	if(ref_a->get_type()==ValueBase::TYPE_REAL && ref_a->get_type()==ValueBase::TYPE_REAL)
+		set_type(ValueBase::TYPE_REAL);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_COLOR && ref_a->get_type()==ValueBase::TYPE_COLOR)
-		set_type(ValueBase::TYPE_COLOR);
+	if(ref_a->get_type()==ValueBase::TYPE_VECTOR && ref_a->get_type()==ValueBase::TYPE_VECTOR)
+		set_type(ValueBase::TYPE_VECTOR);
 	else
 	{
 		synfig::warning(get_id()+":(set_a):"+strprintf(_("Types seem to be off for ValueNodes %s and %s"),ref_a->get_id().c_str(),ref_b->get_id().c_str()));
@@ -157,20 +161,20 @@ synfig::ValueNode_Subtract::set_rhs(ValueNode::Handle b)
 	if(!ref_a || !ref_b)
 		set_type(ValueBase::TYPE_NIL);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_VECTOR && ref_a->get_type()==ValueBase::TYPE_VECTOR)
-		set_type(ValueBase::TYPE_VECTOR);
+	if(ref_a->get_type()==ValueBase::TYPE_ANGLE && ref_a->get_type()==ValueBase::TYPE_ANGLE)
+		set_type(ValueBase::TYPE_ANGLE);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_REAL && ref_a->get_type()==ValueBase::TYPE_REAL)
-		set_type(ValueBase::TYPE_REAL);
+	if(ref_a->get_type()==ValueBase::TYPE_COLOR && ref_a->get_type()==ValueBase::TYPE_COLOR)
+		set_type(ValueBase::TYPE_COLOR);
 	else
 	if(ref_a->get_type()==ValueBase::TYPE_INTEGER && ref_a->get_type()==ValueBase::TYPE_INTEGER)
 		set_type(ValueBase::TYPE_INTEGER);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_ANGLE && ref_a->get_type()==ValueBase::TYPE_ANGLE)
-		set_type(ValueBase::TYPE_ANGLE);
+	if(ref_a->get_type()==ValueBase::TYPE_REAL && ref_a->get_type()==ValueBase::TYPE_REAL)
+		set_type(ValueBase::TYPE_REAL);
 	else
-	if(ref_a->get_type()==ValueBase::TYPE_COLOR && ref_a->get_type()==ValueBase::TYPE_COLOR)
-		set_type(ValueBase::TYPE_COLOR);
+	if(ref_a->get_type()==ValueBase::TYPE_VECTOR && ref_a->get_type()==ValueBase::TYPE_VECTOR)
+		set_type(ValueBase::TYPE_VECTOR);
 	else
 	{
 		synfig::warning(get_id()+":(set_b):"+strprintf(_("Types seem to be off for ValueNodes %s and %s"),ref_a->get_id().c_str(),ref_b->get_id().c_str()));
@@ -185,21 +189,16 @@ synfig::ValueNode_Subtract::operator()(Time t)const
 {
 	if(!ref_a || !ref_b)
 		throw runtime_error(strprintf("ValueNode_Subtract: %s",_("One or both of my parameters aren't set!")));
-	else
-	if(get_type()==ValueBase::TYPE_VECTOR)
-		return ((*ref_a)(t).get(Vector())-(*ref_b)(t).get(Vector()))*(*scalar)(t).get(Real());
-	else
-	if(get_type()==ValueBase::TYPE_REAL)
-		return ((*ref_a)(t).get(Vector::value_type())-(*ref_b)(t).get(Vector::value_type()))*(*scalar)(t).get(Real());
-	else
-	if(get_type()==ValueBase::TYPE_INTEGER)
-		return ((*ref_a)(t).get(int())-(*ref_b)(t).get(int()))*(*scalar)(t).get(Real());
-	else
 	if(get_type()==ValueBase::TYPE_ANGLE)
 		return ((*ref_a)(t).get(Angle())-(*ref_b)(t).get(Angle()))*(*scalar)(t).get(Real());
-	else
 	if(get_type()==ValueBase::TYPE_COLOR)
 		return ((*ref_a)(t).get(Color())-(*ref_b)(t).get(Color()))*(*scalar)(t).get(Real());
+	if(get_type()==ValueBase::TYPE_INTEGER)
+		return ((*ref_a)(t).get(int())-(*ref_b)(t).get(int()))*(*scalar)(t).get(Real());
+	if(get_type()==ValueBase::TYPE_REAL)
+		return ((*ref_a)(t).get(Vector::value_type())-(*ref_b)(t).get(Vector::value_type()))*(*scalar)(t).get(Real());
+	if(get_type()==ValueBase::TYPE_VECTOR)
+		return ((*ref_a)(t).get(Vector())-(*ref_b)(t).get(Vector()))*(*scalar)(t).get(Real());
 
 	synfig::error(get_id()+':'+strprintf(_("Cannot subtract types of %s and %s"),ValueBase::type_name(ref_a->get_type()).c_str(),ValueBase::type_name(ref_b->get_type()).c_str()));
 	return ValueBase();
@@ -260,9 +259,10 @@ ValueNode_Subtract::link_local_name(int i)const
 			return _("RHS");
 		case 2:
 			return _("Scalar");
+		default:
+			return String();
 	}
-	return String();
-}	
+}
 
 String
 ValueNode_Subtract::link_name(int i)const
@@ -276,9 +276,10 @@ ValueNode_Subtract::link_name(int i)const
 			return "rhs";
 		case 2:
 			return "scalar";
+		default:
+			return String();
 	}
-	return String();
-}	
+}
 
 int
 ValueNode_Subtract::get_link_index_from_name(const String &name)const
@@ -307,9 +308,9 @@ ValueNode_Subtract::get_local_name()const
 bool
 ValueNode_Subtract::check_type(ValueBase::Type type)
 {
-	return type==ValueBase::TYPE_VECTOR 
-		|| type==ValueBase::TYPE_REAL
-		|| type==ValueBase::TYPE_INTEGER
+	return type==ValueBase::TYPE_ANGLE
 		|| type==ValueBase::TYPE_COLOR
-		|| type==ValueBase::TYPE_ANGLE;
+		|| type==ValueBase::TYPE_INTEGER
+		|| type==ValueBase::TYPE_REAL
+		|| type==ValueBase::TYPE_VECTOR;
 }