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

diff --git a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
index 4d1cc1d..94e564a 100644
--- a/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_subtract.cpp
@@ -2,7 +2,7 @@
 /*!	\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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -54,43 +54,56 @@ using namespace synfig;
 
 /* === M E T H O D S ======================================================= */
 
-synfig::ValueNode_Subtract::ValueNode_Subtract():LinkableValueNode(synfig::ValueBase::TYPE_NIL)
+synfig::ValueNode_Subtract::ValueNode_Subtract(const ValueBase &value):
+	LinkableValueNode(value.get_type())
 {
 	set_scalar(1.0);
+	ValueBase::Type id(value.get_type());
+
+	switch(id)
+	{
+	case ValueBase::TYPE_ANGLE:
+		set_link("lhs",ValueNode_Const::create(value.get(Angle())));
+		set_link("rhs",ValueNode_Const::create(Angle::deg(0)));
+		break;
+	case ValueBase::TYPE_COLOR:
+		set_link("lhs",ValueNode_Const::create(value.get(Color())));
+		set_link("rhs",ValueNode_Const::create(Color(0,0,0,0)));
+		break;
+	case ValueBase::TYPE_INTEGER:
+		set_link("lhs",ValueNode_Const::create(value.get(int())));
+		set_link("rhs",ValueNode_Const::create(int(0)));
+		break;
+	case ValueBase::TYPE_REAL:
+		set_link("lhs",ValueNode_Const::create(value.get(Real())));
+		set_link("rhs",ValueNode_Const::create(Real(0)));
+		break;
+	case ValueBase::TYPE_VECTOR:
+		set_link("lhs",ValueNode_Const::create(value.get(Vector())));
+		set_link("rhs",ValueNode_Const::create(Vector(0,0)));
+		break;
+	default:
+		assert(0);
+		throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id));
+	}
+
+	assert(get_lhs()->get_type()==id);
+	assert(get_rhs()->get_type()==id);
+	assert(get_type()==id);
+
+	DCAST_HACK_ENABLE();
 }
 
 LinkableValueNode*
 ValueNode_Subtract::create_new()const
 {
-	return new ValueNode_Subtract();
+	return new ValueNode_Subtract(get_type());
 }
 
 ValueNode_Subtract*
-ValueNode_Subtract::create(const ValueBase& x)
+ValueNode_Subtract::create(const ValueBase& value)
 {
-	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)));
-		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);
-		break;
-	default:
-		assert(0);
-		throw runtime_error("synfig::ValueNode_Subtract:Bad type "+ValueBase::type_name(id));			
-	}
-	assert(value_node->get_type()==id);
-	
-	return value_node;
+	return new ValueNode_Subtract(value);
 }
 
 synfig::ValueNode_Subtract::~ValueNode_Subtract()
@@ -99,84 +112,46 @@ synfig::ValueNode_Subtract::~ValueNode_Subtract()
 }
 
 void
-ValueNode_Subtract::set_scalar(Real x)
+ValueNode_Subtract::set_scalar(Real value)
 {
-	set_link("scalar",ValueNode_Const::create(x));
+	set_link("scalar",ValueNode_Const::create(value));
 }
 
 bool
-synfig::ValueNode_Subtract::set_scalar(ValueNode::Handle x)
+synfig::ValueNode_Subtract::set_scalar(ValueNode::Handle value)
 {
-	if(x->get_type()!=ValueBase::TYPE_REAL&& !PlaceholderValueNode::Handle::cast_dynamic(x))
+	if(value->get_type()!=ValueBase::TYPE_REAL&& !PlaceholderValueNode::Handle::cast_dynamic(value))
 		return false;
-	scalar=x;
+	scalar=value;
 	return true;
 }
 
 bool
-synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle a)
+synfig::ValueNode_Subtract::set_lhs(ValueNode::Handle x)
 {
-	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);
-	else
-	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_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);
-	else
-	if(ref_a->get_type()==ValueBase::TYPE_COLOR && ref_a->get_type()==ValueBase::TYPE_COLOR)
-		set_type(ValueBase::TYPE_COLOR);
-	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()));
-		set_type(ValueBase::TYPE_NIL);
-	}
+	assert(get_type());
+
+	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)))
+		return false;
+
+	ref_a=x;
 
 	return true;
 }
 
 bool
-synfig::ValueNode_Subtract::set_rhs(ValueNode::Handle b)
+synfig::ValueNode_Subtract::set_rhs(ValueNode::Handle x)
 {
-	ref_b=b;
+	assert(get_type());
 
-	if(PlaceholderValueNode::Handle::cast_dynamic(b))
-		return true;
+	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)))
+		return false;
 
-	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);
-	else
-	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_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);
-	else
-	if(ref_a->get_type()==ValueBase::TYPE_COLOR && ref_a->get_type()==ValueBase::TYPE_COLOR)
-		set_type(ValueBase::TYPE_COLOR);
-	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()));
-		set_type(ValueBase::TYPE_NIL);
-	}
+	ref_b=x;
 
 	return true;
 }
@@ -186,40 +161,43 @@ 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)
+	switch(get_type())
+	{
+	case 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)
+	case ValueBase::TYPE_COLOR:
 		return ((*ref_a)(t).get(Color())-(*ref_b)(t).get(Color()))*(*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()));
+	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); 
+	}
+	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_VECTOR:
+		return ((*ref_a)(t).get(Vector())-(*ref_b)(t).get(Vector()))*(*scalar)(t).get(Real());
+	default:
+		assert(0);
+		break;
+	}
 	return ValueBase();
 }
 
 bool
-ValueNode_Subtract::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Subtract::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<3);
 	switch(i)
 	{
 		case 0:
-			if(set_lhs(x)) { signal_child_changed()(i);signal_value_changed()(); return true; }
-			else { return false; }
+			if(set_lhs(value)) { signal_child_changed()(i);signal_value_changed()(); return true; }
+			return false;
 		case 1:
-			if(set_rhs(x)) { signal_child_changed()(i);signal_value_changed()(); return true; }
-			else { return false; }
+			if(set_rhs(value)) { signal_child_changed()(i);signal_value_changed()(); return true; }
+			return false;
 		case 2:
-			scalar=x;
+			scalar=value;
 			signal_child_changed()(i);signal_value_changed()();
 			return true;
 	}
@@ -233,14 +211,11 @@ ValueNode_Subtract::get_link_vfunc(int i)const
 	assert(i>=0 && i<3);
 	switch(i)
 	{
-		case 0:
-			return ref_a;
-		case 1:
-			return ref_b;
-		case 2:
-			return scalar;
+		case 0: return ref_a;
+		case 1: return ref_b;
+		case 2: return scalar;
+		default: return 0;
 	}
-	return 0;
 }
 
 int
@@ -255,15 +230,12 @@ ValueNode_Subtract::link_local_name(int i)const
 	assert(i>=0 && i<3);
 	switch(i)
 	{
-		case 0:
-			return _("LHS");
-		case 1:
-			return _("RHS");
-		case 2:
-			return _("Scalar");
+		case 0: return _("LHS");
+		case 1: return _("RHS");
+		case 2: return _("Scalar");
+		default: return String();
 	}
-	return String();
-}	
+}
 
 String
 ValueNode_Subtract::link_name(int i)const
@@ -271,25 +243,20 @@ ValueNode_Subtract::link_name(int i)const
 	assert(i>=0 && i<3);
 	switch(i)
 	{
-		case 0:
-			return "lhs";
-		case 1:
-			return "rhs";
-		case 2:
-			return "scalar";
+		case 0: return "lhs";
+		case 1: return "rhs";
+		case 2: return "scalar";
+		default: return String();
 	}
-	return String();
-}	
+}
 
 int
 ValueNode_Subtract::get_link_index_from_name(const String &name)const
 {
-	if(name=="lhs")
-		return 0;
-	if(name=="rhs")
-		return 1;
-	if(name=="scalar")
-		return 2;
+	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;
 	throw Exception::BadLinkName(name);
 }
 
@@ -308,9 +275,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;
 }