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

Applied patch from issue #542 (texture filtering inconsistencies) in main LÖVE repository

Browse Source
This commit is contained in:
Alexander Szpakowski
2013-01-01 21:29:38 -04:00
parent a8dc813258
commit 1678252b7a
15 changed files with 315 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+26 -5
View File
@@ -116,16 +116,15 @@ void Font::createTexture()
GLuint t;
glGenTextures(1, &t);
textures.push_back(t);
bindTexture(t);
setTextureFilter(filter);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
(filter.mag == Image::FILTER_LINEAR) ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
(filter.min == Image::FILTER_LINEAR) ? GL_LINEAR : GL_NEAREST);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
GLint format = (type == FONT_TRUETYPE ? GL_LUMINANCE_ALPHA : GL_RGBA);
GLint format = (type == FONT_TRUETYPE ? GL_LUMINANCE_ALPHA : GL_RGBA);
// try to initialize the texture, attempting smaller sizes if initialization fails
bool initialized = false;
@@ -493,6 +492,28 @@ float Font::getSpacing() const
return mSpacing;
}
void Font::setFilter(const Image::Filter &f)
{
std::vector<GLuint>::const_iterator it;
for (it = textures.begin(); it != textures.end(); ++it)
{
bindTexture(*it);
setTextureFilter(f);
}
}
Image::Filter Font::getFilter()
{
std::vector<GLuint>::const_iterator it;
for (it = textures.begin(); it != textures.end(); ++it)
{
bindTexture(*it);
return getTextureFilter();
}
return Image::getDefaultFilter();
}
bool Font::loadVolatile()
{
createTexture();