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
master
hybrid 2007-05-22 07:20:16 +00:00
parent 503c45323a
commit 13b7691b7a
8 changed files with 9 additions and 9 deletions

View File

@ -151,7 +151,7 @@ public:
//! Returns whether the texture has MipMaps
/** \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.
/** Useful after locking and modifying the texture */

View File

@ -385,7 +385,7 @@ IDirect3DTexture8* CD3D8Texture::getDX8Texture()
//! returns if texture has mipmap levels
bool CD3D8Texture::hasMipMaps()
bool CD3D8Texture::hasMipMaps() const
{
return HasMipMaps;
}

View File

@ -61,7 +61,7 @@ public:
IDirect3DTexture8* getDX8Texture();
//! returns if texture has mipmap levels
bool hasMipMaps();
bool hasMipMaps() const;
//! Regenerates the mip map levels of the texture. Useful after locking and
//! modifying the texture

View File

@ -560,7 +560,7 @@ IDirect3DTexture9* CD3D9Texture::getDX9Texture()
//! returns if texture has mipmap levels
bool CD3D9Texture::hasMipMaps()
bool CD3D9Texture::hasMipMaps() const
{
return HasMipMaps;
}

View File

@ -60,7 +60,7 @@ public:
IDirect3DTexture9* getDX9Texture();
//! returns if texture has mipmap levels
bool hasMipMaps();
bool hasMipMaps() const;
//! Regenerates the mip map levels of the texture. Useful after locking and
//! modifying the texture

View File

@ -405,7 +405,7 @@ GLuint COpenGLTexture::getOpenGLTextureName()
//! Returns whether this texture has mipmaps
//! return true if texture has mipmaps
bool COpenGLTexture::hasMipMaps()
bool COpenGLTexture::hasMipMaps() const
{
return HasMipMaps;
}

View File

@ -82,7 +82,7 @@ public:
GLuint getOpenGLTextureName();
//! return whether this texture has mipmaps
virtual bool hasMipMaps();
virtual bool hasMipMaps() const;
//! Regenerates the mip map levels of the texture. Useful after
//! locking and modifying the texture

View File

@ -96,7 +96,7 @@ public:
}
//! support mipmaps
virtual s32 hasMipMaps() const
virtual bool hasMipMaps() const
{
return HasMipMaps;
}
@ -111,7 +111,7 @@ private:
CImage * MipMap[SOFTWARE_DRIVER_2_MIPMAPPING_MAX];
s32 MipMapLOD;
s32 HasMipMaps;
bool HasMipMaps;
};