diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-04-01 04:37:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-04-01 04:37:16 +0300 |
| commit | 11cda679c74cf5c0db0cdc8eb1f3ff7d1d667f9b (patch) | |
| tree | 65dae8ab5d62d1e5016c71a707843fde5341c16b /src/resources/image.cpp | |
| parent | 5468fd625168cdbb085f96a84ff48660457e8f54 (diff) | |
| download | manaverse-11cda679c74cf5c0db0cdc8eb1f3ff7d1d667f9b.tar.gz manaverse-11cda679c74cf5c0db0cdc8eb1f3ff7d1d667f9b.tar.bz2 manaverse-11cda679c74cf5c0db0cdc8eb1f3ff7d1d667f9b.tar.xz manaverse-11cda679c74cf5c0db0cdc8eb1f3ff7d1d667f9b.zip | |
Commented some sdl and opengl tests.
Diffstat (limited to 'src/resources/image.cpp')
| -rw-r--r-- | src/resources/image.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 0cb8779ff..ea32e6601 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -588,6 +588,7 @@ Image *Image::_SDLload(SDL_Surface *tmpImage) if (converted) SDL_FreeSurface(tmpImage); +// SDL_SetColorKey(image, SDL_SRCCOLORKEY | SDL_RLEACCEL, 0); return new Image(image, hasAlpha, alphaChannel); } @@ -651,6 +652,7 @@ Image *Image::_GLload(SDL_Surface *tmpImage) if (SDL_MUSTLOCK(tmpImage)) SDL_LockSurface(tmpImage); +// glTexImage2D(mTextureType, 0, GL_COMPRESSED_RGBA_ARB, tmpImage->w, tmpImage->h, glTexImage2D(mTextureType, 0, 4, tmpImage->w, tmpImage->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->pixels); |