X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=572aee29f1d268f3dfbedb3fd6620b6f9985c83f;hb=3c84217d4e5701c51c796df7c745ad39d90903a8;hp=e632f26ebe257c206c40741f19e05741d36249e5;hpb=5335d36efe2ec34b99cf1d6fa65c0c4c2a5d199b;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index e632f26..572aee2 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.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
@@ -144,6 +144,18 @@ Layer_PasteCanvas::get_param_vocab()const
 		.set_local_name(_("Children Lock"))
 	);
 
+	// optimize_layers() in canvas.cpp makes a new PasteCanvas layer
+	// and copies over the parameters of the old layer.  the
+	// 'curr_time' member wasn't being copied, so I've added it as a
+	// hidden, non critical parameter, and now it will be.  this
+	// allows a single exported subcanvas to be used more than once at
+	// a time, with different time offets in each.  see bug #1896557.
+	ret.push_back(ParamDesc("curr_time")
+		.set_local_name(_("Current Time"))
+		.not_critical()
+		.hidden()
+	);
+
 	return ret;
 }
 
@@ -159,7 +171,12 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 		return true;
 	}
 
-	//! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful
+	//! \todo this introduces bug 1844764 if enabled; it was introduced in r954.
+	// http://synfig.org/images/3/3d/Moving-waypoints.sifz is an
+	// example of an animation that has its waypoints displayed
+	// incorrectly without this fix; select the outer layer and drag
+	// the time slider.  The linear waypoints don't take effect until
+	// 5s, but the time slider appears to pass the first one at 3s.
 #if 0
 	if (param=="time_offset" && value.same_type_as(time_offset))
 	{
@@ -178,6 +195,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 
 	IMPORT(children_lock);
 	IMPORT(zoom);
+	IMPORT(curr_time);
 
 	return Layer_Composite::set_param(param,value);
 }
@@ -244,6 +262,7 @@ Layer_PasteCanvas::get_param(const String& param)const
 	EXPORT(zoom);
 	EXPORT(time_offset);
 	EXPORT(children_lock);
+	EXPORT(curr_time);
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
@@ -317,9 +336,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	if(!canvas || !get_amount())
 		return context.accelerated_render(surface,quality,renddesc,cb);
 
-	if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
-		canvas->set_time(curr_time+time_offset);
-
 	SuperCallback stageone(cb,0,4500,10000);
 	SuperCallback stagetwo(cb,4500,9000,10000);
 	SuperCallback stagethree(cb,9000,9999,10000);
@@ -339,10 +355,32 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	else if (!context.accelerated_render(surface,quality,renddesc,&stageone))
 		return false;
 
+	if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
+		canvas->set_time(curr_time+time_offset);
+
 	Color::BlendMethod blend_method(get_blend_method());
 	const Rect full_bounding_rect(canvas->get_context().get_full_bounding_rect());
+
 	bool blend_using_straight = false; // use 'straight' just for the central blit
 
+	// sometimes the user changes the parameters while we're
+	// rendering, causing our pasted canvas' bounding box to shrink
+	// and no longer overlap with our tile.  if that has happened,
+	// let's just stop now - we'll be refreshing soon anyway
+	//! \todo shouldn't a mutex ensure this isn't needed?
+	// http://synfig.org/images/d/d2/Bbox-change.sifz is an example
+	// that shows this happening - open the encapsulation, select the
+	// 'shade', and toggle the 'invert' parameter quickly.
+	// Occasionally you'll see:
+	//   error: Context::accelerated_render(): Layer "shade" threw a bad_alloc exception!
+	// where the shade layer tries to allocate itself a canvas of
+	// negative proportions, due to changing bounding boxes.
+	if (!etl::intersect(desc.get_rect(), full_bounding_rect))
+	{
+		warning("%s:%d bounding box shrank while rendering?", __FILE__, __LINE__);
+		return true;
+	}
+
 	// we have rendered what's under us, if necessary
 	if(context->empty())
 	{