X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Ftimegather.cpp;h=9b8ada1fe537d2a0ff58f8c13f26ca7a74f9338c;hb=1caec5f187f1ec173ee8e8b08af726d9e1d86cda;hp=e7a05dc54d948044bb14c1c387586f9a858fb3e6;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/timegather.cpp b/synfig-studio/trunk/src/synfigapp/timegather.cpp
index e7a05dc..9b8ada1 100644
--- a/synfig-studio/trunk/src/synfigapp/timegather.cpp
+++ b/synfig-studio/trunk/src/synfigapp/timegather.cpp
@@ -34,6 +34,8 @@
 
 #include <synfig/layer_pastecanvas.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -96,7 +98,7 @@ void synfigapp::timepoints_ref::insert(synfigapp::ValueDesc v, synfig::Activepoi
 
 //recursion functions
 void synfigapp::recurse_canvas(synfig::Canvas::Handle h, const std::set<Time> &tlist,
-								timepoints_ref &vals)
+								timepoints_ref &vals, synfig::Time time_offset)
 {
 
 	//synfig::info("Canvas...\n Recurse through layers");
@@ -107,15 +109,15 @@ void synfigapp::recurse_canvas(synfig::Canvas::Handle h, const std::set<Time> &t
 	for(; i != end; ++i)
 	{
 		const Node::time_set &tset = (*i)->get_times();
-		if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end()))
+		if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end(),time_offset))
 		{
-			recurse_layer(*i,tlist,vals);
+			recurse_layer(*i,tlist,vals,time_offset);
 		}
 	}
 }
 
 void synfigapp::recurse_layer(synfig::Layer::Handle h, const std::set<Time> &tlist,
-								timepoints_ref &vals)
+								timepoints_ref &vals, synfig::Time time_offset)
 {
 	// iterate through the layers
 	//check for special case of paste canvas
@@ -128,20 +130,10 @@ void synfigapp::recurse_layer(synfig::Layer::Handle h, const std::set<Time> &tli
 		//synfig::info("We are a paste canvas so go into that");
 		//recurse into the canvas
 		const synfig::Node::time_set &tset = p->get_sub_canvas()->get_times();
+		synfig::Time subcanvas_time_offset(time_offset + p->get_time_offset());
 
-		if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end()))
-		{
-			//we have to offset the times so it won't wreck havoc if the canvas is imported more than once...
-			// and so we get correct results when offsets are present
-			std::set<Time>	tlistoff;
-			std::set<Time>::iterator i = tlist.begin(), end = tlist.end();
-			for(; i != end; ++i)
-			{
-				tlistoff.insert(*i - p->get_time_offset());
-			}
-
-			recurse_canvas(p->get_sub_canvas(),tlist,vals);
-		}
+		if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end(),subcanvas_time_offset))
+			recurse_canvas(p->get_sub_canvas(),tlist,vals,subcanvas_time_offset);
 	}
 
 	//check all the valuenodes regardless...
@@ -152,9 +144,9 @@ void synfigapp::recurse_layer(synfig::Layer::Handle h, const std::set<Time> &tli
 	{
 		const synfig::Node::time_set &tset = i->second->get_times();
 
-		if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end()))
+		if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end(),time_offset))
 		{
-			recurse_valuedesc(ValueDesc(h,i->first),tlist,vals);
+			recurse_valuedesc(ValueDesc(h,i->first),tlist,vals,time_offset);
 		}
 	}
 }
@@ -174,7 +166,7 @@ static bool sorted(IT i,IT end, const CMP &cmp = CMP())
 }
 
 void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &tlist,
-								timepoints_ref &vals)
+								timepoints_ref &vals, synfig::Time time_offset)
 {
 	//special cases for Animated, DynamicList, and Linkable
 
@@ -199,11 +191,11 @@ void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &
 			{
 				//synfig::info("tpair t(%.3f) = %.3f", (float)*j, (float)(i->get_time()));
 
-				if(j->is_equal(i->get_time()))
+				if((*j+time_offset).is_equal(i->get_time()))
 				{
 					vals.insert(p,*i);
 					++i,++j;
-				}else if(*i < *j)
+				}else if(*i < *j+time_offset)
 				{
 					++i;
 				}else ++j;
@@ -234,7 +226,7 @@ void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &
 
 			for(; j != jend && i != end;)
 			{
-				double it = *i;
+				double it = *i+time_offset;
 				double jt = j->get_time();
 				double diff = (double)(it - jt);
 
@@ -279,9 +271,9 @@ void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &
 			{
 				const Node::time_set &tset = i->get_times();
 
-				if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end()))
+				if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end(),time_offset))
 				{
-					recurse_valuedesc(ValueDesc(p,index),tlist,vals);
+					recurse_valuedesc(ValueDesc(p,index),tlist,vals,time_offset);
 				}
 			}
 			return;
@@ -302,9 +294,9 @@ void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &
 				ValueNode::Handle v = p->get_link(i);
 				const Node::time_set &tset = v->get_times();
 
-				if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end()))
+				if(check_intersect(tset.begin(),tset.end(),tlist.begin(),tlist.end(),time_offset))
 				{
-					recurse_valuedesc(ValueDesc(p,i),tlist,vals);
+					recurse_valuedesc(ValueDesc(p,i),tlist,vals,time_offset);
 				}
 			}
 		}