X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Ftimegather.cpp;h=5b71201996ab9ddc14fff88fe028121ec773d659;hb=1e706e54c01cd6baae01b1199c8997c48345ed8c;hp=9c75bc10ed10596259591119715d5db2fe0d990b;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/timegather.cpp b/synfig-studio/trunk/src/synfigapp/timegather.cpp
index 9c75bc1..5b71201 100644
--- a/synfig-studio/trunk/src/synfigapp/timegather.cpp
+++ b/synfig-studio/trunk/src/synfigapp/timegather.cpp
@@ -2,10 +2,11 @@
 /*!	\file timegather.cpp
 **	\brief Time Gather File
 **
-**	$Id: timegather.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2004 Adrian Bentley
+**	Copyright (c) 2007 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
@@ -34,6 +35,8 @@
 
 #include <synfig/layer_pastecanvas.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -59,9 +62,9 @@ void synfigapp::timepoints_ref::insert(synfig::ValueNode_Animated::Handle v, syn
 {
 	ValueBaseTimeInfo	vt;
 	vt.val = v;
-	
+
 	waytracker::iterator i = waypointbiglist.find(vt);
-	
+
 	if(i != waypointbiglist.end())
 	{
 		i->waypoints.insert(w);
@@ -76,9 +79,9 @@ void synfigapp::timepoints_ref::insert(synfigapp::ValueDesc v, synfig::Activepoi
 {
 	ActiveTimeInfo	vt;
 	vt.val = v;
-	
+
 	acttracker::iterator i = actpointbiglist.find(vt);
-	
+
 	if(i != actpointbiglist.end())
 	{
 		i->activepoints.insert(a);
@@ -95,10 +98,10 @@ 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)
+void synfigapp::recurse_canvas(synfig::Canvas::Handle h, const std::set<Time> &tlist,
+								timepoints_ref &vals, synfig::Time time_offset)
 {
-	
+
 	//synfig::info("Canvas...\n Recurse through layers");
 	// iterate through the layers
 
@@ -107,41 +110,31 @@ 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)
+void synfigapp::recurse_layer(synfig::Layer::Handle h, const std::set<Time> &tlist,
+								timepoints_ref &vals, synfig::Time time_offset)
 {
 	// iterate through the layers
 	//check for special case of paste canvas
 	etl::handle<synfig::Layer_PasteCanvas> p = etl::handle<synfig::Layer_PasteCanvas>::cast_dynamic(h);
-	
+
 	//synfig::info("Layer...");
-	
+
 	if(p)
 	{
 		//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();
-		
-		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);
-		}
+		synfig::Time subcanvas_time_offset(time_offset + p->get_time_offset());
+
+		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...
@@ -151,10 +144,10 @@ void synfigapp::recurse_layer(synfig::Layer::Handle h, const std::set<Time> &tli
 	for(; i != end; ++i)
 	{
 		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);
 		}
 	}
 }
@@ -163,47 +156,47 @@ template < typename IT, typename CMP >
 static bool sorted(IT i,IT end, const CMP &cmp = CMP())
 {
 	if(i == end) return true;
-		
+
 	for(IT last = i++; i != end; last = i++)
 	{
 		if(!cmp(*last,*i))
 			return false;
 	}
-	
+
 	return true;
 }
 
-void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &tlist, 
-								timepoints_ref &vals)
+void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &tlist,
+								timepoints_ref &vals, synfig::Time time_offset)
 {
 	//special cases for Animated, DynamicList, and Linkable
-	
+
 	//synfig::info("ValueBasenode... %p, %s", h.get_value_node().get(),typeid(*h.get_value_node()).name());
-	
-	
+
+
 	//animated case
 	{
 		synfig::ValueNode_Animated::Handle p = synfig::ValueNode_Animated::Handle::cast_dynamic(h.get_value_node());
-		
+
 		if(p)
 		{
 			//loop through and determine which waypoint we will need to reference
 			const synfig::WaypointList &w = p->waypoint_list();
-			
+
 			synfig::WaypointList::const_iterator i = w.begin(),
 												end = w.end();
-			
+
 			std::set<Time>::const_iterator		j = tlist.begin(),
 												jend = tlist.end();
-			for(; i != end && j != jend;) 
+			for(; i != end && j != jend;)
 			{
 				//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;
@@ -211,48 +204,48 @@ void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &
 			return;
 		}
 	}
-	
+
 	//parent dynamiclist case - just for active points for that object...
 	if(h.parent_is_value_node())
 	{
-		synfig::ValueNode_DynamicList::Handle p = synfig::ValueNode_DynamicList::Handle::cast_dynamic(h.get_parent_value_node());						
-				
+		synfig::ValueNode_DynamicList::Handle p = synfig::ValueNode_DynamicList::Handle::cast_dynamic(h.get_parent_value_node());
+
 		if(p)
 		{
 			int index = h.get_index();
-			
+
 			//check all the active points in each list...
 			const synfig::ActivepointList &a = p->list[index].timing_info;
-			
+
 			//synfig::info("Our parent = dynamic list, searching in %d activepts",a.size());
-						
+
 			std::set<Time>::const_iterator			i = tlist.begin(),
 													end = tlist.end();
-			
+
 			synfig::ActivepointList::const_iterator 	j = a.begin(),
 													jend = a.end();
-			
+
 			for(; j != jend && i != end;)
 			{
-				double it = *i;
+				double it = *i+time_offset;
 				double jt = j->get_time();
 				double diff = (double)(it - jt);
-				
-				//synfig::info("\ttpair match(%.4lg) - %.4lg (diff = %lg",it,jt,diff);				
-				
+
+				//synfig::info("\ttpair match(%.4lg) - %.4lg (diff = %lg",it,jt,diff);
+
 				//
 				if(abs(diff) < (double)Time::epsilon())
 				{
 					//synfig::info("\tActivepoint to add being referenced (%x,%s,%.4lg)",
 					//				(int)j->get_uid(),j->state?"true":"false", (double)j->time);
 					vals.insert(ValueDesc(p,index),*j);
-					++i,++j;						
+					++i,++j;
 				}else if(it < jt)
 				{
 					++i;
 					//synfig::info("\tIncrementing time");
 				}
-				else 
+				else
 				{
 					++j;
 					//synfig::info("\tIncrementing actpt");
@@ -260,51 +253,51 @@ void synfigapp::recurse_valuedesc(synfigapp::ValueDesc h, const std::set<Time> &
 			}
 		}
 	}
-	
+
 	//dynamiclist case - we must still make sure that we read from the list entries the time values
 	//						because just the linked valuenodes will not do that
 	{
 		synfig::ValueNode_DynamicList::Handle p = synfig::ValueNode_DynamicList::Handle::cast_dynamic(h.get_value_node());
-		
+
 		if(p)
 		{
 			//synfig::info("Process dynamic list valuenode");
 			int index = 0;
-			
-			std::vector<synfig::ValueNode_DynamicList::ListEntry>::const_iterator 	
+
+			std::vector<synfig::ValueNode_DynamicList::ListEntry>::const_iterator
 							i = p->list.begin(),
 							end = p->list.end();
-			
+
 			for(; i != end; ++i, ++index)
 			{
 				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;
 		}
 	}
-	
+
 	//the linkable case...
 	{
 		etl::handle<synfig::LinkableValueNode> p = etl::handle<synfig::LinkableValueNode>::cast_dynamic(h.get_value_node());
-		
+
 		if(p)
 		{
 			//synfig::info("Process Linkable ValueBasenode");
 			int i = 0, size = p->link_count();
-			
+
 			for(; i < size; ++i)
 			{
 				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);
 				}
 			}
 		}