X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgradient.h;h=fdba3df1218f7845cffcb08b7e209ba08550c960;hb=2ca65d27048da3a0c8d64b1de572ea118ef6b47a;hp=6bfe0a1b14dfd8c734afbe8a67d641940d5cea46;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/gradient.h b/synfig-core/trunk/src/synfig/gradient.h
index 6bfe0a1..fdba3df 100644
--- a/synfig-core/trunk/src/synfig/gradient.h
+++ b/synfig-core/trunk/src/synfig/gradient.h
@@ -1,28 +1,30 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file gradient.h
 **	\brief Color Gradient Class
 **
-**	$Id: gradient.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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_GRADIENT_H
-#define __SINFG_GRADIENT_H
+#ifndef __SYNFIG_GRADIENT_H
+#define __SYNFIG_GRADIENT_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -38,7 +40,7 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 /*! \struct GradientCPoint
 **	\brief \todo
@@ -47,39 +49,69 @@ struct GradientCPoint : public UniqueID
 {
 	Real pos;
 	Color color;
-	
+
 	bool operator<(const GradientCPoint &rhs)const { return pos<rhs.pos; }
 	bool operator<(const Real &rhs)const { return pos<rhs; }
-	
+
 	GradientCPoint() { }
 	GradientCPoint(const Real &pos, const Color &color):pos(pos),color(color) { }
 }; // END of class GradientCPoint
 
-	
+
 /*! \class Gradient
 **	\brief Color Gradient Class
 */
-class Gradient : public std::vector<GradientCPoint>
+using namespace std;
+class Gradient
 {
 public:
 	typedef GradientCPoint CPoint;
+	typedef vector<CPoint> CPointList;
+	typedef CPointList::const_iterator			const_iterator;
+	typedef CPointList::iterator				iterator;
+	typedef CPointList::const_reverse_iterator	const_reverse_iterator;
+	typedef CPointList::reverse_iterator		reverse_iterator;
 private:
-	
+	CPointList cpoints;
 public:
 	Gradient() { }
-	
-	//! Two-Tone Color Gradient Convience Constructor
+
+	//! Two-Tone Color Gradient Convenience Constructor
 	Gradient(const Color &c1, const Color &c2);
 
-	//! Three-Tone Color Gradient Convience Constructor
+	//! Three-Tone Color Gradient Convenience Constructor
 	Gradient(const Color &c1, const Color &c2, const Color &c3);
 
-	//! Alias for sort (Implemented for consistancy)
+	//! Alias for sort (Implemented for consistency)
 	void sync() { sort(); }
 
 	//! You should call this function after changing stuff.
 	void sort();
-	
+
+	void push_back(const CPoint cpoint) { cpoints.push_back(cpoint); }
+	iterator erase(iterator iter) { return cpoints.erase(iter); }
+	bool empty()const { return cpoints.empty(); }
+	size_t size()const { return cpoints.size(); }
+
+	iterator begin() { return cpoints.begin(); }
+	iterator end() { return cpoints.end(); }
+	reverse_iterator rbegin() { return cpoints.rbegin(); }
+	reverse_iterator rend() { return cpoints.rend(); }
+	const_iterator begin()const { return cpoints.begin(); }
+	const_iterator end()const { return cpoints.end(); }
+	const_reverse_iterator rbegin()const { return cpoints.rbegin(); }
+	const_reverse_iterator rend()const { return cpoints.rend(); }
+
+	Gradient &operator+=(const Gradient &rhs);
+	Gradient &operator-=(const Gradient &rhs);
+	Gradient &operator*=(const float    &rhs);
+	Gradient &operator/=(const float    &rhs);
+
+	Gradient operator+(const Gradient &rhs)const { return Gradient(*this)+=rhs; }
+	Gradient operator-(const Gradient &rhs)const { return Gradient(*this)-=rhs; }
+	Gradient operator*(const float    &rhs)const { return Gradient(*this)*=rhs; }
+	Gradient operator/(const float    &rhs)const { return Gradient(*this)/=rhs; }
+
 	Color operator()(const Real &x, float supersample=0)const;
 
 	//! Returns the iterator of the CPoint closest to \a x
@@ -90,12 +122,12 @@ public:
 
 	//! Returns the iterator of the CPoint with UniqueID \a id
 	iterator find(const UniqueID &id);
-	
+
 	//! Returns the const_iterator of the CPoint with UniqueID \a id
 	const_iterator find(const UniqueID &id)const;
 }; // END of class Gradient
-	
-}; // END of namespace sinfg
+
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */