X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_duplicate.cpp;h=5bb65f151fad284dfcb0b6d60447d8576ec80e8e;hb=41c73ed08565103a6004b768d9c198453d98cb62;hp=2b67c3ebdfed50c66971beeb33af0b11ef51eac6;hpb=474cd1e55546da94fc56b6af187fdbeefa3d80ca;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp b/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
index 2b67c3e..5bb65f1 100644
--- a/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_duplicate.cpp
@@ -82,26 +82,24 @@ ValueNode_Duplicate::~ValueNode_Duplicate()
 }
 
 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());
+	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
 ValueNode_Duplicate::get_link_vfunc(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return from_;
 	if(i==1) return to_;
 	if(i==2) return step_;
@@ -118,7 +116,8 @@ ValueNode_Duplicate::link_count()const
 String
 ValueNode_Duplicate::link_local_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return _("From");
 	if(i==1) return _("To");
 	if(i==2) return _("Step");
@@ -128,7 +127,8 @@ ValueNode_Duplicate::link_local_name(int i)const
 String
 ValueNode_Duplicate::link_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return "from";
 	if(i==1) return "to";
 	if(i==2) return "step";
@@ -158,6 +158,7 @@ ValueNode_Duplicate::step(Time t)const
 	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;
 
@@ -165,14 +166,14 @@ ValueNode_Duplicate::step(Time t)const
 
 	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
@@ -188,7 +189,7 @@ ValueNode_Duplicate::count_steps(Time t)const
 }
 
 ValueBase
-ValueNode_Duplicate::operator()(Time t)const
+ValueNode_Duplicate::operator()(Time t __attribute__ ((unused)))const
 {
 	return index;
 }
@@ -206,7 +207,7 @@ ValueNode_Duplicate::get_local_name()const
 }
 
 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;