lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced getWidth/getHeight with getSize in sf::Texture and sf::Image

Browse source
This commit is contained in:
Laurent Gomila 2012-03-31 22:37:13 +02:00
parent b2f3787db1
commit 17e6a45a90
12 changed files with 127 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/SFML/Graphics/Image.hpp
View file

@ -150,24 +150,12 @@ public :
bool saveToFile(const std::string& filename) const;
////////////////////////////////////////////////////////////
/// \brief Return the width of the image
/// \brief Return the size of the image
///
/// \return Width in pixels
///
/// \see getHeight
/// \return Size in pixels
///
////////////////////////////////////////////////////////////
unsigned int getWidth() const;
////////////////////////////////////////////////////////////
/// \brief Return the height of the image
///
/// \return Height in pixels
///
/// \see getWidth
///
////////////////////////////////////////////////////////////
unsigned int getHeight() const;
Vector2u getSize() const;
////////////////////////////////////////////////////////////
/// \brief Create a transparency mask from a specified color-key
@ -269,8 +257,7 @@ private :
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////
unsigned int m_width; ///< Image width
unsigned int m_height; ///< Image Height
Vector2u m_size; ///< Image size
std::vector<Uint8> m_pixels; ///< Pixels of the image
};

24
include/SFML/Graphics/Texture.hpp
View file

@ -214,24 +214,12 @@ public :
bool loadFromImage(const Image& image, const IntRect& area = IntRect());
////////////////////////////////////////////////////////////
/// \brief Return the width of the texture
/// \brief Return the size of the texture
///
/// \return Width in pixels
///
/// \see getHeight
/// \return Size in pixels
///
////////////////////////////////////////////////////////////
unsigned int getWidth() const;
////////////////////////////////////////////////////////////
/// \brief Return the height of the texture
///
/// \return Height in pixels
///
/// \see getWidth
///
////////////////////////////////////////////////////////////
unsigned int getHeight() const;
Vector2u getSize() const;
////////////////////////////////////////////////////////////
/// \brief Copy the texture pixels to an image
@ -489,10 +477,8 @@ private :
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////
unsigned int m_width; ///< Image width
unsigned int m_height; ///< Image Height
unsigned int m_textureWidth; ///< Actual texture width (can be greater than image width because of padding)
unsigned int m_textureHeight; ///< Actual texture height (can be greater than image height because of padding)
Vector2u m_size; ///< Public texture size
Vector2u m_actualSize; ///< Actual texture size (can be greater than public size because of padding)
unsigned int m_texture; ///< Internal texture identifier
bool m_isSmooth; ///< Status of the smooth filter
bool m_isRepeated; ///< Is the texture in repeat mode?