pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Math/Transform.cpp: minor fixes.

Browse source
This commit is contained in:
Henrik Hautakoski 2020-02-12 19:29:02 +01:00
parent 76d175ffd9
commit 18ea713445
No known key found for this signature in database
GPG key ID: 96765B12FEAC4745
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
source/Math/Transform.cpp
View file

@ -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)