Commit 13b7691b authored by hybrid's avatar hybrid

Fixed correct overloading of hasMipMaps, found by Jiang. Also changed it to const.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@648 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 503c4532
...@@ -151,7 +151,7 @@ public: ...@@ -151,7 +151,7 @@ public:
//! Returns whether the texture has MipMaps //! Returns whether the texture has MipMaps
/** \return Returns true if texture has MipMaps, else false. */ /** \return Returns true if texture has MipMaps, else false. */
virtual bool hasMipMaps() { return false; } virtual bool hasMipMaps() const { return false; }
//! Regenerates the mip map levels of the texture. //! Regenerates the mip map levels of the texture.
/** Useful after locking and modifying the texture */ /** Useful after locking and modifying the texture */
......
...@@ -385,7 +385,7 @@ IDirect3DTexture8* CD3D8Texture::getDX8Texture() ...@@ -385,7 +385,7 @@ IDirect3DTexture8* CD3D8Texture::getDX8Texture()
//! returns if texture has mipmap levels //! returns if texture has mipmap levels
bool CD3D8Texture::hasMipMaps() bool CD3D8Texture::hasMipMaps() const
{ {
return HasMipMaps; return HasMipMaps;
} }
......
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
IDirect3DTexture8* getDX8Texture(); IDirect3DTexture8* getDX8Texture();
//! returns if texture has mipmap levels //! returns if texture has mipmap levels
bool hasMipMaps(); bool hasMipMaps() const;
//! Regenerates the mip map levels of the texture. Useful after locking and //! Regenerates the mip map levels of the texture. Useful after locking and
//! modifying the texture //! modifying the texture
......
...@@ -560,7 +560,7 @@ IDirect3DTexture9* CD3D9Texture::getDX9Texture() ...@@ -560,7 +560,7 @@ IDirect3DTexture9* CD3D9Texture::getDX9Texture()
//! returns if texture has mipmap levels //! returns if texture has mipmap levels
bool CD3D9Texture::hasMipMaps() bool CD3D9Texture::hasMipMaps() const
{ {
return HasMipMaps; return HasMipMaps;
} }
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
IDirect3DTexture9* getDX9Texture(); IDirect3DTexture9* getDX9Texture();
//! returns if texture has mipmap levels //! returns if texture has mipmap levels
bool hasMipMaps(); bool hasMipMaps() const;
//! Regenerates the mip map levels of the texture. Useful after locking and //! Regenerates the mip map levels of the texture. Useful after locking and
//! modifying the texture //! modifying the texture
......
...@@ -405,7 +405,7 @@ GLuint COpenGLTexture::getOpenGLTextureName() ...@@ -405,7 +405,7 @@ GLuint COpenGLTexture::getOpenGLTextureName()
//! Returns whether this texture has mipmaps //! Returns whether this texture has mipmaps
//! return true if texture has mipmaps //! return true if texture has mipmaps
bool COpenGLTexture::hasMipMaps() bool COpenGLTexture::hasMipMaps() const
{ {
return HasMipMaps; return HasMipMaps;
} }
......
...@@ -82,7 +82,7 @@ public: ...@@ -82,7 +82,7 @@ public:
GLuint getOpenGLTextureName(); GLuint getOpenGLTextureName();
//! return whether this texture has mipmaps //! return whether this texture has mipmaps
virtual bool hasMipMaps(); virtual bool hasMipMaps() const;
//! Regenerates the mip map levels of the texture. Useful after //! Regenerates the mip map levels of the texture. Useful after
//! locking and modifying the texture //! locking and modifying the texture
......
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
} }
//! support mipmaps //! support mipmaps
virtual s32 hasMipMaps() const virtual bool hasMipMaps() const
{ {
return HasMipMaps; return HasMipMaps;
} }
...@@ -111,7 +111,7 @@ private: ...@@ -111,7 +111,7 @@ private:
CImage * MipMap[SOFTWARE_DRIVER_2_MIPMAPPING_MAX]; CImage * MipMap[SOFTWARE_DRIVER_2_MIPMAPPING_MAX];
s32 MipMapLOD; s32 MipMapLOD;
s32 HasMipMaps; bool HasMipMaps;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment