X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_range.cpp;h=4c9b7288fb3ead5987b291969053246e6fb0a1e3;hb=2b2950e88fb6c4bfa36ec91eb86de33c6c27fafe;hp=be2f6a2a3022bcfdfc27884dfb69092d65d7fd03;hpb=1a1e0c7df827bcb4b68d9781101c72a7ca64185b;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_range.cpp b/synfig-core/src/synfig/valuenode_range.cpp
index be2f6a2..4c9b728 100644
--- a/synfig-core/src/synfig/valuenode_range.cpp
+++ b/synfig-core/src/synfig/valuenode_range.cpp
@@ -57,6 +57,8 @@ using namespace synfig;
 synfig::ValueNode_Range::ValueNode_Range(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	ValueBase::Type id(value.get_type());
 
 	switch(id)
@@ -90,8 +92,6 @@ synfig::ValueNode_Range::ValueNode_Range(const ValueBase &value):
 	assert(max_->get_type()==id);
 	assert(link_->get_type()==id);
 	assert(get_type()==id);
-
-	DCAST_HACK_ENABLE();
 }
 
 LinkableValueNode*
@@ -204,11 +204,9 @@ synfig::ValueNode_Range::get_inverse(Time t, const synfig::Angle &target_value)
 		switch (get_type())
 		{
 			default:
-		// Notice that target_value is the rotation between the current
-		// 'link' value and the target angle in the canvas, so we need
-		// to add it to 'link'
-		if(Angle::rad(maximum).get()>=Angle::rad(link+target_value).get() && Angle::rad(link+target_value).get()>=Angle::rad(minimum).get())
-			return link + target_value;
+
+		if(Angle::rad(maximum).get()>=Angle::rad(target_value).get() && Angle::rad(target_value).get()>=Angle::rad(minimum).get())
+			return target_value;
 		else if (Angle::rad(minimum).get()>Angle::rad(target_value).get())
 			return minimum;
 		else
@@ -246,49 +244,6 @@ ValueNode_Range::get_link_vfunc(int i)const
 	}
 }
 
-int
-ValueNode_Range::link_count()const
-{
-	return 3;
-}
-
-String
-ValueNode_Range::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return _("Min");
-		case 1: return _("Max");
-		case 2: return _("Link");
-		default: return String();
-	}
-}
-
-String
-ValueNode_Range::link_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(i)
-	{
-		case 0: return "min";
-		case 1: return "max";
-		case 2: return "link";
-		default: return String();
-	}
-}
-
-int
-ValueNode_Range::get_link_index_from_name(const String &name)const
-{
-	if(name=="min") return 0;
-	if(name=="max") return 1;
-	if(name=="link") return 2;
-	throw Exception::BadLinkName(name);
-}
-
 String
 ValueNode_Range::get_name()const
 {
@@ -309,3 +264,29 @@ ValueNode_Range::check_type(ValueBase::Type type)
 		|| type==ValueBase::TYPE_REAL
 		|| type==ValueBase::TYPE_TIME;
 }
+
+LinkableValueNode::Vocab
+ValueNode_Range::get_children_vocab_vfunc()const
+{
+	if(children_vocab.size())
+		return children_vocab;
+
+	LinkableValueNode::Vocab ret;
+
+	ret.push_back(ParamDesc(ValueBase(),"min")
+		.set_local_name(_("Min"))
+		.set_description(_("Returned value when 'Link' is smaller"))
+	);
+
+	ret.push_back(ParamDesc(ValueBase(),"max")
+		.set_local_name(_("Max"))
+		.set_description(_("Returned value when 'Link' is greater"))
+	);
+
+	ret.push_back(ParamDesc(ValueBase(),"link")
+		.set_local_name(_("Link"))
+		.set_description(_("The value node to limit its range"))
+	);
+
+	return ret;
+}