From 3cf11f77b36947ee0bfef40181baa5287475511d Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Mon, 23 Nov 2020 13:00:06 -0300
Subject: [PATCH] clutter/pick-stack: Move triangle check to else block

Just to improve the legibility of this part of the code. We
go either through box, or triangle, but never both.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1599>
---
 clutter/clutter/clutter-pick-stack.c | 55 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/clutter/clutter/clutter-pick-stack.c b/clutter/clutter/clutter-pick-stack.c
index 71d679833..5a2260a8e 100644
--- a/clutter/clutter/clutter-pick-stack.c
+++ b/clutter/clutter/clutter-pick-stack.c
@@ -120,8 +120,6 @@ ray_intersects_input_region (Record                   *rec,
                              const graphene_ray_t     *ray,
                              const graphene_point3d_t *point)
 {
-  graphene_triangle_t t0, t1;
-
   maybe_project_record (rec);
 
   if (G_LIKELY (is_axis_aligned_2d_rectangle (rec->vertices)))
@@ -132,36 +130,37 @@ ray_intersects_input_region (Record                   *rec,
       return graphene_box_contains_point (&box, point) ||
              graphene_ray_intersects_box (ray, &box);
     }
+  else
+    {
+      graphene_triangle_t t0, t1;
 
-  /*
-   * Degrade the projected quad into the following triangles:
-   *
-   * 0 -------------- 1
-   * |  •             |
-   * |     •     t0   |
-   * |        •       |
-   * |   t1      •    |
-   * |              • |
-   * 3 -------------- 2
-   */
+      /*
+       * Degrade the projected quad into the following triangles:
+       *
+       * 0 -------------- 1
+       * |  •             |
+       * |     •     t0   |
+       * |        •       |
+       * |   t1      •    |
+       * |              • |
+       * 3 -------------- 2
+       */
 
-  graphene_triangle_init_from_point3d (&t0,
-                                       &rec->vertices[0],
-                                       &rec->vertices[1],
-                                       &rec->vertices[2]);
+      graphene_triangle_init_from_point3d (&t0,
+                                           &rec->vertices[0],
+                                           &rec->vertices[1],
+                                           &rec->vertices[2]);
 
-  graphene_triangle_init_from_point3d (&t1,
-                                       &rec->vertices[0],
-                                       &rec->vertices[2],
-                                       &rec->vertices[3]);
+      graphene_triangle_init_from_point3d (&t1,
+                                           &rec->vertices[0],
+                                           &rec->vertices[2],
+                                           &rec->vertices[3]);
 
-  if (graphene_triangle_contains_point (&t0, point) ||
-      graphene_triangle_contains_point (&t1, point) ||
-      graphene_ray_intersects_triangle (ray, &t0) ||
-      graphene_ray_intersects_triangle (ray, &t1))
-    return TRUE;
-
-  return FALSE;
+      return graphene_triangle_contains_point (&t0, point) ||
+             graphene_triangle_contains_point (&t1, point) ||
+             graphene_ray_intersects_triangle (ray, &t0) ||
+             graphene_ray_intersects_triangle (ray, &t1);
+    }
 }
 
 static gboolean