X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Fcheckerboard.cpp;h=b6e42f243ec3f8370ffb3d9ed5be83a81b2f857a;hb=56f5b6b1728428492dc91a1551cd5efe240727ee;hp=f514c899ed9578efb786b7c4050328bd66c7205a;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
index f514c89..b6e42f2 100644
--- a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
+++ b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file checkerboard.cpp
 **	\brief Template Header
 **
-**	$Id: checkerboard.cpp,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
 **
-**	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
 */
 /* ========================================================================= */
@@ -30,19 +31,19 @@
 
 #include "checkerboard.h"
 
-#include <sinfg/string.h>
-#include <sinfg/time.h>
-#include <sinfg/context.h>
-#include <sinfg/paramdesc.h>
-#include <sinfg/renddesc.h>
-#include <sinfg/surface.h>
-#include <sinfg/value.h>
-#include <sinfg/valuenode.h>
-#include <sinfg/segment.h>
+#include <synfig/string.h>
+#include <synfig/time.h>
+#include <synfig/context.h>
+#include <synfig/paramdesc.h>
+#include <synfig/renddesc.h>
+#include <synfig/surface.h>
+#include <synfig/value.h>
+#include <synfig/valuenode.h>
+#include <synfig/segment.h>
 
 #endif
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
@@ -50,12 +51,12 @@ using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(CheckerBoard);
-SINFG_LAYER_SET_NAME(CheckerBoard,"checker_board");
-SINFG_LAYER_SET_LOCAL_NAME(CheckerBoard,_("CheckerBoard"));
-SINFG_LAYER_SET_CATEGORY(CheckerBoard,_("Geometry"));
-SINFG_LAYER_SET_VERSION(CheckerBoard,"0.1");
-SINFG_LAYER_SET_CVS_ID(CheckerBoard,"$Id: checkerboard.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_INIT(CheckerBoard);
+SYNFIG_LAYER_SET_NAME(CheckerBoard,"checker_board");
+SYNFIG_LAYER_SET_LOCAL_NAME(CheckerBoard,_("CheckerBoard"));
+SYNFIG_LAYER_SET_CATEGORY(CheckerBoard,_("Geometry"));
+SYNFIG_LAYER_SET_VERSION(CheckerBoard,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(CheckerBoard,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -72,7 +73,7 @@ CheckerBoard::CheckerBoard():
 }
 
 inline bool
-CheckerBoard::point_test(const sinfg::Point& getpos)const
+CheckerBoard::point_test(const synfig::Point& getpos)const
 {
 	int val=((int)((getpos[0]-pos[0])/size[0])+(int)((getpos[1]-pos[1])/size[1]));
 	if(getpos[0]-pos[0] < 0.0)
@@ -90,7 +91,7 @@ CheckerBoard::set_param(const String &param, const ValueBase &value)
 	IMPORT(pos[0]);
 	IMPORT(pos[1]);
 	IMPORT(size);
-	
+
 	return Layer_Composite::set_param(param,value);
 }
 
@@ -100,19 +101,19 @@ CheckerBoard::get_param(const String &param)const
 	EXPORT(color);
 	EXPORT(pos);
 	EXPORT(pos[0]);
-	EXPORT(pos[1]);	
+	EXPORT(pos[1]);
 	EXPORT(size);
 	EXPORT_NAME();
 	EXPORT_VERSION();
-		
-	return Layer_Composite::get_param(param);	
+
+	return Layer_Composite::get_param(param);
 }
 
 Layer::Vocab
 CheckerBoard::get_param_vocab()const
 {
 	Layer::Vocab ret(Layer_Composite::get_param_vocab());
-	
+
 	ret.push_back(ParamDesc("color")
 		.set_local_name(_("Color"))
 		.set_description(_("Color of checkers"))
@@ -129,12 +130,12 @@ CheckerBoard::get_param_vocab()const
 	return ret;
 }
 
-sinfg::Layer::Handle
-CheckerBoard::hit_check(sinfg::Context context, const sinfg::Point &getpos)const
+synfig::Layer::Handle
+CheckerBoard::hit_check(synfig::Context context, const synfig::Point &getpos)const
 {
 	if(get_amount()!=0.0 && point_test(getpos))
 	{
-		sinfg::Layer::Handle tmp;
+		synfig::Layer::Handle tmp;
 		if(get_blend_method()==Color::BLEND_BEHIND && (tmp=context.hit_check(getpos)))
 			return tmp;
 		if(Color::is_onto(get_blend_method()) && !(tmp=context.hit_check(getpos)))