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

clip-stack: combine modelview-projection in set_clip_planes

Browse Source 
When using clip planes and we we have to project some vertices into
screen coordinates we used to transform those by the modelview and then
the projection matrix separately. Now we combine the modelview and
projection matrix and then use that to transform the vertices in one
step instead.
This commit is contained in:
Robert Bragg 2010-11-22 15:51:15 +00:00
parent 99f4832c28
commit c68280556e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clutter/cogl/cogl/cogl-clip-stack.c
View File

@ -145,20 +145,15 @@ struct _CoglClipStackPath
}; };
static void static void
project_vertex (const CoglMatrix *modelview_matrix, project_vertex (const CoglMatrix *modelview_projection,
const CoglMatrix *projection_matrix,
float *vertex) float *vertex)
{ {
int i; int i;
/* Apply the modelview matrix */ cogl_matrix_transform_point (modelview_projection,
cogl_matrix_transform_point (modelview_matrix,
&vertex[0], &vertex[1],
&vertex[2], &vertex[3]);
/* Apply the projection matrix */
cogl_matrix_transform_point (projection_matrix,
&vertex[0], &vertex[1], &vertex[0], &vertex[1],
&vertex[2], &vertex[3]); &vertex[2], &vertex[3]);
/* Convert from homogenized coordinates */ /* Convert from homogenized coordinates */
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
vertex[i] /= vertex[3]; vertex[i] /= vertex[3];
@ -234,6 +229,7 @@ set_clip_planes (float x_1,
CoglMatrixStack *projection_stack = CoglMatrixStack *projection_stack =
_cogl_framebuffer_get_projection_stack (framebuffer); _cogl_framebuffer_get_projection_stack (framebuffer);
CoglMatrix projection_matrix; CoglMatrix projection_matrix;
CoglMatrix modelview_projection;
float signed_area; float signed_area;
float vertex_tl[4] = { x_1, y_1, 0, 1.0 }; float vertex_tl[4] = { x_1, y_1, 0, 1.0 };
@ -244,10 +240,14 @@ set_clip_planes (float x_1,
_cogl_matrix_stack_get (projection_stack, &projection_matrix); _cogl_matrix_stack_get (projection_stack, &projection_matrix);
_cogl_matrix_stack_get (modelview_stack, &modelview_matrix); _cogl_matrix_stack_get (modelview_stack, &modelview_matrix);
project_vertex (&modelview_matrix, &projection_matrix, vertex_tl); cogl_matrix_multiply (&modelview_projection,
project_vertex (&modelview_matrix, &projection_matrix, vertex_tr); &projection_matrix,
project_vertex (&modelview_matrix, &projection_matrix, vertex_bl); &modelview_matrix);
project_vertex (&modelview_matrix, &projection_matrix, vertex_br);
project_vertex (&modelview_projection, vertex_tl);
project_vertex (&modelview_projection, vertex_tr);
project_vertex (&modelview_projection, vertex_bl);
project_vertex (&modelview_projection, vertex_br);
/* Calculate the signed area of the polygon formed by the four /* Calculate the signed area of the polygon formed by the four
vertices so that we can know its orientation */ vertices so that we can know its orientation */