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

Changed Transform::Combine to modify *this (more consistent with other functions)

Browse source
This commit is contained in:
Laurent Gomila 2012-02-20 20:18:48 +01:00
parent 48c7db52c3
commit b8ea003eae
2 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/SFML/Graphics/Transform.hpp
View file

@ -135,18 +135,18 @@ public :
FloatRect TransformRect(const FloatRect& rectangle) const;
////////////////////////////////////////////////////////////
/// \brief Combine two transforms
/// \brief Combine the current transform with another one
///
/// The result is a transform that is equivalent to applying
/// *this followed by \a transform. Mathematically, it is
/// equivalent to a matrix multiplication.
///
/// \param transform Transform to combine to this transform
/// \param transform Transform to combine with this transform
///
/// \return New combined transform
/// \return Reference to *this
///
////////////////////////////////////////////////////////////
Transform Combine(const Transform& transform) const;
Transform& Combine(const Transform& transform);
////////////////////////////////////////////////////////////
/// \brief Combine the current transform with a translation
@ -365,7 +365,7 @@ private:
/// \relates sf::Transform
/// \brief Overload of binary operator * to combine two transforms
///
/// This call is equivalent to calling left.Combine(right).
/// This call is equivalent to calling Transform(left).Combine(right).
///
/// \param left Left operand (the first transform)
/// \param right Right operand (the second transform)
@ -379,7 +379,7 @@ SFML_GRAPHICS_API Transform operator *(const Transform& left, const Transform& r
/// \relates sf::Transform
/// \brief Overload of binary operator *= to combine two transforms
///
/// This call is equivalent to calling left = left.Combine(right).
/// This call is equivalent to calling left.Combine(right).
///
/// \param left Left operand (the first transform)
/// \param right Right operand (the second transform)