diff --git a/source/Math/Transform.cpp b/source/Math/Transform.cpp index 85db5be..1a14d2b 100644 --- a/source/Math/Transform.cpp +++ b/source/Math/Transform.cpp @@ -24,10 +24,10 @@ m_matrix (matrix) { } -void Transform::set(Vector2f _translate, float _rotate, Vector2f _scale) +void Transform::set(Vector2f t, float r, Vector2f s) { reset(); - translate(_translate).rotate(_rotate).scale(_scale); + translate(t).rotate(r).scale(s); } void Transform::setMatrix(const Matrix4f& matrix) @@ -150,10 +150,9 @@ Transform operator*(const Transform& a, const Transform& b) return Transform(a.getMatrix() * b.getMatrix()); } -Transform& operator*=(Transform& a, const Transform& other) +Transform& operator*=(Transform& a, const Transform& b) { - a.combine(other); - return a; + return a.combine(b); } Vector2f operator*(const Transform& transform, const Vector2f& vec)