X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode.cpp;h=44617406382df72de10671c5464a701097270188;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=9f4e627e941dfa10711bba38eb8949b3b3e708c6;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 9f4e627..4461740 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -1,11 +1,12 @@ /* === S Y N F I G ========================================================= */ -/*! \file value_node.cpp +/*! \file valuenode.cpp ** \brief Template File ** -** $Id: valuenode.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ +** $Id$ ** ** \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 @@ -42,9 +43,14 @@ #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_repeat_gradient.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" @@ -53,6 +59,7 @@ #include "valuenode_radialcomposite.h" #include "valuenode_gradientrotate.h" #include "valuenode_sine.h" +#include "valuenode_exp.h" #include "layer.h" @@ -88,26 +95,41 @@ ValueNode::subsys_init() { book_=new LinkableValueNode::Book(); -#define ADD_VALUENODE(c,n) (*book_)[n].factory=reinterpret_cast(&c::create); (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=n -#define ADD_VALUENODE2(c,n) (*book_)[n].factory=reinterpret_cast(&c::create_from); (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=n - - ADD_VALUENODE(ValueNode_Linear,"linear"); - ADD_VALUENODE(ValueNode_Composite,"composite"); - ADD_VALUENODE(ValueNode_RadialComposite,"radial_composite"); - ADD_VALUENODE(ValueNode_Reference,"reference"); - ADD_VALUENODE(ValueNode_Scale,"scale"); - ADD_VALUENODE(ValueNode_SegCalcTangent,"segcalctangent"); - ADD_VALUENODE(ValueNode_SegCalcVertex,"segcalcvertex"); - ADD_VALUENODE(ValueNode_Stripes,"stripes"); - ADD_VALUENODE(ValueNode_Subtract,"subtract"); - //ADD_VALUENODE(ValueNode_TimedSwap,"timed_swap"); - ADD_VALUENODE(ValueNode_TwoTone,"twotone"); - ADD_VALUENODE(ValueNode_BLine,"bline"); - ADD_VALUENODE2(ValueNode_DynamicList,"dynamic_list"); - ADD_VALUENODE(ValueNode_GradientRotate,"gradient_rotate"); - ADD_VALUENODE(ValueNode_Sine,"sine"); - +#define ADD_VALUENODE(class,name,local) \ + (*book_)[name].factory=reinterpret_cast(&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(&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_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_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_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 + return true; } @@ -122,8 +144,8 @@ ValueNode::subsys_stop() if(global_value_node_map.size()!=value_node_count) synfig::error("value node count mismatch! map.size()!=value_node_count (%d!=%d)",global_value_node_map.size(),value_node_count); - - GlobalValueNodeMap::iterator iter; + + GlobalValueNodeMap::iterator iter; for(iter=global_value_node_map.begin();iter!=global_value_node_map.end();++iter) { if(!iter->second->is_exported()) @@ -178,13 +200,13 @@ bool LinkableValueNode::set_link(int i,ValueNode::Handle x) { ValueNode::Handle previous(get_link(i)); - + if(set_link_vfunc(i,x)) { if(previous) remove_child(previous.get()); add_child(x.get()); - + if(!x->is_exported() && get_parent_canvas()) { x->set_parent_canvas(get_parent_canvas()); @@ -215,7 +237,7 @@ LinkableValueNode::unlink_all() ValueNode::~ValueNode() { value_node_count--; - + begin_delete(); //DEBUGPOINT(); @@ -224,11 +246,14 @@ 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 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(); } @@ -237,7 +262,7 @@ ValueNode::replace(etl::handle x) { if(x.get()==this) return 0; - + while(parent_set.size()) { (*parent_set.begin())->add_child(x.get()); @@ -318,9 +343,9 @@ ValueNodeList::surefind(const String &id) { if(id.empty()) throw Exception::IDNotFound("Empty ID"); - + ValueNode::Handle value_node; - + try { value_node=find(id); @@ -375,11 +400,11 @@ ValueNodeList::add(ValueNode::Handle value_node) return false; } catch(Exception::IDNotFound) - { + { push_back(value_node); return true; } - + return false; } @@ -421,7 +446,7 @@ PlaceholderValueNode::create(ValueBase::Type type) } ValueBase -PlaceholderValueNode::operator()(Time t)const +PlaceholderValueNode::operator()(Time /*t*/)const { assert(0); return ValueBase(); @@ -440,7 +465,7 @@ LinkableValueNode::clone(const GUID& deriv_guid)const int i; LinkableValueNode *ret=create_new(); ret->set_guid(get_guid()^deriv_guid); - + for(i=0;i x)const { assert(is_exported()); assert(canvas_); - + if(x.get()==canvas_.get()) return get_id(); - + return canvas_->_get_relative_id(x)+':'+get_id(); } @@ -485,9 +510,9 @@ ValueNode::set_root_canvas(etl::loose_handle x) void LinkableValueNode::get_times_vfunc(Node::time_set &set) const { ValueNode::LooseHandle h; - + int size = link_count(); - + //just add it to the set... for(int i=0; i < size; ++i) {