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

Switched Image filter modes to use the new string constant system

Browse Source
This commit is contained in:
Bill Meltsner
2010-02-09 14:30:41 -05:00
parent 73aba4bdd4
commit e661459103
5 changed files with 112 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Image.cpp
+4
View File
@@ -133,6 +133,8 @@ namespace opengl
case FILTER_NEAREST:
gmin = GL_NEAREST;
break;
default:
break;
}
switch(f.mag)
@@ -143,6 +145,8 @@ namespace opengl
case FILTER_NEAREST:
gmag = GL_NEAREST;
break;
default:
break;
}
bind();
src/modules/graphics/opengl/wrap_Image.cpp
+22 -5
View File
@@ -48,10 +48,19 @@ namespace opengl
int w_Image_setFilter(lua_State * L)
{
Image * t = luax_checkimage(L, 1);
Image * t = luax_checkimage(L, 1);
Image::Filter f;
f.min = (Image::FilterMode)luaL_checkint(L, 2);
f.mag = (Image::FilterMode)luaL_checkint(L, 3);
Image::FilterMode min;
Image::FilterMode mag;
const char * minstr = luaL_checkstring(L, 2);
const char * magstr = luaL_checkstring(L, 3);
if (!Image::getConstant(minstr, min))
return luaL_error(L, "Invalid filter mode: %s", minstr);
if (!Image::getConstant(magstr, mag))
return luaL_error(L, "Invalid filter mode: %s", magstr);
f.min = min;
f.mag = mag;
t->setFilter(f);
return 0;
}
@@ -60,8 +69,16 @@ namespace opengl
{
Image * t = luax_checkimage(L, 1);
Image::Filter f = t->getFilter();
lua_pushinteger(L, f.min);
lua_pushinteger(L, f.mag);
Image::FilterMode min = f.min;
Image::FilterMode mag = f.mag;
const char * minstr;
const char * magstr;
if (!Image::getConstant(min, minstr))
return luaL_error(L, "Invalid filter mode: %s", minstr);
if (!Image::getConstant(mag, magstr))
return luaL_error(L, "Invalid filter mode: %s", magstr);
lua_pushstring(L, minstr);
lua_pushstring(L, magstr);
return 2;
}