X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_tile.cpp;h=f02b71bc7620adf2039cd0eb51477f0a2bb53de1;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=c12c2d0aecc35496d7023ac8a433f0f323ecac23;hpb=7708bd2d21d72812db5d0bb4d5ef89d206ec260c;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp
index c12c2d0..f02b71b 100644
--- a/synfig-core/trunk/src/synfig/target_tile.cpp
+++ b/synfig-core/trunk/src/synfig/target_tile.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	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
@@ -50,9 +51,16 @@ using namespace synfig;
 const unsigned int	DEF_TILE_WIDTH = TILE_SIZE / 2;
 const unsigned int	DEF_TILE_HEIGHT= TILE_SIZE / 2;
 
-#define SYNFIG_OPTIMIZE_LAYER_TREE 	1
+// note that if this isn't defined then the rendering is incorrect for
+// the straight blend method since the optimize_layers() function in
+// canvas.cpp which makes the straight blend method work correctly
+// isn't called.  ie. leave this defined.  to see the problem, draw a
+// small circle over a solid background.  set circle to amount 0.99
+// and blend method 'straight'.  the background should vanish but doesn't
+#define SYNFIG_OPTIMIZE_LAYER_TREE
+
 #ifdef _DEBUG
-#define SYNFIG_DISPLAY_EFFICIENCY	1
+// #define SYNFIG_DISPLAY_EFFICIENCY
 #endif
 
 /* === G L O B A L S ======================================================= */
@@ -282,7 +290,7 @@ synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb)
 	if(cb && !cb->amount_complete(total_tiles,total_tiles))
 		return false;
 
-#if SYNFIG_DISPLAY_EFFICIENCY==1
+#ifdef SYNFIG_DISPLAY_EFFICIENCY
 	synfig::info(">>>>>> Render Time: %fsec, Find Tile Time: %fsec, Add Tile Time: %fsec, Total Time: %fsec",work_time,find_tile_time,add_tile_time,total_time());
 	synfig::info(">>>>>> FRAME EFFICIENCY: %f%%",(100.0f*work_time/total_time()));
 #endif
@@ -355,21 +363,29 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 
 			Context context;
 
-			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
-			Canvas::Handle op_canvas(Canvas::create());
-			optimize_layers(canvas->get_context(), op_canvas);
-			context=op_canvas->get_context();
-			#else
+#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
+			Canvas::Handle op_canvas;
+			if (!getenv("SYNFIG_DISABLE_OPTIMIZE_LAYER_TREE"))
+			{
+				op_canvas = Canvas::create();
+				op_canvas->set_file_name(canvas->get_file_name());
+				optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
+				context=op_canvas->get_context();
+			}
+			else
+				context=canvas->get_context();
+#else
 			context=canvas->get_context();
-			#endif
+#endif
 
 /*
 			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 			Context context;
 			Canvas::Handle op_canvas(Canvas::create());
+			op_canvas->set_file_name(canvas->get_file_name());
 			// Set the time that we wish to render
 			canvas->set_time(t);
-			optimize_layers(canvas->get_context(), op_canvas);
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
 			context=op_canvas->get_context();
 			#else
 			Context context;
@@ -400,13 +416,20 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 
 			Context context;
 
-			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
-			Canvas::Handle op_canvas(Canvas::create());
-			optimize_layers(canvas->get_context(), op_canvas);
-			context=op_canvas->get_context();
-			#else
+#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
+			Canvas::Handle op_canvas;
+			if (!getenv("SYNFIG_DISABLE_OPTIMIZE_LAYER_TREE"))
+			{
+				op_canvas = Canvas::create();
+				op_canvas->set_file_name(canvas->get_file_name());
+				optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
+				context=op_canvas->get_context();
+			}
+			else
+				context=canvas->get_context();
+#else
 			context=canvas->get_context();
-			#endif
+#endif
 
 			if(!render_frame_(context, cb))
 				return false;