timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eina: updated matrix_translate, matrix_scale and matrix_rotate implementation to do compose of the matrix in not identity matrix. 

This is a late change that has been discussing on the ML as we don't want to release an API, we can't make faster.

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Subhransu Mohanty 2015-04-17 11:19:59 +09:00 committed by Cedric BAIL
parent c9232109f0
commit ee99232b36
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/lib/eina/eina_matrix.c
View File

@ -419,29 +419,33 @@ eina_matrix3_f16p16_compose(const Eina_Matrix3_F16p16 *m1,
EAPI void
eina_matrix3_translate(Eina_Matrix3 *m, double tx, double ty)
{
MATRIX_XX(m) = 1;
MATRIX_XY(m) = 0;
MATRIX_XZ(m) = tx;
MATRIX_YX(m) = 0;
MATRIX_YY(m) = 1;
MATRIX_YZ(m) = ty;
MATRIX_ZX(m) = 0;
MATRIX_ZY(m) = 0;
MATRIX_ZZ(m) = 1;
Eina_Matrix3 tmp;
MATRIX_XX(&tmp) = 1;
MATRIX_XY(&tmp) = 0;
MATRIX_XZ(&tmp) = tx;
MATRIX_YX(&tmp) = 0;
MATRIX_YY(&tmp) = 1;
MATRIX_YZ(&tmp) = ty;
MATRIX_ZX(&tmp) = 0;
MATRIX_ZY(&tmp) = 0;
MATRIX_ZZ(&tmp) = 1;
eina_matrix3_compose(m, &tmp, m);
}
EAPI void
eina_matrix3_scale(Eina_Matrix3 *m, double sx, double sy)
{
MATRIX_XX(m) = sx;
MATRIX_XY(m) = 0;
MATRIX_XZ(m) = 0;
MATRIX_YX(m) = 0;
MATRIX_YY(m) = sy;
MATRIX_YZ(m) = 0;
MATRIX_ZX(m) = 0;
MATRIX_ZY(m) = 0;
MATRIX_ZZ(m) = 1;
Eina_Matrix3 tmp;
MATRIX_XX(&tmp) = sx;
MATRIX_XY(&tmp) = 0;
MATRIX_XZ(&tmp) = 0;
MATRIX_YX(&tmp) = 0;
MATRIX_YY(&tmp) = sy;
MATRIX_YZ(&tmp) = 0;
MATRIX_ZX(&tmp) = 0;
MATRIX_ZY(&tmp) = 0;
MATRIX_ZZ(&tmp) = 1;
eina_matrix3_compose(m, &tmp, m);
}
EAPI void
@ -458,15 +462,17 @@ eina_matrix3_rotate(Eina_Matrix3 *m, double rad)
s = _sin(rad);
#endif
MATRIX_XX(m) = c;
MATRIX_XY(m) = -s;
MATRIX_XZ(m) = 0;
MATRIX_YX(m) = s;
MATRIX_YY(m) = c;
MATRIX_YZ(m) = 0;
MATRIX_ZX(m) = 0;
MATRIX_ZY(m) = 0;
MATRIX_ZZ(m) = 1;
Eina_Matrix3 tmp;
MATRIX_XX(&tmp) = c;
MATRIX_XY(&tmp) = -s;
MATRIX_XZ(&tmp) = 0;
MATRIX_YX(&tmp) = s;
MATRIX_YY(&tmp) = c;
MATRIX_YZ(&tmp) = 0;
MATRIX_ZX(&tmp) = 0;
MATRIX_ZY(&tmp) = 0;
MATRIX_ZZ(&tmp) = 1;
eina_matrix3_compose(m, &tmp, m);
}
EAPI void