From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sun, 24 Feb 2008 20:50:31 +0000 (+0000)
Subject: Add an extra 'symmetrical' parameter to the 'time loop' layer to better be able to... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=eef623cc49ddc319219d759e0472e54ce4b3f402;p=synfig.git

Add an extra 'symmetrical' parameter to the 'time loop' layer to better be able to convert the 0.1 version of the layer.


git-svn-id: http://svn.voria.com/code@1813 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp
index 5908001..4306c4a 100644
--- a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp
@@ -67,6 +67,7 @@ Layer_TimeLoop::Layer_TimeLoop()
 {
 	old_version=false;
 	only_for_positive_duration=false;
+	symmetrical=true;
 	link_time=0;
 	local_time=0;
 	duration=1;
@@ -90,6 +91,7 @@ Layer_TimeLoop::set_param(const String & param, const ValueBase &value)
 		IMPORT(link_time);
 		IMPORT(duration);
 		IMPORT(only_for_positive_duration);
+		IMPORT(symmetrical);
 	}
 
 	return Layer::set_param(param,value);
@@ -102,6 +104,7 @@ Layer_TimeLoop::get_param(const String & param)const
 	EXPORT(local_time);
 	EXPORT(duration);
 	EXPORT(only_for_positive_duration);
+	EXPORT(symmetrical);
 	EXPORT_NAME();
 	EXPORT_VERSION();
 
@@ -129,6 +132,10 @@ Layer_TimeLoop::get_param_vocab()const
 		.set_local_name(_("Only For Positive Duration"))
 	);
 
+	ret.push_back(ParamDesc("symmetrical")
+		.set_local_name(_("Symmetrical"))
+	);
+
 	return ret;
 }
 
@@ -163,6 +170,7 @@ Layer_TimeLoop::reset_version()
 	local_time = start_time;
 	duration = end_time - start_time;
 	only_for_positive_duration = true;
+	symmetrical = false;
 
 	//! \todo layer version 0.1 acted differently before start_time was reached - possibly due to a bug
 	link_time = 0;
@@ -204,21 +212,28 @@ Layer_TimeLoop::reset_version()
 void
 Layer_TimeLoop::set_time(Context context, Time t)const
 {
-	if (only_for_positive_duration && duration <= 0)
-		;						// don't change the time
- 	else if (duration == 0)
-		t = link_time;
-	else if (duration > 0)
-	{
-		t -= local_time;
-		t -= floor(t / duration) * duration;
-		t  = link_time + t;
-	}
-	else
+	Time time = t;
+
+	if (!only_for_positive_duration || duration > 0)
 	{
-		t -= local_time;
-		t -= floor(t / -duration) * -duration;
-		t  = link_time - t;
+		if (duration == 0)
+			t = link_time;
+		else if (duration > 0)
+		{
+			t -= local_time;
+			t -= floor(t / duration) * duration;
+			t  = link_time + t;
+		}
+		else
+		{
+			t -= local_time;
+			t -= floor(t / -duration) * -duration;
+			t  = link_time - t;
+		}
+
+		// for compatibility with v0.1 layers; before local_time is reached, take a step back
+		if (!symmetrical && time < local_time)
+			t -= duration;
 	}
 
 	context.set_time(t);
diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.h b/synfig-core/trunk/src/modules/lyr_std/timeloop.h
index e44e6bd..16bbe2a 100644
--- a/synfig-core/trunk/src/modules/lyr_std/timeloop.h
+++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.h
@@ -52,6 +52,7 @@ private:
 	synfig::Time	end_time;
 	bool			old_version;
 	bool			only_for_positive_duration;
+	bool			symmetrical; // the 0.1 version of this layer behaved differently before 'start_time' was reached
 
 protected:
 	Layer_TimeLoop();