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

Merge in default

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2013-01-27 19:15:55 +01:00
parent c03e35b6cc 4221d55468
commit 0fd4b147a4
26 changed files with 794 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+11 -7
View File
@@ -342,10 +342,10 @@ Image *Graphics::newImage(love::image::ImageData *data)
{
success = image->load();
}
catch(love::Exception &e)
catch(love::Exception &)
{
image->release();
throw love::Exception(e.what());
throw;
}
if (!success)
{
@@ -552,6 +552,8 @@ void Graphics::setBlendMode(Graphics::BlendMode mode)
glBlendFunc(GL_DST_COLOR, GL_ZERO);
else if (mode == BLEND_PREMULTIPLIED)
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
else if (mode == BLEND_NONE)
glBlendFunc(GL_ONE, GL_ZERO);
else // mode == BLEND_ADDITIVE || mode == BLEND_SUBTRACTIVE
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
}
@@ -570,11 +572,6 @@ void Graphics::setColorMode(Graphics::ColorMode mode)
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
}
void Graphics::setDefaultImageFilter(const Image::Filter &f)
{
Image::setDefaultFilter(f);
}
Graphics::BlendMode Graphics::getBlendMode()
{
GLint dst, src, equation;
@@ -592,6 +589,8 @@ Graphics::BlendMode Graphics::getBlendMode()
return BLEND_MULTIPLICATIVE;
else if (src == GL_ONE && dst == GL_ONE_MINUS_SRC_ALPHA) // && equation == GL_FUNC_ADD
return BLEND_PREMULTIPLIED;
else if (src == GL_ONE && dst == GL_ZERO)
return BLEND_NONE;
return BLEND_MAX_ENUM; // Should never be reached.
}
@@ -609,6 +608,11 @@ Graphics::ColorMode Graphics::getColorMode()
return COLOR_REPLACE;
}
void Graphics::setDefaultImageFilter(const Image::Filter &f)
{
Image::setDefaultFilter(f);
}
const Image::Filter &Graphics::getDefaultImageFilter() const
{
return Image::getDefaultFilter();