From b8ea003eae38758e0860ca368e378c260466cb3b Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Mon, 20 Feb 2012 20:18:48 +0100 Subject: [PATCH] Changed Transform::Combine to modify *this (more consistent with other functions) --- include/SFML/Graphics/Transform.hpp | 12 +++++----- src/SFML/Graphics/Transform.cpp | 36 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/include/SFML/Graphics/Transform.hpp b/include/SFML/Graphics/Transform.hpp index 8cd3f359..334e45f4 100644 --- a/include/SFML/Graphics/Transform.hpp +++ b/include/SFML/Graphics/Transform.hpp @@ -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) diff --git a/src/SFML/Graphics/Transform.cpp b/src/SFML/Graphics/Transform.cpp index 3d459ca6..eb027ea8 100644 --- a/src/SFML/Graphics/Transform.cpp +++ b/src/SFML/Graphics/Transform.cpp @@ -139,20 +139,22 @@ FloatRect Transform::TransformRect(const FloatRect& rectangle) const //////////////////////////////////////////////////////////// -Transform Transform::Combine(const Transform& transform) const +Transform& Transform::Combine(const Transform& transform) { const float* a = myMatrix; const float* b = transform.myMatrix; - return Transform(a[0] * b[0] + a[4] * b[1] + a[12] * b[3], - a[0] * b[4] + a[4] * b[5] + a[12] * b[7], - a[0] * b[12] + a[4] * b[13] + a[12] * b[15], - a[1] * b[0] + a[5] * b[1] + a[13] * b[3], - a[1] * b[4] + a[5] * b[5] + a[13] * b[7], - a[1] * b[12] + a[5] * b[13] + a[13] * b[15], - a[3] * b[0] + a[7] * b[1] + a[15] * b[3], - a[3] * b[4] + a[7] * b[5] + a[15] * b[7], - a[3] * b[12] + a[7] * b[13] + a[15] * b[15]); + *this = Transform(a[0] * b[0] + a[4] * b[1] + a[12] * b[3], + a[0] * b[4] + a[4] * b[5] + a[12] * b[7], + a[0] * b[12] + a[4] * b[13] + a[12] * b[15], + a[1] * b[0] + a[5] * b[1] + a[13] * b[3], + a[1] * b[4] + a[5] * b[5] + a[13] * b[7], + a[1] * b[12] + a[5] * b[13] + a[13] * b[15], + a[3] * b[0] + a[7] * b[1] + a[15] * b[3], + a[3] * b[4] + a[7] * b[5] + a[15] * b[7], + a[3] * b[12] + a[7] * b[13] + a[15] * b[15]); + + return *this; } @@ -163,7 +165,7 @@ Transform& Transform::Translate(float x, float y) 0, 1, y, 0, 0, 1); - return *this = Combine(translation); + return Combine(translation); } @@ -185,7 +187,7 @@ Transform& Transform::Rotate(float angle) sin, cos, 0, 0, 0, 1); - return *this = Combine(rotation); + return Combine(rotation); } @@ -200,7 +202,7 @@ Transform& Transform::Rotate(float angle, float centerX, float centerY) sin, cos, centerY * (1 - cos) - centerX * sin, 0, 0, 1); - return *this = Combine(rotation); + return Combine(rotation); } @@ -218,7 +220,7 @@ Transform& Transform::Scale(float scaleX, float scaleY) 0, scaleY, 0, 0, 0, 1); - return *this = Combine(scaling); + return Combine(scaling); } @@ -229,7 +231,7 @@ Transform& Transform::Scale(float scaleX, float scaleY, float centerX, float cen 0, scaleY, centerY * (1 - scaleY), 0, 0, 1); - return *this = Combine(scaling); + return Combine(scaling); } @@ -250,14 +252,14 @@ Transform& Transform::Scale(const Vector2f& factors, const Vector2f& center) //////////////////////////////////////////////////////////// Transform operator *(const Transform& left, const Transform& right) { - return left.Combine(right); + return Transform(left).Combine(right); } //////////////////////////////////////////////////////////// Transform& operator *=(Transform& left, const Transform& right) { - return left = left.Combine(right); + return left.Combine(right); }