X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Fstretch.cpp;h=de0de940c6ffdec4a4877a3338cf8dd4c47eb81b;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=dc98f3f35de4b5c6cb58f01cdfb7856f059da31b;hpb=754e5b519a62baa512ed0159548956499960d1a1;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
index dc98f3f..de0de94 100644
--- a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file stretch.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Stretch" layer
 **
-**	$Id: stretch.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -54,10 +55,10 @@ using namespace synfig;
 
 SYNFIG_LAYER_INIT(Layer_Stretch);
 SYNFIG_LAYER_SET_NAME(Layer_Stretch,"stretch");
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Stretch,_("Stretch"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_Stretch,_("Distortions"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Stretch,N_("Stretch"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_Stretch,N_("Distortions"));
 SYNFIG_LAYER_SET_VERSION(Layer_Stretch,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id: stretch.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -71,14 +72,14 @@ Layer_Stretch::Layer_Stretch():
 {
 }
 
-	
+
 bool
 Layer_Stretch::set_param(const String & param, const ValueBase &value)
 {
 	IMPORT(amount);
 	IMPORT(center);
-	
-	return false;	
+
+	return false;
 }
 
 ValueBase
@@ -89,23 +90,24 @@ Layer_Stretch::get_param(const String &param)const
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return ValueBase();	
+
+	return ValueBase();
 }
 
 Layer::Vocab
 Layer_Stretch::get_param_vocab()const
 {
 	Layer::Vocab ret;
-	
+
 	ret.push_back(ParamDesc("amount")
 		.set_local_name(_("Amount"))
+		.set_origin("center")
 	);
 
 	ret.push_back(ParamDesc("center")
 		.set_local_name(_("Center"))
 	);
-	
+
 	return ret;
 }
 
@@ -127,20 +129,22 @@ Layer_Stretch::get_color(Context context, const Point &pos)const
 	return context.get_color(npos);
 }
 
-class ::Stretch_Trans : public Transform
+class Stretch_Trans : public Transform
 {
 	etl::handle<const Layer_Stretch> layer;
 public:
 	Stretch_Trans(const Layer_Stretch* x):Transform(x->get_guid()),layer(x) { }
-	
+
 	synfig::Vector perform(const synfig::Vector& x)const
 	{
-		return Vector((x[0]-layer->center[0])*layer->amount[0]+layer->center[0],(x[1]-layer->center[1])*layer->amount[1]+layer->center[1]);
+		return Vector((x[0]-layer->center[0])*layer->amount[0]+layer->center[0],
+					  (x[1]-layer->center[1])*layer->amount[1]+layer->center[1]);
 	}
-	
+
 	synfig::Vector unperform(const synfig::Vector& x)const
 	{
-		return Vector((x[0]-layer->center[0])/layer->amount[0]+layer->center[0],(x[1]-layer->center[1])/layer->amount[1]+layer->center[1]);
+		return Vector((x[0]-layer->center[0])/layer->amount[0]+layer->center[0],
+					  (x[1]-layer->center[1])/layer->amount[1]+layer->center[1]);
 	}
 };
 etl::handle<Transform>
@@ -152,6 +156,13 @@ Layer_Stretch::get_transform()const
 bool
 Layer_Stretch::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
 {
+	if (amount[0] == 0 || amount[1] == 0)
+	{
+		surface->set_wh(renddesc.get_w(), renddesc.get_h());
+		surface->clear();
+		return true;
+	}
+
 	RendDesc desc(renddesc);
 	desc.clear_flags();
     // Adjust the top_left and bottom_right points
@@ -167,3 +178,15 @@ Layer_Stretch::accelerated_render(Context context,Surface *surface,int quality,
 	// Render the scene
 	return context.accelerated_render(surface,quality,desc,cb);
 }
+
+Rect
+Layer_Stretch::get_full_bounding_rect(Context context)const
+{
+	Rect rect(context.get_full_bounding_rect());
+	Point min(rect.get_min()), max(rect.get_max());
+
+	return Rect(Point((min[0]-center[0])*amount[0]+center[0],
+					  (min[1]-center[1])*amount[1]+center[1]),
+				Point((max[0]-center[0])*amount[0]+center[0],
+					  (max[1]-center[1])*amount[1]+center[1]));
+}