projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add optional debugging for calls to ValueNode_*::operator(). export SYNFIG_DEBUG_VAL...
[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
cf047eb
..
6391f39
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_segcalcvertex.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_segcalcvertex.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_segcalcvertex.cpp
-** \brief
Template File
+** \brief
Implementation of the "Segment Vertex" valuenode conversion.
**
** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 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
@@
-57,11
+58,10
@@
ValueNode_SegCalcVertex::ValueNode_SegCalcVertex(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));
-
- segment_=ValueNode_Composite::create(ValueBase::TYPE_SEGMENT);
- amount_=ValueNode_Const::create(Real(0.5));
+ throw Exception::BadType(ValueBase::type_local_name(x));
+ set_link("segment",ValueNode_Const::create(ValueBase::TYPE_SEGMENT));
+ set_link("amount",ValueNode_Const::create(Real(0.5)));
}
ValueNode_SegCalcVertex*
}
ValueNode_SegCalcVertex*
@@
-78,6
+78,9
@@
ValueNode_SegCalcVertex::~ValueNode_SegCalcVertex()
ValueBase
ValueNode_SegCalcVertex::operator()(Time t)const
{
ValueBase
ValueNode_SegCalcVertex::operator()(Time t)const
{
+ if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+ printf("%s:%d operator()\n", __FILE__, __LINE__);
+
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);
@@
-105,20
+108,14
@@
ValueNode_SegCalcVertex::check_type(ValueBase::Type type)
}
bool
}
bool
-ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle
x
)
+ValueNode_SegCalcVertex::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;
}
@@
-126,7
+123,8
@@
ValueNode_SegCalcVertex::set_link_vfunc(int i,ValueNode::Handle x)
ValueNode::LooseHandle
ValueNode_SegCalcVertex::get_link_vfunc(int i)const
{
ValueNode::LooseHandle
ValueNode_SegCalcVertex::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)
@@
-144,7
+142,8
@@
ValueNode_SegCalcVertex::link_count()const
String
ValueNode_SegCalcVertex::link_name(int i)const
{
String
ValueNode_SegCalcVertex::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)
@@
-155,7
+154,8
@@
ValueNode_SegCalcVertex::link_name(int i)const
String
ValueNode_SegCalcVertex::link_local_name(int i)const
{
String
ValueNode_SegCalcVertex::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)