X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode.cpp;h=77d172a6aebdfb970dfff9290190dbe6ae1f7250;hb=19814e54d027ea1a98c532218966212298b9b555;hp=44261810c4bc3a6247aaaf02383636ecc85db039;hpb=4a851e51dfc20c03cda8c614edb91062741390b7;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp
index 4426181..77d172a 100644
--- a/synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode.cpp
@@ -44,7 +44,9 @@
 #include "valuenode_scale.h"
 #include "valuenode_segcalctangent.h"
 #include "valuenode_segcalcvertex.h"
+#include "valuenode_repeat_gradient.h"
 #include "valuenode_stripes.h"
+#include "valuenode_add.h"
 #include "valuenode_subtract.h"
 #include "valuenode_timedswap.h"
 #include "valuenode_twotone.h"
@@ -53,6 +55,7 @@
 #include "valuenode_radialcomposite.h"
 #include "valuenode_gradientrotate.h"
 #include "valuenode_sine.h"
+#include "valuenode_exp.h"
 
 #include "layer.h"
 
@@ -88,24 +91,34 @@ ValueNode::subsys_init()
 {
 	book_=new LinkableValueNode::Book();
 
-#define ADD_VALUENODE(c,n,l)  (*book_)[n].factory=reinterpret_cast<LinkableValueNode::Factory>(&c::create);      (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=l
-#define ADD_VALUENODE2(c,n,l) (*book_)[n].factory=reinterpret_cast<LinkableValueNode::Factory>(&c::create_from); (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=l
-
-	ADD_VALUENODE(ValueNode_Linear,			"linear",			_("Linear")				);x
-	ADD_VALUENODE(ValueNode_Composite,		"composite",		_("Composite")			);x
-	ADD_VALUENODE(ValueNode_RadialComposite,"radial_composite",	_("Radial Composite")	);x
-	ADD_VALUENODE(ValueNode_Reference,		"reference",		_("Reference")			);x
-	ADD_VALUENODE(ValueNode_Scale,			"scale",			_("Scale")				);x
-	ADD_VALUENODE(ValueNode_SegCalcTangent,	"segcalctangent",	_("Seg Calc Tangent")	);x
-	ADD_VALUENODE(ValueNode_SegCalcVertex,	"segcalcvertex",	_("Seg Calc Vertex")	);x
-	ADD_VALUENODE(ValueNode_Stripes,		"stripes",			_("Stripes")			);x
-	ADD_VALUENODE(ValueNode_Subtract,		"subtract",			_("Subtract")			);x
-	//ADD_VALUENODE(ValueNode_TimedSwap,	"timed_swap",		_("Timed Swap")			);x
-	ADD_VALUENODE(ValueNode_TwoTone,		"twotone",			_("Two-Tone")			);x
-	ADD_VALUENODE(ValueNode_BLine,			"bline",			_("BLine")				);x
-	ADD_VALUENODE2(ValueNode_DynamicList,	"dynamic_list",		_("Dynamic List")		);x
-	ADD_VALUENODE(ValueNode_GradientRotate,	"gradient_rotate",	_("Gradient Rotate")	);x
-	ADD_VALUENODE(ValueNode_Sine,			"sine",				_("Sine")				);x
+#define ADD_VALUENODE(class,name,local)															\
+	(*book_)[name].factory=reinterpret_cast<LinkableValueNode::Factory>(&class::create);		\
+	(*book_)[name].check_type=&class::check_type;												\
+	(*book_)[name].local_name=local
+
+#define ADD_VALUENODE2(class,name,local)														\
+	(*book_)[name].factory=reinterpret_cast<LinkableValueNode::Factory>(&class::create_from);	\
+	(*book_)[name].check_type=&class::check_type;												\
+	(*book_)[name].local_name=local
+
+	ADD_VALUENODE(ValueNode_Linear,			"linear",			_("Linear")				);
+	ADD_VALUENODE(ValueNode_Composite,		"composite",		_("Composite")			);
+	ADD_VALUENODE(ValueNode_RadialComposite,"radial_composite",	_("Radial Composite")	);
+	ADD_VALUENODE(ValueNode_Reference,		"reference",		_("Reference")			);
+	ADD_VALUENODE(ValueNode_Repeat_Gradient,"repeat_gradient",	_("Repeat Gradient")	);
+	ADD_VALUENODE(ValueNode_Scale,			"scale",			_("Scale")				);
+	ADD_VALUENODE(ValueNode_SegCalcTangent,	"segcalctangent",	_("Segment Tangent")	);
+	ADD_VALUENODE(ValueNode_SegCalcVertex,	"segcalcvertex",	_("Segment Vertex")		);
+	ADD_VALUENODE(ValueNode_Stripes,		"stripes",			_("Stripes")			);
+	ADD_VALUENODE(ValueNode_Subtract,		"add",				_("Add")				);
+	ADD_VALUENODE(ValueNode_Subtract,		"subtract",			_("Subtract")			);
+	ADD_VALUENODE(ValueNode_TimedSwap,		"timed_swap",		_("Timed Swap")			);
+	ADD_VALUENODE(ValueNode_TwoTone,		"twotone",			_("Two-Tone")			);
+	ADD_VALUENODE(ValueNode_BLine,			"bline",			_("BLine")				);
+	ADD_VALUENODE2(ValueNode_DynamicList,	"dynamic_list",		_("Dynamic List")		);
+	ADD_VALUENODE(ValueNode_GradientRotate,	"gradient_rotate",	_("Gradient Rotate")	);
+	ADD_VALUENODE(ValueNode_Sine,			"sine",				_("Sine")				);
+	ADD_VALUENODE(ValueNode_Exp,			"exp",				_("Exponential")		);
 
 #undef ADD_VALUENODE
 #undef ADD_VALUENODE2
@@ -226,9 +239,12 @@ ValueNode::~ValueNode()
 void
 ValueNode::on_changed()
 {
-	if(get_parent_canvas())
-		get_parent_canvas()->signal_value_node_changed()(this);
-	else if(get_root_canvas() && get_parent_canvas())
+	etl::loose_handle<Canvas> parent_canvas = get_parent_canvas();
+	if(parent_canvas)
+		do						// signal to all the ancestor canvases
+			parent_canvas->signal_value_node_changed()(this);
+		while (parent_canvas = parent_canvas->parent());
+	else if(get_root_canvas())
 		get_root_canvas()->signal_value_node_changed()(this);
 
 	Node::on_changed();
@@ -423,7 +439,7 @@ PlaceholderValueNode::create(ValueBase::Type type)
 }
 
 ValueBase
-PlaceholderValueNode::operator()(Time t)const
+PlaceholderValueNode::operator()(Time /*t*/)const
 {
 	assert(0);
 	return ValueBase();