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

Renamed BlendMode "none" to "replace" and updated changelog

Browse Source
This commit is contained in:
Alex Szpakowski
2013-05-22 04:26:29 -03:00
parent eaf69aead1
commit 264948690c
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Graphics.cpp
+1 -1
View File
@@ -134,7 +134,7 @@ StringMap<Graphics::BlendMode, Graphics::BLEND_MAX_ENUM>::Entry Graphics::blendM
{ "subtractive", Graphics::BLEND_SUBTRACTIVE },
{ "multiplicative", Graphics::BLEND_MULTIPLICATIVE },
{ "premultiplied", Graphics::BLEND_PREMULTIPLIED },
{ "none", Graphics::BLEND_NONE },
{ "replace", Graphics::BLEND_REPLACE },
};
StringMap<Graphics::BlendMode, Graphics::BLEND_MAX_ENUM> Graphics::blendModes(Graphics::blendModeEntries, sizeof(Graphics::blendModeEntries));
src/modules/graphics/Graphics.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
BLEND_SUBTRACTIVE,
BLEND_MULTIPLICATIVE,
BLEND_PREMULTIPLIED,
BLEND_NONE,
BLEND_REPLACE,
BLEND_MAX_ENUM
};
src/modules/graphics/opengl/Graphics.cpp
+2 -2
View File
@@ -621,7 +621,7 @@ void Graphics::setBlendMode(Graphics::BlendMode mode)
src_rgb = src_a = GL_SRC_ALPHA;
dst_rgb = dst_a = GL_ONE;
break;
case BLEND_NONE:
case BLEND_REPLACE:
default:
src_rgb = src_a = GL_ONE;
dst_rgb = dst_a = GL_ZERO;
@@ -691,7 +691,7 @@ Graphics::BlendMode Graphics::getBlendMode() const
else if (src_rgb == GL_ONE && dst_rgb == GL_ONE_MINUS_SRC_ALPHA)
return BLEND_PREMULTIPLIED;
else if (src_rgb == GL_ONE && dst_rgb == GL_ZERO)
return BLEND_NONE;
return BLEND_REPLACE;
}
else if (src_rgb == GL_SRC_ALPHA && src_a == GL_ONE &&
dst_rgb == GL_ONE_MINUS_SRC_ALPHA && dst_a == GL_ONE_MINUS_SRC_ALPHA)