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 love.graphics.setDefaultImageFilter to love.graphics.setDefaultFilter

Browse Source
This commit is contained in:
Alex Szpakowski
2013-03-21 11:27:40 -03:00
parent b60cce7d3a
commit 7e753a0acb
4 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+2 -2
View File
@@ -629,12 +629,12 @@ Graphics::BlendMode Graphics::getBlendMode() const
throw Exception("Unknown blend mode");
}
void Graphics::setDefaultImageFilter(const Image::Filter &f)
void Graphics::setDefaultFilter(const Image::Filter &f)
{
Image::setDefaultFilter(f);
}
const Image::Filter &Graphics::getDefaultImageFilter() const
const Image::Filter &Graphics::getDefaultFilter() const
{
return Image::getDefaultFilter();
}
src/modules/graphics/opengl/Graphics.h
+8 -8
View File
@@ -304,20 +304,20 @@ public:
**/
void setBlendMode(BlendMode mode);
/**
* Sets the current image filter.
**/
void setDefaultImageFilter(const Image::Filter &f);
/**
* Gets the current blend mode.
**/
BlendMode getBlendMode() const;
/**
* Gets the current image filter.
* Sets the default filter for images, canvases, and fonts.
**/
const Image::Filter &getDefaultImageFilter() const;
void setDefaultFilter(const Image::Filter &f);
/**
* Gets the default filter for images, canvases, and fonts.
**/
const Image::Filter &getDefaultFilter() const;
/**
* Default texture anisotropic filtering level.
@@ -326,7 +326,7 @@ public:
float getDefaultAnisotropy() const;
/**
* Default Image mipmap filtermode and sharpness values.
* Default Image mipmap filter mode and sharpness values.
**/
void setDefaultMipmapFilter(Image::FilterMode filter, float sharpness);
void getDefaultMipmapFilter(Image::FilterMode *filter, float *sharpness) const;
src/modules/graphics/opengl/wrap_Graphics.cpp
+31 -31
View File
@@ -361,7 +361,7 @@ int w_newFont(lua_State *L)
try
{
// Create the font.
font = instance->newFont(rasterizer, instance->getDefaultImageFilter());
font = instance->newFont(rasterizer, instance->getDefaultFilter());
}
catch (love::Exception &e)
{
@@ -426,7 +426,7 @@ int w_newImageFont(lua_State *L)
}
if (!setFilter)
img_filter = instance->getDefaultImageFilter();
img_filter = instance->getDefaultFilter();
// Create the font.
Font *font = instance->newFont(rasterizer, img_filter);
@@ -719,31 +719,6 @@ int w_setBlendMode(lua_State *L)
return 0;
}
int w_setDefaultImageFilter(lua_State *L)
{
Image::FilterMode min;
Image::FilterMode mag;
const char *minstr = luaL_checkstring(L, 1);
const char *magstr = luaL_optstring(L, 2, minstr);
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);
Image::Filter f;
f.min = min;
f.mag = mag;
instance->setDefaultImageFilter(f);
float anisotropy = (float) luaL_optnumber(L, 3, 1.0);
instance->setDefaultAnisotropy(anisotropy);
return 0;
}
int w_getBlendMode(lua_State *L)
{
try
@@ -761,9 +736,34 @@ int w_getBlendMode(lua_State *L)
}
}
int w_getDefaultImageFilter(lua_State *L)
int w_setDefaultFilter(lua_State *L)
{
const Image::Filter &f = instance->getDefaultImageFilter();
Image::FilterMode min;
Image::FilterMode mag;
const char *minstr = luaL_checkstring(L, 1);
const char *magstr = luaL_optstring(L, 2, minstr);
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);
Image::Filter f;
f.min = min;
f.mag = mag;
instance->setDefaultFilter(f);
float anisotropy = (float) luaL_optnumber(L, 3, 1.0);
instance->setDefaultAnisotropy(anisotropy);
return 0;
}
int w_getDefaultFilter(lua_State *L)
{
const Image::Filter &f = instance->getDefaultFilter();
const char *minstr;
const char *magstr;
if (!Image::getConstant(f.min, minstr))
@@ -1409,9 +1409,9 @@ static const luaL_Reg functions[] =
{ "getFont", w_getFont },
{ "setBlendMode", w_setBlendMode },
{ "setDefaultImageFilter", w_setDefaultImageFilter },
{ "getBlendMode", w_getBlendMode },
{ "getDefaultImageFilter", w_getDefaultImageFilter },
{ "setDefaultFilter", w_setDefaultFilter },
{ "getDefaultFilter", w_getDefaultFilter },
{ "setDefaultMipmapFilter", w_setDefaultMipmapFilter },
{ "getDefaultMipmapFilter", w_getDefaultMipmapFilter },
{ "setLineWidth", w_setLineWidth },
src/modules/graphics/opengl/wrap_Graphics.h
+2 -2
View File
@@ -72,9 +72,9 @@ int w_getBackgroundColor(lua_State *L);
int w_setFont(lua_State *L);
int w_getFont(lua_State *L);
int w_setBlendMode(lua_State *L);
int w_setDefaultImageFilter(lua_State *L);
int w_getBlendMode(lua_State *L);
int w_getDefaultImageFilter(lua_State *L);
int w_setDefaultFilter(lua_State *L);
int w_getDefaultFilter(lua_State *L);
int w_setDefaultMipmapFilter(lua_State *L);
int w_getDefaultMipmapFilter(lua_State *L);
int w_setLineWidth(lua_State *L);