X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgradient.h;h=5e74ddca94e7f921a874aab69a570cfc5a0291b8;hb=312e59b1685ed1acc688035b62700ca413294c2f;hp=bc4c1e820972dc4f9baa35e1e603bde1be141da6;hpb=cf1a6e2a6f015914a56e5f539da2e14146ce4c20;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/gradient.h b/synfig-core/trunk/src/synfig/gradient.h index bc4c1e8..5e74ddc 100644 --- a/synfig-core/trunk/src/synfig/gradient.h +++ b/synfig-core/trunk/src/synfig/gradient.h @@ -65,12 +65,13 @@ class Gradient { public: typedef GradientCPoint CPoint; - typedef vector::const_iterator const_iterator; - typedef vector::iterator iterator; - typedef vector::const_reverse_iterator const_reverse_iterator; - typedef vector::reverse_iterator reverse_iterator; + typedef vector 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: - vector cpoints; + CPointList cpoints; public: Gradient() { } @@ -86,7 +87,7 @@ public: //! You should call this function after changing stuff. void sort(); - void push_back(const GradientCPoint cpoint) { cpoints.push_back(cpoint); } + 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(); } @@ -100,6 +101,16 @@ public: 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