X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsrc%2Fsynfig%2Fvaluenode_blinecalcwidth.cpp;h=bfb291b747ceccaadcf091aa0405dc08a1f8baca;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=9371e308a47f31e3fdeb26f148dcfbc7c0abc27b;hpb=20067bb96af6946754e7ecb7b40673b818f6e5c2;p=synfig.git

diff --git a/synfig-core/tags/stable/src/synfig/valuenode_blinecalcwidth.cpp b/synfig-core/tags/stable/src/synfig/valuenode_blinecalcwidth.cpp
index 9371e30..bfb291b 100644
--- a/synfig-core/tags/stable/src/synfig/valuenode_blinecalcwidth.cpp
+++ b/synfig-core/tags/stable/src/synfig/valuenode_blinecalcwidth.cpp
@@ -65,6 +65,7 @@ ValueNode_BLineCalcWidth::ValueNode_BLineCalcWidth(const ValueBase::Type &x):
 	set_link("bline",value_node);
 	set_link("loop",ValueNode_Const::create(bool(false)));
 	set_link("amount",ValueNode_Const::create(Real(0.5)));
+	set_link("scale",ValueNode_Const::create(Real(1.0)));
 }
 
 LinkableValueNode*
@@ -85,14 +86,14 @@ ValueNode_BLineCalcWidth::~ValueNode_BLineCalcWidth()
 }
 
 ValueBase
-ValueNode_BLineCalcWidth::operator()(Time t)const
+ValueNode_BLineCalcWidth::operator()(Time t, Real amount)const
 {
 	const std::vector<ValueBase> bline((*bline_)(t));
 	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()));
+	Real scale((*scale_)(t).get(Real()));
 	BLinePoint blinepoint0, blinepoint1;
 
 	if (!looped) size--;
@@ -120,14 +121,15 @@ ValueNode_BLineCalcWidth::operator()(Time t)const
 	float width0 = blinepoint0.get_width();
 	float width1 = blinepoint1.get_width();
 
-	return Real(width0 + (amount-from_vertex) * (width1-width0));
+	return Real((width0 + (amount-from_vertex) * (width1-width0)) * scale);
 }
 
-
-
-
-
-
+ValueBase
+ValueNode_BLineCalcWidth::operator()(Time t)const
+{
+	Real amount((*amount_)(t).get(Real()));
+	return (*this)(t, amount);
+}
 
 String
 ValueNode_BLineCalcWidth::get_name()const
@@ -151,6 +153,7 @@ ValueNode_BLineCalcWidth::set_link_vfunc(int i,ValueNode::Handle value)
 	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(scale_,  ValueBase::TYPE_REAL);
 	}
 	return false;
 }
@@ -165,6 +168,7 @@ ValueNode_BLineCalcWidth::get_link_vfunc(int i)const
 		case 0: return bline_;
 		case 1: return loop_;
 		case 2: return amount_;
+		case 3: return scale_;
 	}
 
 	return 0;
@@ -173,7 +177,7 @@ ValueNode_BLineCalcWidth::get_link_vfunc(int i)const
 int
 ValueNode_BLineCalcWidth::link_count()const
 {
-	return 3;
+	return 4;
 }
 
 String
@@ -186,6 +190,7 @@ ValueNode_BLineCalcWidth::link_name(int i)const
 		case 0: return "bline";
 		case 1: return "loop";
 		case 2: return "amount";
+		case 3: return "scale";
 	}
 	return String();
 }
@@ -200,6 +205,7 @@ ValueNode_BLineCalcWidth::link_local_name(int i)const
 		case 0: return _("BLine");
 		case 1: return _("Loop");
 		case 2: return _("Amount");
+		case 3: return _("Scale");
 	}
 	return String();
 }
@@ -210,6 +216,7 @@ ValueNode_BLineCalcWidth::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=="scale")  return 3;
 	throw Exception::BadLinkName(name);
 }