diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-07 20:04:31 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-07 20:04:31 +0300 |
| commit | 4f73caba4497344c50ea245673493941d277699f (patch) | |
| tree | 4827cef09b7b67bbe9f9230fe0c8217012adb96a /src/resources | |
| parent | 8aa59221c316baf989424983d228f3bffd1b7e0a (diff) | |
| download | manaplus-4f73caba4497344c50ea245673493941d277699f.tar.gz manaplus-4f73caba4497344c50ea245673493941d277699f.tar.bz2 manaplus-4f73caba4497344c50ea245673493941d277699f.tar.xz manaplus-4f73caba4497344c50ea245673493941d277699f.zip | |
Add option to enable/disable texture blurring. (GL_LINEAR/GL_LINEAR)
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image.cpp | 13 | ||||
| -rw-r--r-- | src/resources/image.h | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index c63fcab99..54a969d57 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -45,6 +45,7 @@ int Image::mUseOpenGL = 0; int Image::mTextureType = 0; int Image::mTextureSize = 0; +bool Image::mBlur = true; #endif bool Image::mEnableAlphaCache = false; bool Image::mEnableAlpha = true; @@ -766,8 +767,16 @@ Image *Image::_GLload(SDL_Surface *tmpImage) SDL_LockSurface(tmpImage); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glTexParameteri(mTextureType, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(mTextureType, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + if (mBlur) + { + glTexParameteri(mTextureType, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(mTextureType, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + } + else + { + glTexParameteri(mTextureType, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(mTextureType, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + } glTexImage2D(mTextureType, 0, 4, tmpImage->w, tmpImage->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->pixels); diff --git a/src/resources/image.h b/src/resources/image.h index 89fe24d89..17eb3ec93 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -215,6 +215,9 @@ class Image : public Resource static int getTextureType() { return mTextureType; } + static void setBlur(bool n) + { mBlur = n; } + static int mTextureType; #endif @@ -294,6 +297,7 @@ class Image : public Resource static int mUseOpenGL; static int mTextureSize; + static bool mBlur; #endif }; |