projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow the 'subtract' convert type to work with times.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_segcalcvertex.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
b/synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
index
d3294cf
..
15956cd
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@
-2,7
+2,7
@@
/*! \file valuenode_segcalcvertex.cpp
** \brief Template File
**
/*! \file valuenode_segcalcvertex.cpp
** \brief Template File
**
-** $Id
: valuenode_segcalcvertex.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
@@
-58,10
+58,9
@@
ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(const ValueBase::Type &x):
{
if(x!=ValueBase::TYPE_VECTOR)
throw Exception::BadType(ValueBase::type_name(x));
{
if(x!=ValueBase::TYPE_VECTOR)
throw Exception::BadType(ValueBase::type_name(x));
-
- segment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT);
- amount_=ValueNode_Const::create(Real(0.5));
-
+
+ set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
+ set_link("amount",ValueNode_Const::create(Real(0.5)));
}
ValueNode_SegCalcVertex*
}
ValueNode_SegCalcVertex*
@@
-81,7
+80,7
@@
ValueNode_SegCalcVertex::operator()(Time t)const
Segment segment((*segment_)(t).get(Segment()));
etl::hermite<Vector> curve(segment.p1,segment.p2,segment.t1,segment.t2);
Segment segment((*segment_)(t).get(Segment()));
etl::hermite<Vector> curve(segment.p1,segment.p2,segment.t1,segment.t2);
-
+
return curve((*amount_)(t).get(Real()));
}
return curve((*amount_)(t).get(Real()));
}
@@
-95,9
+94,9
@@
ValueNode_SegCalcVertex::get_name()const
String
ValueNode_SegCalcVertex::get_local_name()const
{
String
ValueNode_SegCalcVertex::get_local_name()const
{
- return _("Seg
Calc
Vertex");
+ return _("Seg
ment
Vertex");
}
}
-
+
bool
ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
{
bool
ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
{
@@
-170,7
+169,7
@@
ValueNode_SegCalcVertex::get_link_index_from_name(const String &name)const
return 0;
if(name=="amount")
return 1;
return 0;
if(name=="amount")
return 1;
-
+
throw Exception::BadLinkName(name);
}
throw Exception::BadLinkName(name);
}