X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fexample%2Fmetaballs.cpp;h=6ddc14d57e3501fb2732f45d77bd45d9a45da5b1;hb=f0bb3efdc247acff17a7feb7c3d22911f47959f7;hp=b9497f82bb066c116eec32c43709b3ef5a4d4177;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/example/metaballs.cpp b/synfig-core/trunk/src/modules/example/metaballs.cpp
index b9497f8..6ddc14d 100644
--- a/synfig-core/trunk/src/modules/example/metaballs.cpp
+++ b/synfig-core/trunk/src/modules/example/metaballs.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file metaballs.cpp
 **	\brief Implements metaballs
 **
 **	$Id: metaballs.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $
 **
 **	\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
 */
 /* ========================================================================= */
@@ -28,14 +29,14 @@
 #	include <config.h>
 #endif
 
-#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 <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 <ETL/pen>
 
 #include "metaballs.h"
@@ -46,16 +47,16 @@
 
 using namespace etl;
 using namespace std;
-using namespace sinfg;
+using namespace synfig;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(Metaballs);
-SINFG_LAYER_SET_NAME(Metaballs,"metaballs");
-SINFG_LAYER_SET_LOCAL_NAME(Metaballs,_("Metaballs"));
-SINFG_LAYER_SET_CATEGORY(Metaballs,_("Default"));
-SINFG_LAYER_SET_VERSION(Metaballs,"0.1");
-SINFG_LAYER_SET_CVS_ID(Metaballs,"$Id: metaballs.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $");
+SYNFIG_LAYER_INIT(Metaballs);
+SYNFIG_LAYER_SET_NAME(Metaballs,"metaballs");
+SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,_("Metaballs"));
+SYNFIG_LAYER_SET_CATEGORY(Metaballs,_("Default"));
+SYNFIG_LAYER_SET_VERSION(Metaballs,"0.1");
+SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id: metaballs.cpp,v 1.1.1.1 2005/01/04 01:23:09 darco Exp $");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -140,7 +141,7 @@ Metaballs::get_param_vocab()const
 	return ret;
 }
 
-static inline Real densityfunc(const sinfg::Point &p, const sinfg::Point &c, Real R)
+static inline Real densityfunc(const synfig::Point &p, const synfig::Point &c, Real R)
 {
 	const Real dx = p[0] - c[0];
 	const Real dy = p[1] - c[1];