From 6a60214e8c7f6d49f970e0a3293befe6a6a2870c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Sep 2021 09:42:20 -0400 Subject: gsk: Handle 2D transforms better For 2D transforms, we can read the scale factors more directly off the matrix. This should eventually be moved out into a function to decompose a 2D transform into scale + rotation + skew + translation. --- gsk/ngl/gsknglrenderjob.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gsk') diff --git a/gsk/ngl/gsknglrenderjob.c b/gsk/ngl/gsknglrenderjob.c index 4cccd89ba5..baf87f6461 100644 --- a/gsk/ngl/gsknglrenderjob.c +++ b/gsk/ngl/gsknglrenderjob.c @@ -453,10 +453,21 @@ extract_matrix_metadata (GskNglRenderModelview *modelview) &modelview->dx, &modelview->dy); break; + case GSK_TRANSFORM_CATEGORY_2D: + { + float xx, xy, yx, yy, dx, dy; + + gsk_transform_to_2d (modelview->transform, + &xx, &xy, &yx, &yy, &dx, &dy); + + modelview->scale_x = sqrtf (xx * xx + xy * xy); + modelview->scale_y = sqrtf (yx * yx + yy * yy); + } + break; + case GSK_TRANSFORM_CATEGORY_UNKNOWN: case GSK_TRANSFORM_CATEGORY_ANY: case GSK_TRANSFORM_CATEGORY_3D: - case GSK_TRANSFORM_CATEGORY_2D: { graphene_vec3_t col1; graphene_vec3_t col2; -- cgit v1.2.1