X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_radialcomposite.cpp;h=a1875685652a7145334cc506b4a788b669a1837d;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=8b21fab698f399d481b208f0ee1b1117192cac5a;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
index 8b21fab..a187568 100644
--- a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file valuenode_radialcomposite.cpp
-**	\brief Template File
+**	\brief Implementation of the "Radial Composite" valuenode conversion.
 **
-**	$Id: valuenode_radialcomposite.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -33,13 +35,14 @@
 #include <stdexcept>
 #include "general.h"
 #include "color.h"
+#include "savecanvas.h"
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -49,7 +52,7 @@ using namespace sinfg;
 
 /* === M E T H O D S ======================================================= */
 
-sinfg::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value):
+synfig::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &value):
 	LinkableValueNode(value.get_type())
 {
 	switch(get_type())
@@ -69,7 +72,7 @@ sinfg::ValueNode_RadialComposite::ValueNode_RadialComposite(const ValueBase &val
 			break;
 		default:
 			assert(0);
-			throw Exception::BadType(ValueBase::type_name(get_type()));			
+			throw Exception::BadType(ValueBase::type_local_name(get_type()));
 	}
 }
 
@@ -83,7 +86,7 @@ ValueNode_RadialComposite::create(const ValueBase &value)
 {
 	return new ValueNode_RadialComposite(value);
 }
-	
+
 LinkableValueNode*
 ValueNode_RadialComposite::create_new()const
 {
@@ -91,7 +94,7 @@ ValueNode_RadialComposite::create_new()const
 }
 
 ValueBase
-sinfg::ValueNode_RadialComposite::operator()(Time t)const
+synfig::ValueNode_RadialComposite::operator()(Time t)const
 {
 	switch(get_type())
 	{
@@ -115,7 +118,7 @@ sinfg::ValueNode_RadialComposite::operator()(Time t)const
 			);
 		}
 		default:
-			sinfg::error(string("ValueNode_RadialComposite::operator():")+_("Bad type for radialcomposite"));
+			synfig::error(string("ValueNode_RadialComposite::operator():")+_("Bad type for radialcomposite"));
 			assert(components[0]);
 			return (*components[0])(t);
 	}
@@ -131,7 +134,7 @@ ValueNode_RadialComposite::link_count()const
 	case ValueBase::TYPE_COLOR:
 		return 4;
 	default:
-		sinfg::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite"));
+		synfig::warning(string("ValueNode_RadialComposite::component_count():")+_("Bad type for radialcomposite"));
 		return 1;
 	}
 }
@@ -139,9 +142,8 @@ ValueNode_RadialComposite::link_count()const
 bool
 ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 {
-	assert(i>=0);
-	assert(i<6);
-	
+	assert(i>=0 && i<link_count());
+
 	if(PlaceholderValueNode::Handle::cast_dynamic(x))
 	{
 		components[i]=x;
@@ -151,7 +153,6 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
-			assert(i<2);
 			if(i==0 && x->get_type()!=ValueBase::TYPE_REAL)
 				return false;
 			if(i==1 && x->get_type()!=ValueBase::TYPE_ANGLE)
@@ -161,7 +162,6 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 			break;
 
 		case ValueBase::TYPE_COLOR:
-			assert(i<4);
 			if((i==0 || i==1 || i==3) && x->get_type()!=ValueBase::TYPE_REAL)
 				return false;
 			if((i==2) && x->get_type()!=ValueBase::TYPE_ANGLE)
@@ -169,25 +169,27 @@ ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
 			components[i]=x;
 			return true;
 			break;
-			
-			
+
+
 		default:
 			break;
 	}
-	return false;	
+	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_RadialComposite::get_link_vfunc(int i)const
 {
-	assert(i>=0 && i<6);
+	assert(i>=0 && i<link_count());
+
 	return components[i];
 }
 
 String
 ValueNode_RadialComposite::link_local_name(int i)const
 {
-	assert(i>=0 && i<6);
+	assert(i>=0 && i<link_count());
+
 	switch(get_type())
 	{
 		case ValueBase::TYPE_VECTOR:
@@ -207,20 +209,55 @@ ValueNode_RadialComposite::link_local_name(int i)const
 			else if(i==3)
 				return _("Alpha");
 			break;
-			
+
 		default:
 			break;
 	}
-	return etl::strprintf(_("C%d"),i+1);	
-}	
+
+	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<5);
+	assert(i>=0 && i<link_count());
+
+	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);
-}	
+}
 
 int
 ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
@@ -228,7 +265,7 @@ ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
 	if(name.empty())
 		throw Exception::BadLinkName(name);
 
-	if(name[0]=='c')
+	if(name[0]=='c' && name.size() == 2 && name[1]-'0' >= 0 && name[1]-'0' < link_count())
 		return name[1]-'0';
 
 	switch(get_type())
@@ -247,7 +284,7 @@ ValueNode_RadialComposite::get_link_index_from_name(const String &name)const
 			return 0;
 		if(name[0]=='t')
 			return 1;
-	default:			
+	default:
 		break;
 	}
 
@@ -263,7 +300,7 @@ ValueNode_RadialComposite::get_name()const
 String
 ValueNode_RadialComposite::get_local_name()const
 {
-	return _("RadialComposite");
+	return _("Radial Composite");
 }
 
 bool