X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode.cpp;h=ee0feb87f2252edb8c169558ed9b3cac8b2e073e;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=1605d79d6c11ed9e9464371f474b19296625b6f9;hpb=480ae5c1431805f2ef2028f27a6aca6a2a2ea364;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 1605d79..ee0feb8 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -88,19 +88,26 @@ ValueNode::subsys_init() { book_=new LinkableValueNode::Book(); -#define ADD_VALUENODE(c,n,l) (*book_)[n].factory=reinterpret_cast(&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(&c::create_from); (*book_)[n].check_type=&c::check_type;(*book_)[n].local_name=l +#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_Scale, "scale", _("Scale") ); - ADD_VALUENODE(ValueNode_SegCalcTangent, "segcalctangent", _("Seg Calc Tangent") ); - ADD_VALUENODE(ValueNode_SegCalcVertex, "segcalcvertex", _("Seg Calc Vertex") ); + ADD_VALUENODE(ValueNode_SegCalcTangent, "segcalctangent", _("Segment Tangent") ); + ADD_VALUENODE(ValueNode_SegCalcVertex, "segcalcvertex", _("Segment Vertex") ); ADD_VALUENODE(ValueNode_Stripes, "stripes", _("Stripes") ); ADD_VALUENODE(ValueNode_Subtract, "subtract", _("Subtract") ); - //ADD_VALUENODE(ValueNode_TimedSwap, "timed_swap", _("Timed Swap") ); + 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") ); @@ -423,7 +430,7 @@ PlaceholderValueNode::create(ValueBase::Type type) } ValueBase -PlaceholderValueNode::operator()(Time t)const +PlaceholderValueNode::operator()(Time /*t*/)const { assert(0); return ValueBase();