X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgradient.cpp;h=29f305553e8c5941ff9abec2e6f3baca02b0b6b0;hb=c0293e1a2e3d68c53e2ad07bd5be9066b202771d;hp=21ea1071cb122afb24bf44d16d7cb9f40c4d3a0a;hpb=716b28d513455e159096dff4777db6f60f9f3c8f;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/gradient.cpp b/synfig-core/trunk/src/synfig/gradient.cpp
index 21ea107..29f3055 100644
--- a/synfig-core/trunk/src/synfig/gradient.cpp
+++ b/synfig-core/trunk/src/synfig/gradient.cpp
@@ -140,10 +140,96 @@ supersample_helper(const synfig::Gradient::CPoint &color1, const synfig::Gradien
 //	assert(0);
 }
 
+Gradient &
+synfig::Gradient::operator+=(const Gradient &rhs)
+{
+	CPointList ret;
+	const_iterator iter1 = begin(), iter2 = rhs.begin(), left_same, right_same;
+	CPoint left, right;
+	if (iter1 != end()) left = *iter1;
+	if (iter2 != rhs.end()) right = *iter2;
+	if (iter1 != end() && iter2 != rhs.end())
+		while(true)
+		{
+			if (left.pos < right.pos)
+			{
+				ret.push_back(CPoint(left.pos, left.color + rhs(left.pos)));
+				if(++iter1 == end()) break;
+				left=*iter1;
+			}
+			else if (left.pos > right.pos)
+			{
+				ret.push_back(CPoint(right.pos, right.color + (*this)(right.pos)));
+				if(++iter2 == rhs.end()) break;
+				right=*iter2;
+			}
+			else
+			{
+				for(left_same = iter1++; (*iter1).pos == left.pos; iter1++);
+				for(right_same = iter2++; (*iter2).pos == right.pos; iter2++);
+				if (iter1 == left_same+1 && iter2 == right_same+1)
+					ret.push_back(CPoint(left.pos, left.color + right.color));
+				else
+				{
+					ret.push_back(CPoint(left.pos, left.color + right.color));
+					ret.push_back(CPoint(left.pos, (*(iter1-1)).color + (*(iter2-1)).color));
+				}
+				if (iter1 != end()) left=*iter1;
+				if (iter2 == rhs.end()) break;
+				right = *iter2;
+				if (iter1 == end()) break;
+			}
+		}
+
+	if (iter1 != end())
+		while(true)
+		{
+			ret.push_back(CPoint(left.pos, left.color + rhs(left.pos)));
+			if(++iter1 == end()) break;
+			left = *iter1;
+		}
+
+	if (iter2 != rhs.end())
+		while(true)
+		{
+			ret.push_back(CPoint(right.pos, right.color + (*this)(right.pos)));
+			if(++iter2 == rhs.end()) break;
+			right = *iter2;
+		}
+
+	cpoints = ret;
+	return *this;
+}
+
+Gradient &
+synfig::Gradient::operator-=(const Gradient &rhs)
+{
+	return (*this)+=(rhs*-1);
+}
+
+Gradient &
+synfig::Gradient::operator*=(const float    &rhs)
+{
+	if (rhs == 0)
+		cpoints.clear();
+	else
+		for (iterator iter = cpoints.begin(); iter!=cpoints.end(); iter++)
+			(*iter).color *= rhs;
+	return *this;
+}
+
+Gradient &
+synfig::Gradient::operator/=(const float    &rhs)
+{
+	for (iterator iter = cpoints.begin(); iter!=cpoints.end(); iter++)
+		(*iter).color /= rhs;
+	return *this;
+}
+
 Color
 synfig::Gradient::operator()(const Real &x,float supersample)const
 {
-	if(empty())
+	if(cpoints.empty())
 		return Color(0,0,0,0);
 	if(supersample<0)
 		supersample=-supersample;
@@ -153,11 +239,11 @@ synfig::Gradient::operator()(const Real &x,float supersample)const
 	float begin_sample(x-supersample*0.5);
 	float end_sample(x+supersample*0.5);
 
-	if(size()==1 || end_sample<=front().pos || isnan(x))
-		return front().color;
+	if(cpoints.size()==1 || end_sample<=cpoints.front().pos || isnan(x))
+		return cpoints.front().color;
 
-	if(begin_sample>=back().pos)
-		return back().color;
+	if(begin_sample>=cpoints.back().pos)
+		return cpoints.back().color;
 
 	/*
 	if(end_sample>=back().pos)