X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_radialcomposite.cpp;h=801c62480d6f63bdbfe81c6fac4e778780f434bf;hb=HEAD;hp=c9f24cbf631271fa79c0f51510a59b5c40983557;hpb=8eed22b9657ac7cb1881eab5c7b5c3d1f0c69468;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/src/synfig/valuenode_radialcomposite.cpp
index c9f24cb..801c624 100644
--- a/synfig-core/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/src/synfig/valuenode_radialcomposite.cpp
@@ -55,6 +55,8 @@ using namespace synfig;
 synfig::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
@@ -127,21 +129,6 @@ synfig::ValueNode_RadialComposite::operator()(Time t)const
 	}
 }
 
-int
-ValueNode_RadialComposite::link_count()const
-{
-	switch(get_type())
-	{
-	case ValueBase::TYPE_VECTOR:
-		return 2;
-	case ValueBase::TYPE_COLOR:
-		return 4;
-	default:
-		synfig::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite"));
-		return 1;
-	}
-}
-
 bool
 ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 {
@@ -189,43 +176,6 @@ ValueNode_RadialComposite::get_link_vfunc(int i)const
 }
 
 String
-ValueNode_RadialComposite::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(get_type())
-	{
-		case ValueBase::TYPE_VECTOR:
-			if(i==0)
-				return _("Radius");
-			else if(i==1)
-				return _("Theta");
-			break;
-
-		case ValueBase::TYPE_COLOR:
-			if(i==0)
-				return _("Luma");
-			else if(i==1)
-				return _("Saturation");
-			else if(i==2)
-				return _("Hue");
-			else if(i==3)
-				return _("Alpha");
-			break;
-
-		default:
-			break;
-	}
-
-	assert(0);
-	// notice that Composite counts from 1 and Radial Composite counts
-	// from 0!  we need to keep it like that to correctly load old
-	// animations, but let's not save "c%d" format link names in future
-	return etl::strprintf(_("C%d"),i);
-}
-
-
-String
 ValueNode_RadialComposite::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
@@ -233,38 +183,15 @@ ValueNode_RadialComposite::link_name(int i)const
 	if (get_file_version() < RELEASE_VERSION_0_61_08)
 		return strprintf("c%d",i);
 
-	switch(get_type())
-	{
-	case ValueBase::TYPE_COLOR:
-		switch(i)
-		{
-		case 0: return "y_luma"; // the 'luma' attribute is recognised by the fact that it starts with a 'y'
-		case 1: return "saturation";
-		case 2: return "hue";
-		case 3: return "alpha";
-		}
-		break;
-	case ValueBase::TYPE_VECTOR:
-		switch(i)
-		{
-		case 0: return "radius";
-		case 1: return "theta";
-		}
-		break;
-	default:
-		break;
-	}
-
-	assert(0);
-	// notice that Composite counts from 1 and Radial Composite counts
-	// from 0!  we need to keep it like that to correctly load old
-	// animations, but let's not save "c%d" format link names in future
-	return strprintf("c%d",i);
+	return LinkableValueNode::link_name(i);
 }
 
 int
 ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
 {
+	// Here we don't use the LinkableValueNode::get_link_index_from_name
+	// due to the particularities of the link index from name for old files.
+	// So we keep this alive to maintain old file compatibilities.
 	if(name.empty())
 		throw Exception::BadLinkName(name);
 
@@ -315,8 +242,11 @@ ValueNode_RadialComposite::check_type(ValueBase::Type type)
 }
 
 LinkableValueNode::Vocab
-ValueNode_RadialComposite::get_param_vocab()const
+ValueNode_RadialComposite::get_children_vocab_vfunc()const
 {
+	if(children_vocab.size())
+		return children_vocab;
+
 	LinkableValueNode::Vocab ret;
 
 	switch(get_type())