X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_std%2Ftwirl.h;h=11d893e433c6c28bd327901c6b024dcc79b1f618;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=c19683f83c420e10c8d338d1e3166cc17405f494;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_std/twirl.h b/synfig-core/trunk/src/modules/lyr_std/twirl.h
index c19683f..11d893e 100644
--- a/synfig-core/trunk/src/modules/lyr_std/twirl.h
+++ b/synfig-core/trunk/src/modules/lyr_std/twirl.h
@@ -1,37 +1,39 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file twirl.h
-**	\brief Template Header
+**	\brief Header file for implementation of the "Twirl" layer
 **
-**	$Id: twirl.h,v 1.1.1.1 2005/01/04 01:23:10 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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_TWIRL_H
-#define __SINFG_TWIRL_H
+#ifndef __SYNFIG_TWIRL_H
+#define __SYNFIG_TWIRL_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/layer_composite.h>
-#include <sinfg/color.h>
-#include <sinfg/vector.h>
-#include <sinfg/value.h>
-#include <sinfg/gradient.h>
-#include <sinfg/angle.h>
+#include <synfig/layer_composite.h>
+#include <synfig/color.h>
+#include <synfig/vector.h>
+#include <synfig/value.h>
+#include <synfig/gradient.h>
+#include <synfig/angle.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -40,40 +42,41 @@
 /* === C L A S S E S & S T R U C T S ======================================= */
 class Twirl_Trans;
 
-class Twirl : public sinfg::Layer_Composite
+class Twirl : public synfig::Layer_Composite
 {
-	SINFG_LAYER_MODULE_EXT
+	SYNFIG_LAYER_MODULE_EXT
 	friend class Twirl_Trans;
-	
+
 private:
 
-	sinfg::Point center;
+	synfig::Point center;
 
-	sinfg::Real radius;
+	synfig::Real radius;
 
-	sinfg::Angle rotations;
+	synfig::Angle rotations;
 
 	bool distort_inside;
 
 	bool distort_outside;
 
-	sinfg::Point distort(const sinfg::Point &pos, bool reverse=false)const;
+	synfig::Point distort(const synfig::Point &pos, bool reverse=false)const;
 public:
-	
+
 	Twirl();
-	
-	virtual bool set_param(const sinfg::String & param, const sinfg::ValueBase &value);
 
-	virtual sinfg::ValueBase get_param(const sinfg::String & param)const;
+	virtual bool set_param(const synfig::String & param, const synfig::ValueBase &value);
+
+	virtual synfig::ValueBase get_param(const synfig::String & param)const;
+
+	virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const;
+
+	//virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const;
 
-	virtual sinfg::Color get_color(sinfg::Context context, const sinfg::Point &pos)const;
-	
-	//virtual bool accelerated_render(sinfg::Context context,sinfg::Surface *surface,int quality, const sinfg::RendDesc &renddesc, sinfg::ProgressCallback *cb)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;
-	virtual etl::handle<sinfg::Transform> get_transform()const;
+	virtual etl::handle<synfig::Transform> get_transform()const;
+	virtual bool reads_context()const { return true; }
 }; // END of class Twirl
 
 /* === E N D =============================================================== */