Added copyright lines for files I've edited this year.

[synfig.git] / synfig-core / trunk / src / synfig / target_tile.cpp

diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp
index 8887d12..8bb06d9 100644 (file)
--- 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
@@ -47,12 +48,12 @@ using namespace etl;
 using namespace synfig;
 
 /* === M A C R O S ========================================================= */
-const unsigned int     DEF_TILE_WIDTH = 64;
-const unsigned int     DEF_TILE_HEIGHT= 64;
+const unsigned int     DEF_TILE_WIDTH = TILE_SIZE / 2;
+const unsigned int     DEF_TILE_HEIGHT= TILE_SIZE / 2;
 
 #define SYNFIG_OPTIMIZE_LAYER_TREE     1
 #ifdef _DEBUG
-#define SYNFIG_DISPLAY_EFFICIENCY      1
+// #define SYNFIG_DISPLAY_EFFICIENCY   1
 #endif
 
 /* === G L O B A L S ======================================================= */
@@ -276,6 +277,7 @@ synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb)
                                add_tile_time+=timer();
                        }
                        tile_timer.reset();
+                       signal_progress()();
                }
        }
        if(cb && !cb->amount_complete(total_tiles,total_tiles))
@@ -283,7 +285,7 @@ synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb)
 
 #if SYNFIG_DISPLAY_EFFICIENCY==1
        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 EFICIENCY: %f%%",(100.0f*work_time/total_time()));
+       synfig::info(">>>>>> FRAME EFFICIENCY: %f%%",(100.0f*work_time/total_time()));
 #endif
 #undef total_tiles
        return true;
@@ -307,7 +309,7 @@ synfig::Target_Tile::render(ProgressCallback *cb)
        curr_frame_=0;
        init();
        if( !init() ){
-               if(cb) cb->error(_("Target initialisation failure"));
+               if(cb) cb->error(_("Target initialization failure"));
                return false;
        }
 
@@ -356,7 +358,8 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 
                        #ifdef SYNFIG_OPTIMIZE_LAYER_TREE
                        Canvas::Handle op_canvas(Canvas::create());
-                       optimize_layers(canvas->get_context(), op_canvas);
+                       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();
@@ -366,9 +369,10 @@ synfig::Target_Tile::render(ProgressCallback *cb)
                        #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;
@@ -401,7 +405,8 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 
                        #ifdef SYNFIG_OPTIMIZE_LAYER_TREE
                        Canvas::Handle op_canvas(Canvas::create());
-                       optimize_layers(canvas->get_context(), op_canvas);
+                       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();