X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=ea46c04ff6ed2f2912db08ecf53ef99df85ac657;hb=2b2950e88fb6c4bfa36ec91eb86de33c6c27fafe;hp=b272d7d6b994418dc91c6a8746830e1a7b30b3c6;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_scale.cpp b/synfig-core/src/synfig/valuenode_scale.cpp
index b272d7d..ea46c04 100644
--- a/synfig-core/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/src/synfig/valuenode_scale.cpp
@@ -59,6 +59,8 @@ using namespace synfig;
 ValueNode_Scale::ValueNode_Scale(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	set_link("scalar",ValueNode::Handle(ValueNode_Const::create(Real(1.0))));
 	ValueBase::Type id(value.get_type());
 
@@ -173,7 +175,7 @@ synfig::ValueNode_Scale::get_inverse(Time t, const synfig::Angle &target_value)
 			switch (get_type())
 			{
 					default:
-					return (*value_node)(t).get(Angle()) + target_value / scalar_value;
+					return target_value / scalar_value;
 			}
 		}
 	return ValueBase();
@@ -211,47 +213,6 @@ ValueNode_Scale::get_link_vfunc(int i)const
 	return 0;
 }
 
-int
-ValueNode_Scale::link_count()const
-{
-	return 2;
-}
-
-String
-ValueNode_Scale::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	if(i==0)
-		return _("Link");
-	else if(i==1)
-		return _("Scalar");
-	return String();
-}
-
-String
-ValueNode_Scale::link_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	if(i==0)
-		return "link";
-	else if(i==1)
-		return "scalar";
-	return String();
-}
-
-int
-ValueNode_Scale::get_link_index_from_name(const String &name)const
-{
-	if(name=="link")
-		return 0;
-	if(name=="scalar")
-		return 1;
-
-	throw Exception::BadLinkName(name);
-}
-
 String
 ValueNode_Scale::get_name()const
 {
@@ -275,3 +236,24 @@ ValueNode_Scale::check_type(ValueBase::Type type)
 		type==ValueBase::TYPE_TIME ||
 		type==ValueBase::TYPE_VECTOR;
 }
+
+LinkableValueNode::Vocab
+ValueNode_Scale::get_children_vocab_vfunc()const
+{
+	if(children_vocab.size())
+		return children_vocab;
+
+	LinkableValueNode::Vocab ret;
+
+	ret.push_back(ParamDesc(ValueBase(),"link")
+		.set_local_name(_("Link"))
+		.set_description(_("The value node used to scale"))
+	);
+
+	ret.push_back(ParamDesc(ValueBase(),"scalar")
+		.set_local_name(_("Scalar"))
+		.set_description(_("Value that multiplies the value node"))
+	);
+
+	return ret;
+}