X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fblend.cpp;h=3327885c74c1ef34b7a5c1d111f22935a8639de0;hp=cecd562dc1019f389e151049b94d4c01e55b2623;hb=af0ba2af0167247bcda74e76f3c83c0c0e89650a;hpb=6afbace895a7bbcf216ab8e48280ea0303ab5892

diff --git a/source/blend.cpp b/source/blend.cpp
index cecd562d..3327885c 100644
--- a/source/blend.cpp
+++ b/source/blend.cpp
@@ -1,6 +1,9 @@
+#include <msp/gl/extensions/ext_blend_minmax.h>
+#include <msp/gl/extensions/ext_blend_subtract.h>
+#include <msp/strings/format.h>
 #include "blend.h"
-#include "ext_blend_minmax.h"
-#include "ext_blend_subtract.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GL {
@@ -33,7 +36,7 @@ void Blend::bind() const
 	if(set_current(this))
 	{
 		glEnable(GL_BLEND);
-		if(glBlendEquation)
+		if(EXT_blend_minmax)
 			glBlendEquation(eq);
 		glBlendFunc(src_factor, dst_factor);
 	}
@@ -51,5 +54,74 @@ const Blend &Blend::alpha()
 	return blend;
 }
 
+const Blend &Blend::additive()
+{
+	static Blend blend(ONE, ONE);
+	return blend;
+}
+
+const Blend &Blend::additive_alpha()
+{
+	static Blend blend(SRC_ALPHA, ONE);
+	return blend;
+}
+
+void operator>>(const LexicalConverter &conv, BlendFactor &factor)
+{
+	const string &str = conv.get();
+	if(str=="ZERO")
+		factor = ZERO;
+	else if(str=="ONE")
+		factor = ONE;
+	else if(str=="SRC_COLOR")
+		factor = SRC_COLOR;
+	else if(str=="ONE_MINUS_SRC_COLOR")
+		factor = ONE_MINUS_SRC_COLOR;
+	else if(str=="SRC_ALPHA")
+		factor = SRC_ALPHA;
+	else if(str=="ONE_MINUS_SRC_ALPHA")
+		factor = ONE_MINUS_SRC_ALPHA;
+	else if(str=="DST_COLOR")
+		factor = DST_COLOR;
+	else if(str=="ONE_MINUS_DST_COLOR")
+		factor = ONE_MINUS_DST_COLOR;
+	else if(str=="DST_ALPHA")
+		factor = DST_ALPHA;
+	else if(str=="ONE_MINUS_DST_ALPHA")
+		factor = ONE_MINUS_DST_ALPHA;
+	else if(str=="CONSTANT_COLOR")
+		factor = CONSTANT_COLOR;
+	else if(str=="ONE_MINUS_CONSTANT_COLOR")
+		factor = ONE_MINUS_CONSTANT_COLOR;
+	else if(str=="CONSTANT_ALPHA")
+		factor = CONSTANT_ALPHA;
+	else if(str=="ONE_MINUS_CONSTANT_ALPHA")
+		factor = ONE_MINUS_CONSTANT_ALPHA;
+	else
+		throw lexical_error(format("conversion of '%s' to BlendFactor", str));
+}
+
+void operator<<(LexicalConverter &conv, BlendFactor factor)
+{
+	switch(factor)
+	{
+	case ZERO: conv.result("ZERO"); break;
+	case ONE: conv.result("ONE"); break;
+	case SRC_COLOR: conv.result("SRC_COLOR"); break;
+	case ONE_MINUS_SRC_COLOR: conv.result("ONE_MINUS_SRC_COLOR"); break;
+	case SRC_ALPHA: conv.result("SRC_ALPHA"); break;
+	case ONE_MINUS_SRC_ALPHA: conv.result("ONE_MINUS_SRC_ALPHA"); break;
+	case DST_COLOR: conv.result("DST_COLOR"); break;
+	case ONE_MINUS_DST_COLOR: conv.result("ONE_MINUS_DST_COLOR"); break;
+	case DST_ALPHA: conv.result("DST_ALPHA"); break;
+	case ONE_MINUS_DST_ALPHA: conv.result("ONE_MINUS_DST_ALPHA"); break;
+	case CONSTANT_COLOR: conv.result("CONSTANT_COLOR"); break;
+	case ONE_MINUS_CONSTANT_COLOR: conv.result("ONE_MINUS_CONSTANT_COLOR"); break;
+	case CONSTANT_ALPHA: conv.result("CONSTANT_ALPHA"); break;
+	case ONE_MINUS_CONSTANT_ALPHA: conv.result("ONE_MINUS_CONSTANT_ALPHA"); break;
+	default: conv.result(format("BlendFactor(%#x)", static_cast<int>(factor)));
+	}
+}
+
 } // namespace GL
 } // namespace Msp