projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Woops, remove the testing en_AU from ALL_LINGUAS
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode.cpp
b/synfig-core/trunk/src/synfig/valuenode.cpp
index
4a66e6a
..
3654ab9
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-42,9
+43,14
@@
#include "valuenode_composite.h"
#include "valuenode_reference.h"
#include "valuenode_scale.h"
#include "valuenode_composite.h"
#include "valuenode_reference.h"
#include "valuenode_scale.h"
+#include "valuenode_blinecalctangent.h"
+#include "valuenode_blinecalcvertex.h"
#include "valuenode_segcalctangent.h"
#include "valuenode_segcalcvertex.h"
#include "valuenode_segcalctangent.h"
#include "valuenode_segcalcvertex.h"
+#include "valuenode_repeat_gradient.h"
#include "valuenode_stripes.h"
#include "valuenode_stripes.h"
+#include "valuenode_range.h"
+#include "valuenode_add.h"
#include "valuenode_subtract.h"
#include "valuenode_timedswap.h"
#include "valuenode_twotone.h"
#include "valuenode_subtract.h"
#include "valuenode_timedswap.h"
#include "valuenode_twotone.h"
@@
-53,6
+59,10
@@
#include "valuenode_radialcomposite.h"
#include "valuenode_gradientrotate.h"
#include "valuenode_sine.h"
#include "valuenode_radialcomposite.h"
#include "valuenode_gradientrotate.h"
#include "valuenode_sine.h"
+#include "valuenode_cos.h"
+#include "valuenode_atan2.h"
+#include "valuenode_exp.h"
+#include "valuenode_switch.h"
#include "layer.h"
#include "layer.h"
@@
-102,10
+112,15
@@
ValueNode::subsys_init()
ADD_VALUENODE(ValueNode_Composite, "composite", _("Composite") );
ADD_VALUENODE(ValueNode_RadialComposite,"radial_composite", _("Radial Composite") );
ADD_VALUENODE(ValueNode_Reference, "reference", _("Reference") );
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_Scale, "scale", _("Scale") );
+ ADD_VALUENODE(ValueNode_BLineCalcTangent,"blinecalctangent",_("BLine Tangent") );
+ ADD_VALUENODE(ValueNode_BLineCalcVertex,"blinecalcvertex", _("BLine Vertex") );
ADD_VALUENODE(ValueNode_SegCalcTangent, "segcalctangent", _("Segment Tangent") );
ADD_VALUENODE(ValueNode_SegCalcVertex, "segcalcvertex", _("Segment Vertex") );
ADD_VALUENODE(ValueNode_Stripes, "stripes", _("Stripes") );
ADD_VALUENODE(ValueNode_SegCalcTangent, "segcalctangent", _("Segment Tangent") );
ADD_VALUENODE(ValueNode_SegCalcVertex, "segcalcvertex", _("Segment Vertex") );
ADD_VALUENODE(ValueNode_Stripes, "stripes", _("Stripes") );
+ ADD_VALUENODE(ValueNode_Range, "range", _("Range") );
+ ADD_VALUENODE(ValueNode_Add, "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_Subtract, "subtract", _("Subtract") );
ADD_VALUENODE(ValueNode_TimedSwap, "timed_swap", _("Timed Swap") );
ADD_VALUENODE(ValueNode_TwoTone, "twotone", _("Two-Tone") );
@@
-113,6
+128,10
@@
ValueNode::subsys_init()
ADD_VALUENODE2(ValueNode_DynamicList, "dynamic_list", _("Dynamic List") );
ADD_VALUENODE(ValueNode_GradientRotate, "gradient_rotate", _("Gradient Rotate") );
ADD_VALUENODE(ValueNode_Sine, "sine", _("Sine") );
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_Cos, "cos", _("Cos") );
+ ADD_VALUENODE(ValueNode_Atan2, "atan2", _("aTan2") );
+ ADD_VALUENODE(ValueNode_Exp, "exp", _("Exponential") );
+ ADD_VALUENODE(ValueNode_Switch, "switch", _("Switch") );
#undef ADD_VALUENODE
#undef ADD_VALUENODE2
#undef ADD_VALUENODE
#undef ADD_VALUENODE2
@@
-233,9
+252,12
@@
ValueNode::~ValueNode()
void
ValueNode::on_changed()
{
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();
get_root_canvas()->signal_value_node_changed()(this);
Node::on_changed();
@@
-430,7
+452,7
@@
PlaceholderValueNode::create(ValueBase::Type type)
}
ValueBase
}
ValueBase
-PlaceholderValueNode::operator()(Time
t
)const
+PlaceholderValueNode::operator()(Time
/*t*/
)const
{
assert(0);
return ValueBase();
{
assert(0);
return ValueBase();