**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** 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
}
bool
-ValueNode_Duplicate::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_Duplicate::set_link_vfunc(int i,ValueNode::Handle value)
{
assert(i>=0 && i<link_count());
switch(i)
{
- case 0: from_ = x; break;
- case 1: to_ = x; break;
- case 2: step_ = x; break;
- default: return false;
+ case 0: CHECK_TYPE_AND_SET_VALUE(from_, ValueBase::TYPE_REAL);
+ case 1: CHECK_TYPE_AND_SET_VALUE(to_, ValueBase::TYPE_REAL);
+ case 2: CHECK_TYPE_AND_SET_VALUE(step_, ValueBase::TYPE_REAL);
}
-
- signal_child_changed()(i);
- signal_value_changed()();
- return true;
+ return false;
}
ValueNode::LooseHandle
Real from = (*from_)(t).get(Real());
Real to = (*to_ )(t).get(Real());
Real step = (*step_)(t).get(Real());
+ Real prev = index;
if (step == 0) return false;
if (from < to)
{
- index += step;
- return index <= to;
+ if ((index += step) <= to) return true;
}
else
- {
- index -= step;
- return index >= to;
- }
+ if ((index -= step) >= to) return true;
+
+ // at the end of the loop, leave the index at the last value that was used
+ index = prev;
+ return false;
}
int
}
ValueBase
-ValueNode_Duplicate::operator()(Time t)const
+ValueNode_Duplicate::operator()(Time t __attribute__ ((unused)))const
{
+ if (getenv("SYNFIG_DEBUG_VALUENODE_OPERATORS"))
+ printf("%s:%d operator()\n", __FILE__, __LINE__);
+
return index;
}
}
bool
-ValueNode_Duplicate::check_type(ValueBase::Type type)
+ValueNode_Duplicate::check_type(ValueBase::Type type __attribute__ ((unused)))
{
// never offer this as a choice. it's used automatically by the 'Duplicate' layer.
return false;