From 61bf387bf9491ff4c37f61e2881fcd70edf4ee78 Mon Sep 17 00:00:00 2001 From: vrld Date: Sat, 12 Mar 2011 14:35:58 +0100 Subject: [PATCH] Change love.graphics.setBackgroundColor() to accept alpha values. --HG-- branch : minor --- src/modules/graphics/opengl/Graphics.cpp | 2 +- src/modules/graphics/opengl/wrap_Graphics.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/Graphics.cpp b/src/modules/graphics/opengl/Graphics.cpp index 16fa606fb..4d75047e4 100644 --- a/src/modules/graphics/opengl/Graphics.cpp +++ b/src/modules/graphics/opengl/Graphics.cpp @@ -525,7 +525,7 @@ namespace opengl void Graphics::setBackgroundColor(Color c) { - glClearColor((float)c.r/255.0f, (float)c.g/255.0f, (float)c.b/255.0f, 1.0f); + glClearColor((float)c.r/255.0f, (float)c.g/255.0f, (float)c.b/255.0f, (float)c.a/255.0f); } Color Graphics::getBackgroundColor() diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 31326bda9..3e0124986 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -386,14 +386,18 @@ namespace opengl lua_gettable(L, -2); c.b = (unsigned char)luaL_checkint(L, -1); lua_pop(L, 1); + lua_pushinteger(L, 4); + lua_gettable(L, -2); + c.a = (unsigned char)luaL_optint(L, -1, 255); + lua_pop(L, 1); } else { c.r = (unsigned char)luaL_checkint(L, 1); c.g = (unsigned char)luaL_checkint(L, 2); c.b = (unsigned char)luaL_checkint(L, 3); + c.a = (unsigned char)luaL_optint(L, 4, 255); } - c.a = 255; instance->setBackgroundColor(c); return 0; }