X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fvaluenode_composite.cpp;h=cf9c3be06598c7b00f45d03815d104f61c181bc7;hb=HEAD;hp=7e18ea026d6f301f221b77afa1a9a50ef325b456;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git

diff --git a/synfig-core/src/synfig/valuenode_composite.cpp b/synfig-core/src/synfig/valuenode_composite.cpp
index 7e18ea0..cf9c3be 100644
--- a/synfig-core/src/synfig/valuenode_composite.cpp
+++ b/synfig-core/src/synfig/valuenode_composite.cpp
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2008 Chris Moore
+**	Copyright (c) 2009 Nikita Kitaev
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -59,6 +60,8 @@ using namespace synfig;
 synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
+	Vocab ret(get_children_vocab());
+	set_children_vocab(ret);
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
@@ -80,12 +83,12 @@ synfig::ValueNode_Composite::ValueNode_Composite(const ValueBase &value):
 		case ValueBase::TYPE_BLINEPOINT:
 		{
 			BLinePoint bline_point(value);
-			set_link(0,ValueNode_Const::create(bline_point.get_vertex()));
-			set_link(1,ValueNode_Const::create(bline_point.get_width()));
-			set_link(2,ValueNode_Const::create(bline_point.get_origin()));
-			set_link(3,ValueNode_Const::create(bline_point.get_split_tangent_flag()));
-			set_link(4,ValueNode_RadialComposite::create(bline_point.get_tangent1()));
-			set_link(5,ValueNode_RadialComposite::create(bline_point.get_tangent2()));
+			set_link("point",ValueNode_Const::create(bline_point.get_vertex()));
+			set_link("width",ValueNode_Const::create(bline_point.get_width()));
+			set_link("origin",ValueNode_Const::create(bline_point.get_origin()));
+			set_link("split",ValueNode_Const::create(bline_point.get_split_tangent_flag()));
+			set_link("t1",ValueNode_RadialComposite::create(bline_point.get_tangent1()));
+			set_link("t2",ValueNode_RadialComposite::create(bline_point.get_tangent2()));
 			break;
 		}
 		default:
@@ -167,25 +170,6 @@ synfig::ValueNode_Composite::operator()(Time t)const
 	}
 }
 
-int
-ValueNode_Composite::link_count()const
-{
-	switch(get_type())
-	{
-	case ValueBase::TYPE_VECTOR:
-		return 2;
-	case ValueBase::TYPE_COLOR:
-		return 4;
-	case ValueBase::TYPE_SEGMENT:
-		return 4;
-	case ValueBase::TYPE_BLINEPOINT:
-		return 6;
-	default:
-		synfig::warning(string("ValueNode_Composite::component_count():")+_("Bad type for composite"));
-		return 1;
-	}
-}
-
 bool
 ValueNode_Composite::set_link_vfunc(int i,ValueNode::Handle x)
 {
@@ -256,60 +240,6 @@ ValueNode_Composite::get_link_vfunc(int i)const
 }
 
 String
-ValueNode_Composite::link_local_name(int i)const
-{
-	assert(i>=0 && i<link_count());
-
-	switch(get_type())
-	{
-		case ValueBase::TYPE_VECTOR:
-			return strprintf("%c-Axis",'X'+i);
-
-		case ValueBase::TYPE_COLOR:
-			if(i==0)
-				return _("Red");
-			else if(i==1)
-				return _("Green");
-			else if(i==2)
-				return _("Blue");
-			else if(i==3)
-				return _("Alpha");
-
-		case ValueBase::TYPE_SEGMENT:
-			if(i==0)
-				return _("Vertex 1");
-			else if(i==1)
-				return _("Tangent 1");
-			else if(i==2)
-				return _("Vertex 2");
-			else if(i==3)
-				return _("Tangent 2");
-
-		case ValueBase::TYPE_BLINEPOINT:
-			if(i==0)
-				return _("Vertex");
-			else if(i==1)
-				return _("Width");
-			else if(i==2)
-				return _("Origin");
-			else if(i==3)
-				return _("Split Tangents");
-			else if(i==4)
-				return _("Tangent 1");
-			else if(i==5)
-				return _("Tangent 2");
-
-		default:
-			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+1);
-	}
-}
-
-
-String
 ValueNode_Composite::link_name(int i)const
 {
 	assert(i>=0 && i<link_count());
@@ -317,58 +247,15 @@ ValueNode_Composite::link_name(int i)const
 	if (get_file_version() < RELEASE_VERSION_0_61_08)
 		return strprintf("c%d",i+1);
 
-	switch(get_type())
-	{
-	case ValueBase::TYPE_COLOR:
-		switch(i)
-		{
-		case 0: return "red";
-		case 1: return "green";
-		case 2: return "blue";
-		case 3: return "alpha";
-		}
-		break;
-	case ValueBase::TYPE_SEGMENT:
-		switch(i)
-		{
-		case 0: return "p1";
-		case 1: return "t1";
-		case 2: return "p2";
-		case 3: return "t2";
-		}
-		break;
-	case ValueBase::TYPE_VECTOR:
-		switch(i)
-		{
-		case 0: return "x";
-		case 1: return "y";
-		}
-		break;
-	case ValueBase::TYPE_BLINEPOINT:
-		switch(i)
-		{
-		case 0: return "point";
-		case 1: return "width";
-		case 2: return "origin";
-		case 3: return "split";
-		case 4: return "t1";
-		case 5: return "t2";
-		}
-		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+1);
+	return LinkableValueNode::link_name(i);
 }
 
 int
 ValueNode_Composite::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);
 
@@ -443,3 +330,92 @@ ValueNode_Composite::check_type(ValueBase::Type type)
 		type==ValueBase::TYPE_COLOR ||
 		type==ValueBase::TYPE_BLINEPOINT;
 }
+
+LinkableValueNode::Vocab
+ValueNode_Composite::get_children_vocab_vfunc()const
+{
+	if(children_vocab.size())
+		return children_vocab;
+
+	LinkableValueNode::Vocab ret;
+
+	switch(get_type())
+	{
+	case ValueBase::TYPE_COLOR:
+		ret.push_back(ParamDesc(ValueBase(),"red")
+			.set_local_name(_("Red"))
+			.set_description(_("The red component of the color"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"green")
+			.set_local_name(_("Green"))
+			.set_description(_("The green component of the color"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"blue")
+			.set_local_name(_("Blue"))
+			.set_description(_("The blue component of the color"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"alpha")
+			.set_local_name(_("Alpha"))
+			.set_description(_("The alpha of the color"))
+		);
+		return ret;
+	case ValueBase::TYPE_SEGMENT:
+		ret.push_back(ParamDesc(ValueBase(),"p1")
+			.set_local_name(_("Vertex 1"))
+			.set_description(_("The first vertex of the segment"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"t1")
+			.set_local_name(_("Tangent 1"))
+			.set_description(_("The first tangent of the segment"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"p2")
+			.set_local_name(_("Vertex 2"))
+			.set_description(_("The second vertex of the segment"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"t2")
+			.set_local_name(_("Tangent 2"))
+			.set_description(_("The second tangent of the segment"))
+		);
+		return ret;
+	case ValueBase::TYPE_VECTOR:
+		ret.push_back(ParamDesc(ValueBase(),"x")
+			.set_local_name(_("X-Axis"))
+			.set_description(_("The X-Axis component of the vector"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"y")
+			.set_local_name(_("Y-Axis"))
+			.set_description(_("The Y-Axis component of the vector"))
+		);
+		return ret;
+	case ValueBase::TYPE_BLINEPOINT:
+		ret.push_back(ParamDesc(ValueBase(),"point")
+			.set_local_name(_("Vertex"))
+			.set_description(_("The vertex of the BLine Point"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"width")
+			.set_local_name(_("Width"))
+			.set_description(_("The width of the BLine Point"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"origin")
+			.set_local_name(_("Origin"))
+			.set_description(_("Defines the Off and On position relative to neighbours"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"split")
+			.set_local_name(_("Split"))
+			.set_description(_("When checked, tangents are independent"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"t1")
+			.set_local_name(_("Tangent 1"))
+			.set_description(_("The first tangent of the BLine Point"))
+		);
+		ret.push_back(ParamDesc(ValueBase(),"t2")
+			.set_local_name(_("Tangent 2"))
+			.set_description(_("The second tangent of the BLine Point"))
+		);
+		return ret;
+	default:
+		break;
+	}
+
+	return ret;
+}