projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use a specialised parser for <composite> valuenodes - use the same as for all...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_segcalctangent.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
b/synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
index
3400042
..
a457624
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_segcalctangent.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_segcalctangent.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_segcalctangent.cpp
-** \brief
Template File
+** \brief
Implementation of the "Segment Tangent" valuenode conversion.
**
**
-** $Id
: valuenode_segcalctangent.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
**
** \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
@@
-58,10
+59,10
@@
ValueNode_SegCalcTangent::ValueNode_SegCalcTangent(const ValueBase::Type &x):
LinkableValueNode(x)
{
if(x!=ValueBase::TYPE_VECTOR)
LinkableValueNode(x)
{
if(x!=ValueBase::TYPE_VECTOR)
- throw Exception::BadType(ValueBase::type_name(x));
+ throw Exception::BadType(ValueBase::type_
local_
name(x));
- se
gment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT
);
-
amount_=ValueNode_Const::create(Real(0.5
));
+ se
t_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT)
);
+
set_link("amount",ValueNode_Const::create(Real(0.5)
));
}
ValueNode_SegCalcTangent*
}
ValueNode_SegCalcTangent*
@@
-101,7
+102,7
@@
ValueNode_SegCalcTangent::get_name()const
String
ValueNode_SegCalcTangent::get_local_name()const
{
String
ValueNode_SegCalcTangent::get_local_name()const
{
- return _("Seg
Calc
Tangent");
+ return _("Seg
ment
Tangent");
}
bool
}
bool
@@
-111,20
+112,14
@@
ValueNode_SegCalcTangent::check_type(ValueBase::Type type)
}
bool
}
bool
-ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle
x
)
+ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle
value
)
{
{
- assert(i==0 || i==1);
- if(i==0)
- {
- segment_=x;
- signal_child_changed()(i);signal_value_changed()();
- return true;
- }
- if(i==1)
+ assert(i>=0 && i<link_count());
+
+ switch(i)
{
{
- amount_=x;
- signal_child_changed()(i);signal_value_changed()();
- return true;
+ case 0: CHECK_TYPE_AND_SET_VALUE(segment_, ValueBase::TYPE_SEGMENT);
+ case 1: CHECK_TYPE_AND_SET_VALUE(amount_, ValueBase::TYPE_REAL);
}
return false;
}
}
return false;
}
@@
-132,7
+127,8
@@
ValueNode_SegCalcTangent::set_link_vfunc(int i,ValueNode::Handle x)
ValueNode::LooseHandle
ValueNode_SegCalcTangent::get_link_vfunc(int i)const
{
ValueNode::LooseHandle
ValueNode_SegCalcTangent::get_link_vfunc(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return segment_;
if(i==1)
if(i==0)
return segment_;
if(i==1)
@@
-150,7
+146,8
@@
ValueNode_SegCalcTangent::link_count()const
String
ValueNode_SegCalcTangent::link_name(int i)const
{
String
ValueNode_SegCalcTangent::link_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return "segment";
if(i==1)
if(i==0)
return "segment";
if(i==1)
@@
-161,7
+158,8
@@
ValueNode_SegCalcTangent::link_name(int i)const
String
ValueNode_SegCalcTangent::link_local_name(int i)const
{
String
ValueNode_SegCalcTangent::link_local_name(int i)const
{
- assert(i==0 || i==1);
+ assert(i>=0 && i<link_count());
+
if(i==0)
return _("Segment");
if(i==1)
if(i==0)
return _("Segment");
if(i==1)