Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sf::Sprite::setTexture(..., false) resets the texture rect only if it hasn't been set before

Browse Source
This commit is contained in:
Laurent Gomila 2012-08-24 16:19:43 +02:00
parent 1d80eaa59b
commit 692240f60d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SFML/Graphics/Sprite.cpp
View File

@ -36,7 +36,7 @@ namespace sf
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sprite::Sprite() : Sprite::Sprite() :
m_texture (NULL), m_texture (NULL),
m_textureRect(0, 0, 0, 0) m_textureRect()
{ {
} }
@ -44,7 +44,7 @@ m_textureRect(0, 0, 0, 0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sprite::Sprite(const Texture& texture) : Sprite::Sprite(const Texture& texture) :
m_texture (NULL), m_texture (NULL),
m_textureRect(0, 0, 0, 0) m_textureRect()
{ {
setTexture(texture); setTexture(texture);
} }
@ -53,7 +53,7 @@ m_textureRect(0, 0, 0, 0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sprite::Sprite(const Texture& texture, const IntRect& rectangle) : Sprite::Sprite(const Texture& texture, const IntRect& rectangle) :
m_texture (NULL), m_texture (NULL),
m_textureRect(0, 0, 0, 0) m_textureRect()
{ {
setTexture(texture); setTexture(texture);
setTextureRect(rectangle); setTextureRect(rectangle);
@ -63,8 +63,8 @@ m_textureRect(0, 0, 0, 0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Sprite::setTexture(const Texture& texture, bool resetRect) void Sprite::setTexture(const Texture& texture, bool resetRect)
{ {
// Recompute the texture area if requested, or if there was no valid texture before // Recompute the texture area if requested, or if there was no valid texture & rect before
if (resetRect || !m_texture) if (resetRect || (!m_texture && (m_textureRect == sf::IntRect())))
setTextureRect(IntRect(0, 0, texture.getSize().x, texture.getSize().y)); setTextureRect(IntRect(0, 0, texture.getSize().x, texture.getSize().y));
// Assign the new texture // Assign the new texture