isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl/matrix: Use graphene to transpose matrix

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto 2019-02-27 16:03:29 -03:00
parent 92a58d9afa
commit 10dd3399ca
No known key found for this signature in database
GPG Key ID: 886C17EE170D1385
1 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cogl/cogl/cogl-matrix.c
View File

@ -75,6 +75,7 @@
#include <cogl-debug.h> #include <cogl-debug.h>
#include <cogl-matrix.h> #include <cogl-matrix.h>
#include <cogl-matrix-private.h> #include <cogl-matrix-private.h>
#include <cogl-graphene-utils.h>
#include <glib.h> #include <glib.h>
#include <math.h> #include <math.h>
@ -1855,30 +1856,6 @@ cogl_matrix_init_from_euler (CoglMatrix *matrix,
matrix->flags = (MAT_FLAG_GENERAL | MAT_DIRTY_ALL); matrix->flags = (MAT_FLAG_GENERAL | MAT_DIRTY_ALL);
} }
/*
* Transpose a float matrix.
*/
static void
_cogl_matrix_util_transposef (float to[16], const float from[16])
{
to[0] = from[0];
to[1] = from[4];
to[2] = from[8];
to[3] = from[12];
to[4] = from[1];
to[5] = from[5];
to[6] = from[9];
to[7] = from[13];
to[8] = from[2];
to[9] = from[6];
to[10] = from[10];
to[11] = from[14];
to[12] = from[3];
to[13] = from[7];
to[14] = from[11];
to[15] = from[15];
}
void void
cogl_matrix_view_2d_in_frustum (CoglMatrix *matrix, cogl_matrix_view_2d_in_frustum (CoglMatrix *matrix,
float left, float left,
@ -2291,18 +2268,11 @@ cogl_matrix_look_at (CoglMatrix *matrix,
void void
cogl_matrix_transpose (CoglMatrix *matrix) cogl_matrix_transpose (CoglMatrix *matrix)
{ {
float new_values[16]; graphene_matrix_t transposed;
float values[16];
/* We don't need to do anything if the matrix is the identity matrix */ cogl_matrix_to_graphene_matrix (matrix, &transposed);
if (!(matrix->flags & MAT_DIRTY_TYPE) && graphene_matrix_transpose (&transposed, &transposed);
matrix->type == COGL_MATRIX_TYPE_IDENTITY) graphene_matrix_to_cogl_matrix (&transposed, matrix);
return;
cogl_matrix_get_array (matrix, values);
_cogl_matrix_util_transposef (new_values, values);
cogl_matrix_init_from_array (matrix, new_values);
} }
GType GType