X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_tile.cpp;h=f245ed4934e3356a82a00d4582902390479ad2be;hb=00644fdca1f213c58b42e7ec396bd29a0e4f5a02;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..f245ed4 100644
--- a/synfig-core/trunk/src/synfig/target_tile.cpp
+++ b/synfig-core/trunk/src/synfig/target_tile.cpp
@@ -1,20 +1,21 @@
-/* === 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 $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	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 +44,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;
 
-#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 ======================================================= */
@@ -103,12 +104,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;
 }
@@ -132,7 +133,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)
 	{
@@ -280,16 +281,16 @@ sinfg::Target_Tile::render_frame_(Context context,ProgressCallback *cb)
 	if(cb && !cb->amount_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 EFICIENCY: %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,6 +306,11 @@ sinfg::Target_Tile::render(ProgressCallback *cb)
 	assert(canvas);
 	curr_frame_=0;
 	init();
+	if( !init() ){
+		if(cb) cb->error(_("Target initialisation failure"));
+		return false;
+	}
+
 	
 	// If the description's end frame is equal to
 	// the start frame, then it is assumed that we
@@ -326,7 +332,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb)
 		// 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)
 		{
@@ -348,7 +354,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb)
 			
 			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);
 			context=op_canvas->get_context();
@@ -357,7 +363,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb)
 			#endif
 			
 /*
-			#ifdef SINFG_OPTIMIZE_LAYER_TREE
+			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 			Context context;
 			Canvas::Handle op_canvas(Canvas::create());
 			// Set the time that we wish to render
@@ -376,7 +382,7 @@ sinfg::Target_Tile::render(ProgressCallback *cb)
 				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
 		{
@@ -389,11 +395,11 @@ 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);
 			context=op_canvas->get_context();