X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fcircle.h;h=f7cd3791af0ec553666213c731c92830709fd71d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b3651e35b1821d684b268b1c32a90e317cb60bd6;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.h b/synfig-core/trunk/src/modules/mod_geometry/circle.h
index b3651e3..f7cd379 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/circle.h
+++ b/synfig-core/trunk/src/modules/mod_geometry/circle.h
@@ -1,36 +1,38 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file circle.h
-**	\brief Template Header
+**	\brief Header file for implementation of the "Circle" layer
 **
-**	$Id: circle.h,v 1.2 2005/01/24 03:08:17 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 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
 */
 /* ========================================================================= */
 
 /* === H E A D E R S ======================================================= */
 
-#ifndef __SINFG_LAYER_CIRCLE_H__
-#define __SINFG_LAYER_CIRCLE_H__
+#ifndef __SYNFIG_LAYER_CIRCLE_H__
+#define __SYNFIG_LAYER_CIRCLE_H__
 
 /* -- H E A D E R S --------------------------------------------------------- */
 
-#include <sinfg/layer_composite.h>
-#include <sinfg/color.h>
-#include <sinfg/vector.h>
+#include <synfig/layer_composite.h>
+#include <synfig/color.h>
+#include <synfig/vector.h>
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
@@ -40,14 +42,14 @@ using namespace etl;
 
 /* -- S T R U C T S & C L A S S E S ----------------------------------------- */
 
-class Circle : public sinfg::Layer_Composite, public sinfg::Layer_NoDeform
+class Circle : public synfig::Layer_Composite, public synfig::Layer_NoDeform
 {
-	SINFG_LAYER_MODULE_EXT
+	SYNFIG_LAYER_MODULE_EXT
 private:
-	sinfg::Color color;
-	sinfg::Point pos;
-	sinfg::Real radius;
-	sinfg::Real feather;
+	synfig::Color color;
+	synfig::Point origin;
+	synfig::Real radius;
+	synfig::Real feather;
 	bool invert;
 	int falloff;
 
@@ -56,32 +58,32 @@ private:
 	{
 		Real inner_radius;
 		Real outer_radius;
-	
+
 		Real inner_radius_sqd;
 		Real outer_radius_sqd;
-	
+
 		Real diff_sqd;
 		Real double_feather;
 	};
-	
+
 	typedef	Real	FALLOFF_FUNC(const CircleDataCache &c, const Real &mag_sqd);
-	
+
 	FALLOFF_FUNC	*falloff_func;
 	CircleDataCache	cache;
 
 	void constructcache();
 
 	static	Real	SqdFalloff(const CircleDataCache &c, const Real &mag_sqd);
-	static	Real	InvSqdFalloff(const CircleDataCache &c, const Real &mag_sqd);			
+	static	Real	InvSqdFalloff(const CircleDataCache &c, const Real &mag_sqd);
 	static	Real	SqrtFalloff(const CircleDataCache &c, const Real &mag_sqd);
-	static	Real	InvSqrtFalloff(const CircleDataCache &c, const Real &mag_sqd);		
+	static	Real	InvSqrtFalloff(const CircleDataCache &c, const Real &mag_sqd);
 	static	Real	LinearFalloff(const CircleDataCache &c, const Real &mag_sqd);
-	static	Real	InvLinearFalloff(const CircleDataCache &c, const Real &mag_sqd);		
+	static	Real	InvLinearFalloff(const CircleDataCache &c, const Real &mag_sqd);
 	static	Real	SigmondFalloff(const CircleDataCache &c, const Real &mag_sqd);
 	static	Real	InvSigmondFalloff(const CircleDataCache &c, const Real &mag_sqd);
 	static	Real	CosineFalloff(const CircleDataCache &c, const Real &mag_sqd);
-	static	Real	InvCosineFalloff(const CircleDataCache &c, const Real &mag_sqd);		
-	
+	static	Real	InvCosineFalloff(const CircleDataCache &c, const Real &mag_sqd);
+
 	FALLOFF_FUNC	*GetFalloffFunc()const;
 	bool ImportParameters(const String &param, const ValueBase &value);
 
@@ -95,22 +97,22 @@ public:
 		FALLOFF_SIGMOND		=3,
 		FALLOFF_SQRT		=4
 	};
-	
+
 	Circle();
-	
+
 	virtual bool set_param(const String &param, const ValueBase &value);
-	
+
 	virtual ValueBase get_param(const String &param)const;
-	
+
 	virtual Color get_color(Context context, const Point &pos)const;
-	
+
 	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 
-	virtual sinfg::Rect get_full_bounding_rect(sinfg::Context context)const;
-	virtual sinfg::Rect get_bounding_rect()const;
+	virtual synfig::Rect get_full_bounding_rect(synfig::Context context)const;
+	virtual synfig::Rect get_bounding_rect()const;
+
+	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
 
-	sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const;	
-	
 	virtual Vocab get_param_vocab()const;
 };