X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_tile.cpp;h=8bb06d94a007ab237b6eba96f5aba2065a330f28;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=e8232e20ab02e4fa4506fd098f7b270b33a66031;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp index e8232e2..8bb06d9 100644 --- a/synfig-core/trunk/src/synfig/target_tile.cpp +++ b/synfig-core/trunk/src/synfig/target_tile.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file target_tile.cpp ** \brief Template File ** -** $Id: target_tile.cpp,v 1.2 2005/01/12 06:46:45 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -43,15 +45,15 @@ using namespace std; using namespace etl; -using namespace sinfg; +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 SINFG_OPTIMIZE_LAYER_TREE 1 +#define SYNFIG_OPTIMIZE_LAYER_TREE 1 #ifdef _DEBUG -#define SINFG_DISPLAY_EFFICIENCY 1 +// #define SYNFIG_DISPLAY_EFFICIENCY 1 #endif /* === G L O B A L S ======================================================= */ @@ -91,11 +93,11 @@ Target_Tile::next_frame(Time& time) frame_end=desc.get_frame_end(); time_start=desc.get_time_start(); time_end=desc.get_time_end(); - + // Calculate the number of frames total_frames=frame_end-frame_start; if(total_frames<=0)total_frames=1; - + //RendDesc rend_desc=desc; //rend_desc.set_gamma(1); @@ -103,12 +105,12 @@ Target_Tile::next_frame(Time& time) time=(time_end-time_start)*curr_frame_/total_frames+time_start; curr_frame_++; -/* sinfg::info("curr_frame_: %d",curr_frame_); - sinfg::info("total_frames: %d",total_frames); - sinfg::info("time_end: %s",time_end.get_string().c_str()); - sinfg::info("time_start: %s",time_start.get_string().c_str()); +/* synfig::info("curr_frame_: %d",curr_frame_); + synfig::info("total_frames: %d",total_frames); + synfig::info("time_end: %s",time_end.get_string().c_str()); + synfig::info("time_start: %s",time_start.get_string().c_str()); */ -// sinfg::info("time: %s",time.get_string().c_str()); +// synfig::info("time: %s",time.get_string().c_str()); return total_frames- curr_frame_+1; } @@ -123,7 +125,7 @@ Target_Tile::next_tile(int& x, int& y) // Add the last tiles (which will be clipped) if(rend_desc().get_w()%tile_w_!=0)tw++; if(rend_desc().get_h()%tile_h_!=0)th++; - + x=(curr_tile_%tw)*tile_h_; y=(curr_tile_/tw)*tile_w_; @@ -132,7 +134,7 @@ Target_Tile::next_tile(int& x, int& y) } bool -sinfg::Target_Tile::render_frame_(Context context,ProgressCallback *cb) +synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb) { if(tile_w_<=0||tile_h_<=0) { @@ -147,13 +149,13 @@ sinfg::Target_Tile::render_frame_(Context context,ProgressCallback *cb) etl::clock::value_type find_tile_time(0); etl::clock::value_type add_tile_time(0); total_time.reset(); - + // If the quality is set to zero, then we // use the parametric scanline-renderer. if(get_quality()==0) { Surface surface; - + RendDesc tile_desc; int x,y,w,h; int i; @@ -199,7 +201,7 @@ sinfg::Target_Tile::render_frame_(Context context,ProgressCallback *cb) if(get_remove_alpha()) for(int i=0;iamount_complete(total_tiles,total_tiles)) return false; - -#if SINFG_DISPLAY_EFFICIENCY==1 - sinfg::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()); - sinfg::info(">>>>>> FRAME EFICIENCY: %f%%",(100.0f*work_time/total_time())); + +#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 EFFICIENCY: %f%%",(100.0f*work_time/total_time())); #endif #undef total_tiles return true; } bool -sinfg::Target_Tile::render(ProgressCallback *cb) +synfig::Target_Tile::render(ProgressCallback *cb) { SuperCallback super_cb; int @@ -305,7 +308,12 @@ sinfg::Target_Tile::render(ProgressCallback *cb) assert(canvas); curr_frame_=0; init(); - + if( !init() ){ + if(cb) cb->error(_("Target initialization failure")); + return false; + } + + // If the description's end frame is equal to // the start frame, then it is assumed that we // are rendering only one frame. Correct it. @@ -316,53 +324,55 @@ sinfg::Target_Tile::render(ProgressCallback *cb) frame_end=desc.get_frame_end(); time_start=desc.get_time_start(); time_end=desc.get_time_end(); - + // Calculate the number of frames total_frames=frame_end-frame_start; - - - + + + try { // Grab the time i=next_frame(t); - - //sinfg::info("1time_set_to %s",t.get_string().c_str()); - + + //synfig::info("1time_set_to %s",t.get_string().c_str()); + if(i>=1) { do { curr_tile_=0; - + // If we have a callback, and it returns // false, go ahead and bail. (maybe a use cancel) if(cb && !cb->amount_complete(total_frames-(i-1),total_frames)) return false; - + if(!start_frame(cb)) return false; // Set the time that we wish to render //if(!get_avoid_time_sync() || canvas->get_time()!=t) canvas->set_time(t); - + Context context; - - #ifdef SINFG_OPTIMIZE_LAYER_TREE + + #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(); #endif - + /* - #ifdef SINFG_OPTIMIZE_LAYER_TREE + #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; @@ -371,17 +381,17 @@ sinfg::Target_Tile::render(ProgressCallback *cb) context=canvas->get_context(); #endif */ - + if(!render_frame_(context,0)) return false; end_frame(); }while((i=next_frame(t))); - //sinfg::info("tilerenderer: i=%d, t=%s",i,t.get_string().c_str()); + //synfig::info("tilerenderer: i=%d, t=%s",i,t.get_string().c_str()); } else { curr_tile_=0; - + if(!start_frame(cb)) return false; @@ -389,23 +399,24 @@ sinfg::Target_Tile::render(ProgressCallback *cb) // if(!get_avoid_time_sync() || canvas->get_time()!=t) canvas->set_time(t); - //sinfg::info("2time_set_to %s",t.get_string().c_str()); + //synfig::info("2time_set_to %s",t.get_string().c_str()); Context context; - - #ifdef SINFG_OPTIMIZE_LAYER_TREE + + #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(); #endif - + if(!render_frame_(context, cb)) return false; end_frame(); } - + } catch(String str) {