[gnome-shell/gbsneto/graphene-matrix] Replace CoglMatrix by graphene_matrix_t
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/graphene-matrix] Replace CoglMatrix by graphene_matrix_t
- Date: Fri, 11 Sep 2020 23:05:33 +0000 (UTC)
commit 8eb88605ffc808d227f36f58069e1450fe7ba129
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Fri Sep 11 15:49:29 2020 -0300
Replace CoglMatrix by graphene_matrix_t
Replace both the types, and the cogl_matrix_* API calls
with the corresponding graphene_matrix_* ones.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1436
src/shell-blur-effect.c | 18 +++++++-----------
src/st/st-viewport.c | 16 ++++++----------
2 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/src/shell-blur-effect.c b/src/shell-blur-effect.c
index 1bdb4caa19..7647e1530f 100644
--- a/src/shell-blur-effect.c
+++ b/src/shell-blur-effect.c
@@ -330,17 +330,13 @@ setup_projection_matrix (CoglFramebuffer *framebuffer,
float width,
float height)
{
- CoglMatrix projection;
-
- cogl_matrix_init_identity (&projection);
- cogl_matrix_scale (&projection,
- 2.0 / width,
- -2.0 / height,
- 1.f);
- cogl_matrix_translate (&projection,
- -width / 2.0,
- -height / 2.0,
- 0);
+ graphene_matrix_t projection;
+
+ graphene_matrix_init_translate (&projection,
+ &GRAPHENE_POINT3D_INIT (-width / 2.0,
+ -height / 2.0,
+ 0.f));
+ graphene_matrix_scale (&projection, 2.0 / width, -2.0 / height, 1.f);
cogl_framebuffer_set_projection_matrix (framebuffer, &projection);
}
diff --git a/src/st/st-viewport.c b/src/st/st-viewport.c
index 0eb1868ab9..c52d141855 100644
--- a/src/st/st-viewport.c
+++ b/src/st/st-viewport.c
@@ -325,28 +325,24 @@ get_hadjustment_value (StViewport *viewport)
}
static void
-st_viewport_apply_transform (ClutterActor *actor,
- CoglMatrix *matrix)
+st_viewport_apply_transform (ClutterActor *actor,
+ graphene_matrix_t *matrix)
{
StViewport *viewport = ST_VIEWPORT (actor);
StViewportPrivate *priv = st_viewport_get_instance_private (viewport);
ClutterActorClass *parent_class =
CLUTTER_ACTOR_CLASS (st_viewport_parent_class);
- double x, y;
+ graphene_point3d_t p = GRAPHENE_POINT3D_INIT_ZERO;
parent_class->apply_transform (actor, matrix);
if (priv->hadjustment)
- x = get_hadjustment_value (viewport);
- else
- x = 0;
+ p.x = -get_hadjustment_value (viewport);
if (priv->vadjustment)
- y = st_adjustment_get_value (priv->vadjustment);
- else
- y = 0;
+ p.y = -st_adjustment_get_value (priv->vadjustment);
- cogl_matrix_translate (matrix, (int) -x, (int) -y, 0);
+ graphene_matrix_translate (matrix, &p);
}
/* If we are translated, then we need to translate back before chaining
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]