LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed blend modes "additive", "subtractive", and "multiplicative" to "add", "subtract", and "multiply" (resolves issue #864)

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-04-01 20:49:24 -03:00
parent 6dc10cfd15
commit b18c35a1f2
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+3 -3
View File
@@ -130,9 +130,9 @@ StringMap<Graphics::AlignMode, Graphics::ALIGN_MAX_ENUM> Graphics::alignModes(Gr
StringMap<Graphics::BlendMode, Graphics::BLEND_MAX_ENUM>::Entry Graphics::blendModeEntries[] =
{
{ "alpha", Graphics::BLEND_ALPHA },
{ "additive", Graphics::BLEND_ADDITIVE },
{ "subtractive", Graphics::BLEND_SUBTRACTIVE },
{ "multiplicative", Graphics::BLEND_MULTIPLICATIVE },
{ "add", Graphics::BLEND_ADD },
{ "subtract", Graphics::BLEND_SUBTRACT },
{ "multiply", Graphics::BLEND_MULTIPLY },
{ "premultiplied", Graphics::BLEND_PREMULTIPLIED },
{ "screen", Graphics::BLEND_SCREEN },
{ "replace", Graphics::BLEND_REPLACE },
src/modules/graphics/Graphics.h
+3 -3
View File
@@ -53,9 +53,9 @@ public:
enum BlendMode
{
BLEND_ALPHA = 1,
BLEND_ADDITIVE,
BLEND_SUBTRACTIVE,
BLEND_MULTIPLICATIVE,
BLEND_ADD,
BLEND_SUBTRACT,
BLEND_MULTIPLY,
BLEND_PREMULTIPLIED,
BLEND_SCREEN,
BLEND_REPLACE,
src/modules/graphics/opengl/Graphics.cpp
+6 -6
View File
@@ -639,7 +639,7 @@ void Graphics::setBlendMode(Graphics::BlendMode mode)
state.srcA = GL_ONE;
state.dstRGB = state.dstA = GL_ONE_MINUS_SRC_ALPHA;
break;
case BLEND_MULTIPLICATIVE:
case BLEND_MULTIPLY:
state.srcRGB = state.srcA = GL_DST_COLOR;
state.dstRGB = state.dstA = GL_ZERO;
break;
@@ -647,9 +647,9 @@ void Graphics::setBlendMode(Graphics::BlendMode mode)
state.srcRGB = state.srcA = GL_ONE;
state.dstRGB = state.dstA = GL_ONE_MINUS_SRC_ALPHA;
break;
case BLEND_SUBTRACTIVE:
case BLEND_SUBTRACT:
state.func = GL_FUNC_REVERSE_SUBTRACT;
case BLEND_ADDITIVE:
case BLEND_ADD:
state.srcRGB = state.srcA = GL_SRC_ALPHA;
state.dstRGB = state.dstA = GL_ONE;
break;
@@ -672,16 +672,16 @@ Graphics::BlendMode Graphics::getBlendMode() const
OpenGL::BlendState state = gl.getBlendState();
if (state.func == GL_FUNC_REVERSE_SUBTRACT) // && src == GL_SRC_ALPHA && dst == GL_ONE
return BLEND_SUBTRACTIVE;
return BLEND_SUBTRACT;
// Everything else has equation == GL_FUNC_ADD.
else if (state.srcRGB == state.srcA && state.dstRGB == state.dstA)
{
if (state.srcRGB == GL_SRC_ALPHA && state.dstRGB == GL_ONE)
return BLEND_ADDITIVE;
return BLEND_ADD;
else if (state.srcRGB == GL_SRC_ALPHA && state.dstRGB == GL_ONE_MINUS_SRC_ALPHA)
return BLEND_ALPHA; // alpha blend mode fallback for very old OpenGL versions.
else if (state.srcRGB == GL_DST_COLOR && state.dstRGB == GL_ZERO)
return BLEND_MULTIPLICATIVE;
return BLEND_MULTIPLY;
else if (state.srcRGB == GL_ONE && state.dstRGB == GL_ONE_MINUS_SRC_ALPHA)
return BLEND_PREMULTIPLIED;
else if (state.srcRGB == GL_ONE && state.dstRGB == GL_ONE_MINUS_SRC_COLOR)