X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_blinecalctangent.cpp;h=3a3c2cc209797ddde008cc78e3d6d5d287b80b1b;hb=ecff046513a5c0bd64db58b69fdd2fb42736bca7;hp=36eced51826c25695355ce1a9c1ccc3c784eeab3;hpb=b37086823c5bfee9c76f6b265584a414100963ef;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
index 36eced5..3a3c2cc 100644
--- a/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_blinecalctangent.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	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
@@ -58,13 +58,16 @@ using namespace synfig;
 ValueNode_BLineCalcTangent::ValueNode_BLineCalcTangent(const ValueBase::Type &x):
 	LinkableValueNode(x)
 {
-	if(x!=ValueBase::TYPE_ANGLE && x!=ValueBase::TYPE_VECTOR)
-		throw Exception::BadType(ValueBase::type_name(x));
+	if(x!=ValueBase::TYPE_ANGLE && x!=ValueBase::TYPE_REAL && x!=ValueBase::TYPE_VECTOR)
+		throw Exception::BadType(ValueBase::type_local_name(x));
 
 	ValueNode_BLine* value_node(new ValueNode_BLine());
 	set_link("bline",value_node);
 	set_link("loop",ValueNode_Const::create(bool(false)));
 	set_link("amount",ValueNode_Const::create(Real(0.5)));
+	set_link("offset",ValueNode_Const::create(Angle::deg(0)));
+	set_link("scale",ValueNode_Const::create(Real(1.0)));
+	set_link("fixed_length",ValueNode_Const::create(bool(false)));
 }
 
 LinkableValueNode*
@@ -85,14 +88,19 @@ ValueNode_BLineCalcTangent::~ValueNode_BLineCalcTangent()
 }
 
 ValueBase
-ValueNode_BLineCalcTangent::operator()(Time t)const
+ValueNode_BLineCalcTangent::operator()(Time t, Real amount)const
 {
-	const std::vector<ValueBase> bline((*bline_)(t));
+	if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+		printf("%s:%d operator()\n", __FILE__, __LINE__);
+
+	const std::vector<ValueBase> bline((*bline_)(t).get_list());
 	handle<ValueNode_BLine> bline_value_node(bline_);
 	const bool looped(bline_value_node->get_loop());
 	int size = bline.size(), from_vertex;
 	bool loop((*loop_)(t).get(bool()));
-	Real amount((*amount_)(t).get(Real()));
+	Angle offset((*offset_)(t).get(Angle()));
+	Real scale((*scale_)(t).get(Real()));
+	bool fixed_length((*fixed_length_)(t).get(bool()));
 	BLinePoint blinepoint0, blinepoint1;
 
 	if (!looped) size--;
@@ -100,6 +108,7 @@ ValueNode_BLineCalcTangent::operator()(Time t)const
 		switch (get_type())
 		{
 			case ValueBase::TYPE_ANGLE:  return Angle();
+			case ValueBase::TYPE_REAL:   return Real();
 			case ValueBase::TYPE_VECTOR: return Vector();
 			default: assert(0); return ValueBase();
 		}
@@ -127,21 +136,31 @@ ValueNode_BLineCalcTangent::operator()(Time t)const
 							   blinepoint0.get_tangent2(), blinepoint1.get_tangent1());
 	etl::derivative< etl::hermite<Vector> > deriv(curve);
 
-#ifdef ETL_FIXED_DERIVATIVE
-	switch (get_type())
-	{
-		case ValueBase::TYPE_ANGLE:  return (deriv(amount-from_vertex)*(0.5)).angle();
-		case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex)*(0.5);
-		default: assert(0); return ValueBase();
-	}
-#else
 	switch (get_type())
 	{
-		case ValueBase::TYPE_ANGLE:  return (deriv(amount-from_vertex)*(-0.5)).angle();
-		case ValueBase::TYPE_VECTOR: return deriv(amount-from_vertex)*(-0.5);
+		case ValueBase::TYPE_ANGLE:  return deriv(amount-from_vertex).angle() + offset;
+		case ValueBase::TYPE_REAL:
+		{
+			if (fixed_length) return scale;
+			return deriv(amount-from_vertex).mag() * scale;
+		}
+		case ValueBase::TYPE_VECTOR:
+		{
+			Vector tangent(deriv(amount-from_vertex));
+			Angle angle(tangent.angle() + offset);
+			Real mag = fixed_length ? scale : (tangent.mag() * scale);
+			return Vector(Angle::cos(angle).get()*mag,
+						  Angle::sin(angle).get()*mag);
+		}
 		default: assert(0); return ValueBase();
 	}
-#endif
+}
+
+ValueBase
+ValueNode_BLineCalcTangent::operator()(Time t)const
+{
+	Real amount((*amount_)(t).get(Real()));
+	return (*this)(t, amount);
 }
 
 String
@@ -157,23 +176,18 @@ ValueNode_BLineCalcTangent::get_local_name()const
 }
 
 bool
-ValueNode_BLineCalcTangent::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_BLineCalcTangent::set_link_vfunc(int i,ValueNode::Handle value)
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-		case 0:
-			bline_=x;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 1:
-			loop_=x;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
-		case 2:
-			amount_=x;
-			signal_child_changed()(i);signal_value_changed()();
-			return true;
+	case 0: CHECK_TYPE_AND_SET_VALUE(bline_,		ValueBase::TYPE_LIST);
+	case 1: CHECK_TYPE_AND_SET_VALUE(loop_,			ValueBase::TYPE_BOOL);
+	case 2: CHECK_TYPE_AND_SET_VALUE(amount_,		ValueBase::TYPE_REAL);
+	case 3: CHECK_TYPE_AND_SET_VALUE(offset_,		ValueBase::TYPE_ANGLE);
+	case 4: CHECK_TYPE_AND_SET_VALUE(scale_,		ValueBase::TYPE_REAL);
+	case 5: CHECK_TYPE_AND_SET_VALUE(fixed_length_,	ValueBase::TYPE_BOOL);
 	}
 	return false;
 }
@@ -182,11 +196,15 @@ ValueNode::LooseHandle
 ValueNode_BLineCalcTangent::get_link_vfunc(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return bline_;
 		case 1: return loop_;
 		case 2: return amount_;
+		case 3: return offset_;
+		case 4: return scale_;
+		case 5: return fixed_length_;
 	}
 
 	return 0;
@@ -195,18 +213,22 @@ ValueNode_BLineCalcTangent::get_link_vfunc(int i)const
 int
 ValueNode_BLineCalcTangent::link_count()const
 {
-	return 3;
+	return 6;
 }
 
 String
 ValueNode_BLineCalcTangent::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return "bline";
 		case 1: return "loop";
 		case 2: return "amount";
+		case 3: return "offset";
+		case 4: return "scale";
+		case 5: return "fixed_length";
 	}
 	return String();
 }
@@ -215,11 +237,15 @@ String
 ValueNode_BLineCalcTangent::link_local_name(int i)const
 {
 	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
 		case 0: return _("BLine");
 		case 1: return _("Loop");
 		case 2: return _("Amount");
+		case 3: return _("Offset");
+		case 4: return _("Scale");
+		case 5: return _("Fixed Length");
 	}
 	return String();
 }
@@ -227,9 +253,12 @@ ValueNode_BLineCalcTangent::link_local_name(int i)const
 int
 ValueNode_BLineCalcTangent::get_link_index_from_name(const String &name)const
 {
-	if(name=="bline")  return 0;
-	if(name=="loop")   return 1;
-	if(name=="amount") return 2;
+	if (name=="bline")		  return 0;
+	if (name=="loop")		  return 1;
+	if (name=="amount")		  return 2;
+	if (name=="offset")		  return 3;
+	if (name=="scale")		  return 4;
+	if (name=="fixed_length") return 5;
 	throw Exception::BadLinkName(name);
 }
 
@@ -237,5 +266,6 @@ bool
 ValueNode_BLineCalcTangent::check_type(ValueBase::Type type)
 {
 	return (type==ValueBase::TYPE_ANGLE ||
+			type==ValueBase::TYPE_REAL  ||
 			type==ValueBase::TYPE_VECTOR);
 }