X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2Flyr_freetype.h;h=81261bc3c882e20836392426aaeb830595448e96;hb=1d8a47082e8cc0b3fab7d77862c73cb5f3f41aef;hp=0d87ab3e9d96b07dc039e55b5c98969b7b7d512c;hpb=21bfc670b83d4c45da9ed1b95063b7e6a007168c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h
index 0d87ab3..81261bc 100644
--- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h
+++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.h
@@ -1,9 +1,12 @@
-/*! ========================================================================
-** Synfig
-** Template Header File
-** $Id: lyr_freetype.h,v 1.3 2005/01/24 03:08:17 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file lyr_freetype.h
+**	\brief Header file for implementation of the "Text" layer
 **
+**	$Id$
+**
+**	\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
@@ -14,6 +17,7 @@
 **	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
 **
 ** === N O T E S ===========================================================
 **
@@ -82,28 +86,28 @@ struct TextLine
 
 	TextLine():width(0) { }
 	void clear_and_free();
-	
+
 	int actual_height()const
 	{
 		int height(0);
-		
+
 		std::vector<Glyph>::const_iterator iter;
 		for(iter=glyph_table.begin();iter!=glyph_table.end();++iter)
 		{
 			FT_BBox   glyph_bbox;
-	
+
 			//FT_Glyph_Get_CBox( glyphs[n], ft_glyph_bbox_pixels, &glyph_bbox );
 			FT_Glyph_Get_CBox( iter->glyph, ft_glyph_bbox_subpixels, &glyph_bbox );
-	
+
 			if(glyph_bbox.yMax>height)
 				height=glyph_bbox.yMax;
 		}
 		return height;
-	}	
+	}
 };
 
 
-class lyr_freetype : public synfig::Layer_Composite, public synfig::Layer_NoDeform
+class Layer_Freetype : public synfig::Layer_Composite, public synfig::Layer_NoDeform
 {
 	SYNFIG_LAYER_MODULE_EXT
 private:
@@ -115,7 +119,7 @@ private:
 	synfig::Vector size;
 	synfig::Vector orient;
 	synfig::Color color;
-	synfig::Point pos;
+	synfig::Point origin;
 	synfig::Real compress;
 	synfig::Real vcompress;
 
@@ -129,18 +133,20 @@ private:
 	bool needs_sync_;
 
 	void sync();
-	
+
+	synfig::Color color_func(const synfig::Point &x, int quality=10, float supersample=0)const;
+
 	mutable synfig::Mutex mutex;
-	
+
 public:
-	lyr_freetype();
-	virtual ~lyr_freetype();
+	Layer_Freetype();
+	virtual ~Layer_Freetype();
 
 	virtual bool set_param(const String & param, const synfig::ValueBase &value);
 	virtual ValueBase get_param(const String & param)const;
 	virtual Color get_color(Context context, const synfig::Point &pos)const;
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
-	
+
 	virtual Vocab get_param_vocab()const;
 
 	virtual bool set_version(const String &ver){if(ver=="0.1")old_version=true;return true;}