X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_gradient%2Fcurvegradient.cpp;h=5629bb74f52e9aba8e0aba81f9823f463cfd94f7;hb=299aecad571ca490ce017004a0d7e555d6df0520;hp=a37304133a4d603e1455b4e2e19ff7fba341afcd;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
index a373041..5629bb7 100644
--- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
+++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** Template File
 ** $Id: curvegradient.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $
 **
-** 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.
 **
 ** === N O T E S ===========================================================
 **
@@ -29,14 +30,14 @@
 
 #include "curvegradient.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 <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/bezier>
 #include <ETL/hermite>
 #include <ETL/calculus>
@@ -47,16 +48,16 @@
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_LAYER_INIT(CurveGradient);
-SINFG_LAYER_SET_NAME(CurveGradient,"curve_gradient");
-SINFG_LAYER_SET_LOCAL_NAME(CurveGradient,_("Curve Gradient"));
-SINFG_LAYER_SET_CATEGORY(CurveGradient,_("Gradients"));
-SINFG_LAYER_SET_VERSION(CurveGradient,"0.0");
-SINFG_LAYER_SET_CVS_ID(CurveGradient,"$Id: curvegradient.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $");
+SYNFIG_LAYER_INIT(CurveGradient);
+SYNFIG_LAYER_SET_NAME(CurveGradient,"curve_gradient");
+SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,_("Curve Gradient"));
+SYNFIG_LAYER_SET_CATEGORY(CurveGradient,_("Gradients"));
+SYNFIG_LAYER_SET_VERSION(CurveGradient,"0.0");
+SYNFIG_LAYER_SET_CVS_ID(CurveGradient,"$Id: curvegradient.cpp,v 1.2 2005/01/13 06:48:39 darco Exp $");
 
 /* === P R O C E D U R E S ================================================= */
 
-inline float calculate_distance(const sinfg::BLinePoint& a,const sinfg::BLinePoint& b)
+inline float calculate_distance(const synfig::BLinePoint& a,const synfig::BLinePoint& b)
 {
 #if 1
 	const Point& c1(a.get_vertex());
@@ -68,10 +69,10 @@ inline float calculate_distance(const sinfg::BLinePoint& a,const sinfg::BLinePoi
 #endif
 }
 
-inline float calculate_distance(const std::vector<sinfg::BLinePoint>& bline)
+inline float calculate_distance(const std::vector<synfig::BLinePoint>& bline)
 {
-	std::vector<sinfg::BLinePoint>::const_iterator iter,next,ret;
-	std::vector<sinfg::BLinePoint>::const_iterator end(bline.end());
+	std::vector<synfig::BLinePoint>::const_iterator iter,next,ret;
+	std::vector<synfig::BLinePoint>::const_iterator end(bline.end());
 	
 	float dist(0);
 	
@@ -99,11 +100,11 @@ inline float calculate_distance(const std::vector<sinfg::BLinePoint>& bline)
 	return dist;
 }
 
-std::vector<sinfg::BLinePoint>::const_iterator
-find_closest(const std::vector<sinfg::BLinePoint>& bline,const Point& p,bool loop=false,float *bline_dist_ret=0)
+std::vector<synfig::BLinePoint>::const_iterator
+find_closest(const std::vector<synfig::BLinePoint>& bline,const Point& p,bool loop=false,float *bline_dist_ret=0)
 {
-	std::vector<sinfg::BLinePoint>::const_iterator iter,next,ret;
-	std::vector<sinfg::BLinePoint>::const_iterator end(bline.end());
+	std::vector<synfig::BLinePoint>::const_iterator iter,next,ret;
+	std::vector<synfig::BLinePoint>::const_iterator end(bline.end());
 	
 	ret=bline.end();
 	float dist(100000000000.0);
@@ -230,7 +231,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
 	{
 		Point point(point_-offset);
 		
-		std::vector<sinfg::BLinePoint>::const_iterator iter,next;
+		std::vector<synfig::BLinePoint>::const_iterator iter,next;
 		
 		// Figure out the BLinePoints we will be using,
 		// Taking into account looping.
@@ -358,14 +359,14 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co
 }
 
 float
-CurveGradient::calc_supersample(const sinfg::Point &x, float pw,float ph)const
+CurveGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const
 {
 //	return pw/(p2-p1).mag();
 	return pw;
 }
 
-sinfg::Layer::Handle
-CurveGradient::hit_check(sinfg::Context context, const sinfg::Point &point)const
+synfig::Layer::Handle
+CurveGradient::hit_check(synfig::Context context, const synfig::Point &point)const
 {
 	if(get_blend_method()==Color::BLEND_STRAIGHT && get_amount()>=0.5)
 		return const_cast<CurveGradient*>(this);