Cleanup: Simplify aspect ratio usage in uv unwrapper

Replace `aspx` and `aspy` with `aspect_y`.

No functional changes.

source/blender/editors/uvedit/uvedit_unwrap_ops.cc

@@ -439,13 +439,7 @@ static ParamHandle *construct_param_handle(const Scene *scene,
   ParamHandle *handle = blender::geometry::uv_parametrizer_construct_begin();
 
   if (options->correct_aspect) {
-    float aspx, aspy;
+    blender::geometry::uv_parametrizer_aspect_ratio(handle, ED_uvedit_get_aspect_y(ob));
-
-    ED_uvedit_get_aspect(ob, &aspx, &aspy);
-
-    if (aspx != aspy) {
-      blender::geometry::uv_parametrizer_aspect_ratio(handle, aspx, aspy);
-    }
   }
 
   /* we need the vert indices */
@@ -488,12 +482,7 @@ static ParamHandle *construct_param_handle_multi(const Scene *scene,
 
   if (options->correct_aspect) {
     Object *ob = objects[0];
-    float aspx, aspy;
+    blender::geometry::uv_parametrizer_aspect_ratio(handle, ED_uvedit_get_aspect_y(ob));
-
-    ED_uvedit_get_aspect(ob, &aspx, &aspy);
-    if (aspx != aspy) {
-      blender::geometry::uv_parametrizer_aspect_ratio(handle, aspx, aspy);
-    }
   }
 
   /* we need the vert indices */
@@ -616,13 +605,7 @@ static ParamHandle *construct_param_handle_subsurfed(const Scene *scene,
   ParamHandle *handle = blender::geometry::uv_parametrizer_construct_begin();
 
   if (options->correct_aspect) {
-    float aspx, aspy;
+    blender::geometry::uv_parametrizer_aspect_ratio(handle, ED_uvedit_get_aspect_y(ob));
-
-    ED_uvedit_get_aspect(ob, &aspx, &aspy);
-
-    if (aspx != aspy) {
-      blender::geometry::uv_parametrizer_aspect_ratio(handle, aspx, aspy);
-    }
   }
 
   /* number of subdivisions to perform */

source/blender/geometry/GEO_uv_parametrizer.hh

@@ -10,7 +10,7 @@
 
 namespace blender::geometry {
 
-struct ParamHandle;         /* Handle to an array of charts. */
+class ParamHandle;          /* A collection of charts. */
 using ParamKey = uintptr_t; /* Key (hash) for identifying verts and faces. */
 #define PARAM_KEY_MAX UINTPTR_MAX
 
@@ -31,7 +31,7 @@ using ParamKey = uintptr_t; /* Key (hash) for identifying verts and faces. */
 
 ParamHandle *uv_parametrizer_construct_begin();
 
-void uv_parametrizer_aspect_ratio(ParamHandle *handle, float aspx, float aspy);
+void uv_parametrizer_aspect_ratio(ParamHandle *handle, float aspect_y);
 
 void uv_prepare_pin_index(ParamHandle *handle, const int bmvertindex, const float uv[2]);
 
@@ -102,14 +102,6 @@ void uv_parametrizer_average(ParamHandle *handle, bool ignore_pinned, bool scale
 
 /** \} */
 
-/* -------------------------------------------------------------------- */
-/** \name Simple x,y scale
- * \{ */
-
-void uv_parametrizer_scale(ParamHandle *handle, float x, float y);
-
-/** \} */
-
 /* -------------------------------------------------------------------- */
 /** \name Flushing
  * \{ */

source/blender/geometry/intern/uv_parametrizer.cc

@@ -161,7 +161,8 @@ enum PHandleState {
   PHANDLE_STATE_STRETCH,
 };
 
-struct ParamHandle {
+class ParamHandle {
+ public:
   enum PHandleState state;
   MemArena *arena;
   MemArena *polyfill_arena;
@@ -178,7 +179,7 @@ struct ParamHandle {
   PChart **charts;
   int ncharts;
 
-  float aspx, aspy;
+  float aspect_y;
 
   RNG *rng;
   float blend;
@@ -425,19 +426,29 @@ static float p_chart_uv_area(PChart *chart)
   return area;
 }
 
-static void p_chart_uv_scale(PChart *chart, float scale)
+static void p_chart_uv_scale(PChart *chart, const float scale)
 {
+  if (scale == 1.0f) {
+    return; /* Identity transform. */
+  }
+
   for (PVert *v = chart->verts; v; v = v->nextlink) {
     v->uv[0] *= scale;
     v->uv[1] *= scale;
   }
 }
 
-static void p_chart_uv_scale_xy(PChart *chart, float x, float y)
+static void uv_parametrizer_scale_x(ParamHandle *phandle, const float scale_x)
 {
-  for (PVert *v = chart->verts; v; v = v->nextlink) {
+  if (scale_x == 1.0f) {
-    v->uv[0] *= x;
+    return; /* Identity transform. */
-    v->uv[1] *= y;
+  }
+
+  for (int i = 0; i < phandle->ncharts; i++) {
+    PChart *chart = phandle->charts[i];
+    for (PVert *v = chart->verts; v; v = v->nextlink) {
+      v->uv[0] *= scale_x;
+    }
   }
 }
 
@@ -582,13 +593,13 @@ static void p_vert_load_pin_select_uvs(ParamHandle *handle, PVert *v)
       }
 
       if (e->flag & PEDGE_PIN) {
-        pinuv[0] += e->orig_uv[0] * handle->aspx;
+        pinuv[0] += e->orig_uv[0] * handle->aspect_y;
-        pinuv[1] += e->orig_uv[1] * handle->aspy;
+        pinuv[1] += e->orig_uv[1];
         npins++;
       }
       else {
-        v->uv[0] += e->orig_uv[0] * handle->aspx;
+        v->uv[0] += e->orig_uv[0] * handle->aspect_y;
-        v->uv[1] += e->orig_uv[1] * handle->aspy;
+        v->uv[1] += e->orig_uv[1];
       }
 
       nedges++;
@@ -614,14 +625,8 @@ static void p_flush_uvs(ParamHandle *handle, PChart *chart)
   const float invblend = 1.0f - blend;
   for (PEdge *e = chart->edges; e; e = e->nextlink) {
     if (e->orig_uv) {
-      if (blend) {
+      e->orig_uv[0] = blend * e->old_uv[0] + invblend * e->vert->uv[0] / handle->aspect_y;
-        e->orig_uv[0] = blend * e->old_uv[0] + invblend * e->vert->uv[0] / handle->aspx;
+      e->orig_uv[1] = blend * e->old_uv[1] + invblend * e->vert->uv[1];
-        e->orig_uv[1] = blend * e->old_uv[1] + invblend * e->vert->uv[1] / handle->aspy;
-      }
-      else {
-        e->orig_uv[0] = e->vert->uv[0] / handle->aspx;
-        e->orig_uv[1] = e->vert->uv[1] / handle->aspy;
-      }
     }
   }
 }
@@ -3659,8 +3664,7 @@ ParamHandle *uv_parametrizer_construct_begin()
   handle->arena = BLI_memarena_new(MEM_SIZE_OPTIMAL(1 << 16), "param construct arena");
   handle->polyfill_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, "param polyfill arena");
   handle->polyfill_heap = BLI_heap_new_ex(BLI_POLYFILL_ALLOC_NGON_RESERVE);
-  handle->aspx = 1.0f;
+  handle->aspect_y = 1.0f;
-  handle->aspy = 1.0f;
 
   handle->hash_verts = phash_new((PHashLink **)&handle->construction_chart->verts, 1);
   handle->hash_edges = phash_new((PHashLink **)&handle->construction_chart->edges, 1);
@@ -3669,10 +3673,10 @@ ParamHandle *uv_parametrizer_construct_begin()
   return handle;
 }
 
-void uv_parametrizer_aspect_ratio(ParamHandle *phandle, float aspx, float aspy)
+void uv_parametrizer_aspect_ratio(ParamHandle *phandle, const float aspect_y)
 {
-  phandle->aspx = aspx;
+  BLI_assert(aspect_y > 0.0f);
-  phandle->aspy = aspy;
+  phandle->aspect_y = aspect_y;
 }
 
 void uv_parametrizer_delete(ParamHandle *phandle)
@@ -4148,9 +4152,7 @@ void uv_parametrizer_pack(ParamHandle *handle, float margin, bool do_rotate, boo
     GEO_uv_parametrizer_pack_rotate(handle, ignore_pinned);
   }
 
-  if (handle->aspx != handle->aspy) {
+  uv_parametrizer_scale_x(handle, 1.0f / handle->aspect_y);
-    uv_parametrizer_scale(handle, 1.0f / handle->aspx, 1.0f / handle->aspy);
-  }
   Vector<PackIsland *> pack_island_vector;
   int unpacked = 0;
   for (int i = 0; i < handle->ncharts; i++) {
@@ -4163,7 +4165,7 @@ void uv_parametrizer_pack(ParamHandle *handle, float margin, bool do_rotate, boo
 
     geometry::PackIsland *pack_island = new geometry::PackIsland();
     pack_island->caller_index = i;
-    pack_island->aspect_y = handle->aspx / handle->aspy;
+    pack_island->aspect_y = handle->aspect_y;
     pack_island->angle = 0.0f;
     pack_island_vector.append(pack_island);
 
@@ -4206,9 +4208,7 @@ void uv_parametrizer_pack(ParamHandle *handle, float margin, bool do_rotate, boo
     delete pack_island;
   }
 
-  if (handle->aspx != handle->aspy) {
+  uv_parametrizer_scale_x(handle, handle->aspect_y);
-    uv_parametrizer_scale(handle, handle->aspx, handle->aspy);
-  }
 }
 
 void uv_parametrizer_average(ParamHandle *phandle, bool ignore_pinned, bool scale_uv, bool shear)
@@ -4351,17 +4351,6 @@ void uv_parametrizer_average(ParamHandle *phandle, bool ignore_pinned, bool scal
   }
 }
 
-void uv_parametrizer_scale(ParamHandle *phandle, float x, float y)
-{
-  PChart *chart;
-  int i;
-
-  for (i = 0; i < phandle->ncharts; i++) {
-    chart = phandle->charts[i];
-    p_chart_uv_scale_xy(chart, x, y);
-  }
-}
-
 void uv_parametrizer_flush(ParamHandle *phandle)
 {
   PChart *chart;