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

Reworked internal anisotropic filtering code to be more concise and intuitive

Browse Source
This commit is contained in:
Alex Szpakowski
2013-03-21 12:21:13 -03:00
parent 7e753a0acb
commit 2009124cf9
16 changed files with 43 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Image.cpp
+3 -33
View File
@@ -34,7 +34,6 @@ namespace opengl
{
float Image::maxMipmapSharpness = 0.0f;
float Image::maxAnisotropy = 1.0f;
Image::FilterMode Image::defaultMipmapFilter = Image::FILTER_NONE;
float Image::defaultMipmapSharpness = 0.0f;
@@ -45,7 +44,6 @@ Image::Image(love::image::ImageData *data)
, texture(0)
, mipmapSharpness(defaultMipmapSharpness)
, mipmapsCreated(false)
, anisotropy(getDefaultAnisotropy())
{
data->retain();
this->data = data;
@@ -208,7 +206,7 @@ void Image::setFilter(const Image::Filter &f)
filter = f;
bind();
setTextureFilter(f);
filter.anisotropy = setTextureFilter(f);
checkMipmapsCreated();
}
@@ -249,24 +247,6 @@ float Image::getMipmapSharpness() const
return mipmapSharpness;
}
void Image::setAnisotropy(float anisotropy)
{
if (hasAnisotropicFilteringSupport())
{
this->anisotropy = std::min(std::max(anisotropy, 1.0f), getMaxAnisotropy());
bind();
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, this->anisotropy);
}
else
this->anisotropy = 1.0f;
}
float Image::getAnisotropy() const
{
return anisotropy;
}
void Image::bind() const
{
if (texture == 0)
@@ -301,7 +281,7 @@ bool Image::loadVolatilePOT()
glGenTextures(1,(GLuint *)&texture);
bindTexture(texture);
setTextureFilter(filter);
filter.anisotropy = setTextureFilter(filter);
setTextureWrap(wrap);
float p2width = next_p2(width);
@@ -343,7 +323,6 @@ bool Image::loadVolatilePOT()
checkMipmapsCreated();
setMipmapSharpness(mipmapSharpness);
setAnisotropy(anisotropy);
return true;
}
@@ -353,7 +332,7 @@ bool Image::loadVolatileNPOT()
glGenTextures(1,(GLuint *)&texture);
bindTexture(texture);
setTextureFilter(filter);
filter.anisotropy = setTextureFilter(filter);
setTextureWrap(wrap);
while (glGetError() != GL_NO_ERROR); // clear errors
@@ -375,7 +354,6 @@ bool Image::loadVolatileNPOT()
checkMipmapsCreated();
setMipmapSharpness(mipmapSharpness);
setAnisotropy(anisotropy);
return true;
}
@@ -429,14 +407,6 @@ Image::FilterMode Image::getDefaultMipmapFilter()
return defaultMipmapFilter;
}
float Image::getMaxAnisotropy()
{
if (hasAnisotropicFilteringSupport() && maxAnisotropy == 1.0f)
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maxAnisotropy);
return maxAnisotropy;
}
bool Image::hasNpot()
{
return GLEE_VERSION_2_0 || GLEE_ARB_texture_non_power_of_two;