summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-11 23:17:58 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-11 23:17:58 +0300
commit4dbda55f670866db29a64ca7a79500efbe6f8d00 (patch)
treeddf806b499dcb4896568278b05defad1f27bcd06 /src/resources
parentfbb1186a319794dba7c23c466c07d6f45f940b8e (diff)
downloadmv-4dbda55f670866db29a64ca7a79500efbe6f8d00.tar.gz
mv-4dbda55f670866db29a64ca7a79500efbe6f8d00.tar.bz2
mv-4dbda55f670866db29a64ca7a79500efbe6f8d00.tar.xz
mv-4dbda55f670866db29a64ca7a79500efbe6f8d00.zip
Replace some getters to direct fileds using.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.cpp6
-rw-r--r--src/resources/image.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 6fa0b5bf5..b342edcbf 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -82,6 +82,8 @@ Image::Image(const GLuint glimage, const int width, const int height,
const int texWidth, const int texHeight) :
Resource(),
mGLImage(glimage),
+ mTexWidth(texWidth),
+ mTexHeight(texHeight),
mLoaded(false),
mAlpha(1.0f),
mHasAlphaChannel(true),
@@ -89,9 +91,7 @@ Image::Image(const GLuint glimage, const int width, const int height,
mAlphaChannel(nullptr),
mUseAlphaCache(false),
mIsAlphaVisible(true),
- mIsAlphaCalculated(false),
- mTexWidth(texWidth),
- mTexHeight(texHeight)
+ mIsAlphaCalculated(false)
{
mBounds.x = 0;
mBounds.y = 0;
diff --git a/src/resources/image.h b/src/resources/image.h
index 160adcba3..3374c8697 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -155,6 +155,8 @@ class Image : public Resource
{ return mGLImage; }
GLuint mGLImage;
+ int mTexWidth;
+ int mTexHeight;
#endif
bool isHasAlphaChannel() const
@@ -214,8 +216,6 @@ class Image : public Resource
*/
Image(const GLuint glimage, const int width, const int height,
const int texWidth, const int texHeight);
-
- int mTexWidth, mTexHeight;
#endif
};