X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_timeloop.cpp;h=8bec653b01489b9e1aa7733fb6c0cfeb9fe04fc2;hb=01f655d3bb6e2d015dcf6918b1168cf82c81c41f;hp=913a4c6ab8ffe20112dab8cf08cad4b8fddabf62;hpb=e556a9e73eaf9af70f65f197de762d3b507f5d7e;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_timeloop.cpp b/synfig-core/trunk/src/synfig/valuenode_timeloop.cpp
index 913a4c6..8bec653 100644
--- a/synfig-core/trunk/src/synfig/valuenode_timeloop.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_timeloop.cpp
@@ -6,7 +6,7 @@
 **
 **	\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
@@ -60,8 +60,8 @@ ValueNode_TimeLoop::ValueNode_TimeLoop(const ValueNode::Handle &x):
 {
 	set_link("link", x);
 	set_link("link_time",  ValueNode_Const::create(Time(0)));
-	set_link("local_time", ValueNode_Const::create(Time(1)));
-	set_link("duration",   ValueNode_Const::create(Time(0)));
+	set_link("local_time", ValueNode_Const::create(Time(0)));
+	set_link("duration",   ValueNode_Const::create(Time(1)));
 }
 
 ValueNode_TimeLoop*
@@ -82,27 +82,25 @@ ValueNode_TimeLoop::~ValueNode_TimeLoop()
 }
 
 bool
-ValueNode_TimeLoop::set_link_vfunc(int i,ValueNode::Handle x)
+ValueNode_TimeLoop::set_link_vfunc(int i,ValueNode::Handle value)
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	switch(i)
 	{
-	case 0:  link_       = x; break;
-	case 1:  link_time_  = x; break;
-	case 2:  local_time_ = x; break;
-	case 3:  duration_   = x; break;
-	default: return false;
+	case 0: CHECK_TYPE_AND_SET_VALUE(link_,       get_type());
+	case 1: CHECK_TYPE_AND_SET_VALUE(link_time_,  ValueBase::TYPE_TIME);
+	case 2: CHECK_TYPE_AND_SET_VALUE(local_time_, ValueBase::TYPE_TIME);
+	case 3: CHECK_TYPE_AND_SET_VALUE(duration_,   ValueBase::TYPE_TIME);
 	}
-
-	signal_child_changed()(i);
-	signal_value_changed()();
-	return true;
+	return false;
 }
 
 ValueNode::LooseHandle
 ValueNode_TimeLoop::get_link_vfunc(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return link_;
 	if(i==1) return link_time_;
 	if(i==2) return local_time_;
@@ -120,7 +118,8 @@ ValueNode_TimeLoop::link_count()const
 String
 ValueNode_TimeLoop::link_local_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return _("Link");
 	if(i==1) return _("Link Time");
 	if(i==2) return _("Local Time");
@@ -131,7 +130,8 @@ ValueNode_TimeLoop::link_local_name(int i)const
 String
 ValueNode_TimeLoop::link_name(int i)const
 {
-	assert(i >= 0 && i < link_count());
+	assert(i>=0 && i<link_count());
+
 	if(i==0) return "link";
 	if(i==1) return "link_time";
 	if(i==2) return "local_time";
@@ -163,13 +163,14 @@ ValueNode_TimeLoop::operator()(Time t)const
 	{
 		t -= local_time;
 		t -= floor(t / duration) * duration;
-		t = link_time + t;
+		t  = link_time + t;
 	}
 	else
 	{
+		duration = -duration;
 		t -= local_time;
 		t -= floor(t / duration) * duration;
-		t = link_time + duration - t;
+		t  = link_time - t;
 	}
 
 	return (*link_)(t);