diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-07-28 22:49:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-07-28 22:49:25 +0300 |
| commit | 7c8410604d16e960a4ef7727517dd5fd43e9499e (patch) | |
| tree | e0513ec61fffe2978192e9e4ed963fe1198148b3 | |
| parent | 4d8b97711684c66338c629500ea650c3d1a6802f (diff) | |
| download | mv-7c8410604d16e960a4ef7727517dd5fd43e9499e.tar.gz mv-7c8410604d16e960a4ef7727517dd5fd43e9499e.tar.bz2 mv-7c8410604d16e960a4ef7727517dd5fd43e9499e.tar.xz mv-7c8410604d16e960a4ef7727517dd5fd43e9499e.zip | |
move bools in image.
| -rw-r--r-- | src/resources/image.cpp | 8 | ||||
| -rw-r--r-- | src/resources/image.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 88360c870..c19d92d2d 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -53,12 +53,12 @@ Image::Image(SDL_Surface *const image, const bool hasAlphaChannel0, mTexHeight(0), #endif mBounds(), - mLoaded(false), mAlpha(1.0f), - mHasAlphaChannel(hasAlphaChannel0), mSDLSurface(image), mAlphaChannel(alphaChannel), mAlphaCache(), + mLoaded(false), + mHasAlphaChannel(hasAlphaChannel0), mUseAlphaCache(SDLImageHelper::mEnableAlphaCache), mIsAlphaVisible(hasAlphaChannel0), mIsAlphaCalculated(false) @@ -90,12 +90,12 @@ Image::Image(const GLuint glimage, const int width, const int height, mTexWidth(texWidth), mTexHeight(texHeight), mBounds(), - mLoaded(false), mAlpha(1.0f), - mHasAlphaChannel(true), mSDLSurface(nullptr), mAlphaChannel(nullptr), mAlphaCache(), + mLoaded(false), + mHasAlphaChannel(true), mUseAlphaCache(false), mIsAlphaVisible(true), mIsAlphaCalculated(false) diff --git a/src/resources/image.h b/src/resources/image.h index 78eb07d7f..5ac239471 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -183,9 +183,7 @@ class Image : public Resource // Generic protected members // ----------------------- - bool mLoaded; float mAlpha; - bool mHasAlphaChannel; // ----------------------- // SDL protected members @@ -204,6 +202,8 @@ class Image : public Resource std::map<float, SDL_Surface*> mAlphaCache; + bool mLoaded; + bool mHasAlphaChannel; bool mUseAlphaCache; bool mIsAlphaVisible; bool mIsAlphaCalculated; |