diff --git a/include/Spectre/Math/Transform.h b/include/Spectre/Math/Transform.h index dfed6b4..51ddf88 100644 --- a/include/Spectre/Math/Transform.h +++ b/include/Spectre/Math/Transform.h @@ -53,7 +53,7 @@ public : Transform& scale(Vector2f offset); Transform& scale(float s); - Transform& multiply(const Transform& other); + Transform& combine(const Transform& other); Vector2f transformPoint(float x, float y) const; diff --git a/source/Math/Transform.cpp b/source/Math/Transform.cpp index ef3ace4..85db5be 100644 --- a/source/Math/Transform.cpp +++ b/source/Math/Transform.cpp @@ -56,7 +56,7 @@ Transform& Transform::translate(float x, float y) 0, 1, y, 0, 0, 1); - return multiply(t); + return combine(t); } Transform& Transform::translate(Vector2f vec) @@ -75,7 +75,7 @@ Transform& Transform::rotate(float theta) s, c, 0, 0, 0, 1); - return multiply(r); + return combine(r); } Transform& Transform::scale(float x, float y) @@ -84,7 +84,7 @@ Transform& Transform::scale(float x, float y) 0, y, 0, 0, 0, 1); - return multiply(s); + return combine(s); } Transform& Transform::scale(Vector2f vec) @@ -97,7 +97,7 @@ Transform& Transform::scale(float s) return scale(s, s); } -Transform& Transform::multiply(const Transform& other) +Transform& Transform::combine(const Transform& other) { m_matrix *= other.m_matrix; return *this; @@ -152,7 +152,7 @@ Transform operator*(const Transform& a, const Transform& b) Transform& operator*=(Transform& a, const Transform& other) { - a.multiply(other); + a.combine(other); return a; }