Cleanup: Simplify logic, follow style guide for integer types

- Use `int` instead of `unsigned int` for mesh indices
- Use C++ types (Array, float3, IndexRange)
- Use range based for loops

7 files changed, 98 insertions, 105 deletions

diff --git a/intern/openvdb/intern/openvdb_level_set.cc b/intern/openvdb/intern/openvdb_level_set.cc
index ed0020a66ce..5b01c3b0cb7 100644
--- a/intern/openvdb/intern/openvdb_level_set.cc
+++ b/intern/openvdb/intern/openvdb_level_set.cc
@@ -33,20 +33,20 @@ OpenVDBLevelSet::~OpenVDBLevelSet()
 }
 
 void OpenVDBLevelSet::mesh_to_level_set(const float *vertices,
-                                        const unsigned int *faces,
-                                        const unsigned int totvertices,
-                                        const unsigned int totfaces,
+                                        const int *faces,
+                                        const int totvertices,
+                                        const int totfaces,
                                         const openvdb::math::Transform::Ptr &xform)
 {
   std::vector<openvdb::Vec3s> points(totvertices);
   std::vector<openvdb::Vec3I> triangles(totfaces);
   std::vector<openvdb::Vec4I> quads;
 
-  for (unsigned int i = 0; i < totvertices; i++) {
+  for (int i = 0; i < totvertices; i++) {
     points[i] = openvdb::Vec3s(vertices[i * 3], vertices[i * 3 + 1], vertices[i * 3 + 2]);
   }
 
-  for (unsigned int i = 0; i < totfaces; i++) {
+  for (int i = 0; i < totfaces; i++) {
     triangles[i] = openvdb::Vec3I(faces[i * 3], faces[i * 3 + 1], faces[i * 3 + 2]);
   }
 
@@ -69,14 +69,11 @@ void OpenVDBLevelSet::volume_to_mesh(OpenVDBVolumeToMeshData *mesh,
                                                    isovalue,
                                                    adaptivity,
                                                    relax_disoriented_triangles);
-  mesh->vertices = (float *)MEM_malloc_arrayN(
-      out_points.size(), 3 * sizeof(float), "openvdb remesher out verts");
-  mesh->quads = (unsigned int *)MEM_malloc_arrayN(
-      out_quads.size(), 4 * sizeof(unsigned int), "openvdb remesh out quads");
+  mesh->vertices = (float *)MEM_malloc_arrayN(out_points.size(), sizeof(float[3]), __func__);
+  mesh->quads = (int *)MEM_malloc_arrayN(out_quads.size(), sizeof(int[4]), __func__);
   mesh->triangles = NULL;
   if (out_tris.size() > 0) {
-    mesh->triangles = (unsigned int *)MEM_malloc_arrayN(
-        out_tris.size(), 3 * sizeof(unsigned int), "openvdb remesh out tris");
+    mesh->triangles = (int *)MEM_malloc_arrayN(out_tris.size(), sizeof(int[3]), __func__);
   }
 
   mesh->totvertices = out_points.size();
diff --git a/intern/openvdb/intern/openvdb_level_set.h b/intern/openvdb/intern/openvdb_level_set.h
index 882958513fd..2c8f140c012 100644
--- a/intern/openvdb/intern/openvdb_level_set.h
+++ b/intern/openvdb/intern/openvdb_level_set.h
@@ -39,9 +39,9 @@ struct OpenVDBLevelSet {
   void set_grid(const openvdb::FloatGrid::Ptr &grid);
 
   void mesh_to_level_set(const float *vertices,
-                         const unsigned int *faces,
-                         const unsigned int totvertices,
-                         const unsigned int totfaces,
+                         const int *faces,
+                         const int totvertices,
+                         const int totfaces,
                          const openvdb::math::Transform::Ptr &transform);
 
   void volume_to_mesh(struct OpenVDBVolumeToMeshData *mesh,
diff --git a/intern/openvdb/openvdb_capi.cc b/intern/openvdb/openvdb_capi.cc
index e7a4bf335fc..674b394fa46 100644
--- a/intern/openvdb/openvdb_capi.cc
+++ b/intern/openvdb/openvdb_capi.cc
@@ -63,9 +63,9 @@ void OpenVDBLevelSet_free(OpenVDBLevelSet *level_set)
 
 void OpenVDBLevelSet_mesh_to_level_set(struct OpenVDBLevelSet *level_set,
                                        const float *vertices,
-                                       const unsigned int *faces,
-                                       const unsigned int totvertices,
-                                       const unsigned int totfaces,
+                                       const int *faces,
+                                       const int totvertices,
+                                       const int totfaces,
                                        OpenVDBTransform *xform)
 {
   level_set->mesh_to_level_set(vertices, faces, totvertices, totfaces, xform->get_transform());
@@ -73,9 +73,9 @@ void OpenVDBLevelSet_mesh_to_level_set(struct OpenVDBLevelSet *level_set,
 
 void OpenVDBLevelSet_mesh_to_level_set_transform(struct OpenVDBLevelSet *level_set,
                                                  const float *vertices,
-                                                 const unsigned int *faces,
-                                                 const unsigned int totvertices,
-                                                 const unsigned int totfaces,
+                                                 const int *faces,
+                                                 const int totvertices,
+                                                 const int totfaces,
                                                  OpenVDBTransform *transform)
 {
   level_set->mesh_to_level_set(vertices, faces, totvertices, totfaces, transform->get_transform());
diff --git a/intern/openvdb/openvdb_capi.h b/intern/openvdb/openvdb_capi.h
index 98d89c340bf..9333413c2fe 100644
--- a/intern/openvdb/openvdb_capi.h
+++ b/intern/openvdb/openvdb_capi.h
@@ -67,19 +67,19 @@ struct OpenVDBVolumeToMeshData {
   int totvertices;
 
   float *vertices;
-  unsigned int *quads;
-  unsigned int *triangles;
+  int *quads;
+  int *triangles;
 };
 
 struct OpenVDBRemeshData {
   float *verts;
-  unsigned int *faces;
+  int *faces;
   int totfaces;
   int totverts;
 
   float *out_verts;
-  unsigned int *out_faces;
-  unsigned int *out_tris;
+  int *out_faces;
+  int *out_tris;
   int out_totverts;
   int out_totfaces;
   int out_tottris;
@@ -112,15 +112,15 @@ struct OpenVDBLevelSet *OpenVDBLevelSet_create(bool initGrid, struct OpenVDBTran
 void OpenVDBLevelSet_free(struct OpenVDBLevelSet *level_set);
 void OpenVDBLevelSet_mesh_to_level_set(struct OpenVDBLevelSet *level_set,
                                        const float *vertices,
-                                       const unsigned int *faces,
-                                       const unsigned int totvertices,
-                                       const unsigned int totfaces,
+                                       const int *faces,
+                                       const int totvertices,
+                                       const int totfaces,
                                        struct OpenVDBTransform *xform);
 void OpenVDBLevelSet_mesh_to_level_set_transform(struct OpenVDBLevelSet *level_set,
                                                  const float *vertices,
-                                                 const unsigned int *faces,
-                                                 const unsigned int totvertices,
-                                                 const unsigned int totfaces,
+                                                 const int *faces,
+                                                 const int totvertices,
+                                                 const int totfaces,
                                                  struct OpenVDBTransform *transform);
 void OpenVDBLevelSet_volume_to_mesh(struct OpenVDBLevelSet *level_set,
                                     struct OpenVDBVolumeToMeshData *mesh,
diff --git a/intern/quadriflow/quadriflow_capi.cpp b/intern/quadriflow/quadriflow_capi.cpp
index 53237289874..086d5f7d296 100644
--- a/intern/quadriflow/quadriflow_capi.cpp
+++ b/intern/quadriflow/quadriflow_capi.cpp
@@ -20,12 +20,12 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "quadriflow_capi.hpp"
 #include "config.hpp"
 #include "field-math.hpp"
+#include "loader.hpp"
 #include "optimizer.hpp"
 #include "parametrizer.hpp"
-#include "loader.hpp"
+#include "quadriflow_capi.hpp"
 
 using namespace qflow;
 
@@ -217,10 +217,8 @@ void QFLOW_quadriflow_remesh(QuadriflowRemeshData *qrd,
   qrd->out_totverts = field.O_compact.size();
   qrd->out_totfaces = field.F_compact.size();
 
-  qrd->out_verts = (float *)MEM_malloc_arrayN(
-      qrd->out_totverts, 3 * sizeof(float), "quadriflow remesher out verts");
-  qrd->out_faces = (unsigned int *)MEM_malloc_arrayN(
-      qrd->out_totfaces, 4 * sizeof(unsigned int), "quadriflow remesh out quads");
+  qrd->out_verts = (float *)MEM_malloc_arrayN(qrd->out_totverts, sizeof(float[3]), __func__);
+  qrd->out_faces = (int *)MEM_malloc_arrayN(qrd->out_totfaces, sizeof(int[4]), __func__);
 
   for (int i = 0; i < qrd->out_totverts; i++) {
     auto t = field.O_compact[i] * field.normalize_scale + field.normalize_offset;
diff --git a/intern/quadriflow/quadriflow_capi.hpp b/intern/quadriflow/quadriflow_capi.hpp
index c31fd6eff95..59af2826e15 100644
--- a/intern/quadriflow/quadriflow_capi.hpp
+++ b/intern/quadriflow/quadriflow_capi.hpp
@@ -25,12 +25,12 @@ extern "C" {
 
 typedef struct QuadriflowRemeshData {
   float *verts;
-  unsigned int *faces;
+  int *faces;
   int totfaces;
   int totverts;
 
   float *out_verts;
-  unsigned int *out_faces;
+  int *out_faces;
   int out_totverts;
   int out_totfaces;
 
diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
index 5c5d86d3e34..059094090f2 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc
@@ -30,7 +30,10 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_array.hh"
 #include "BLI_blenlib.h"
+#include "BLI_float3.hh"
+#include "BLI_index_range.hh"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
@@ -56,6 +59,10 @@
 #  include "quadriflow_capi.hpp"
 #endif
 
+using blender::Array;
+using blender::float3;
+using blender::IndexRange;
+
 #ifdef WITH_OPENVDB
 struct OpenVDBLevelSet *BKE_mesh_remesh_voxel_ovdb_mesh_to_level_set_create(
     Mesh *mesh, struct OpenVDBTransform *transform)
@@ -67,30 +74,26 @@ struct OpenVDBLevelSet *BKE_mesh_remesh_voxel_ovdb_mesh_to_level_set_create(
   BKE_mesh_runtime_verttri_from_looptri(
       verttri, mesh->mloop, looptri, BKE_mesh_runtime_looptri_len(mesh));
 
-  uint totfaces = BKE_mesh_runtime_looptri_len(mesh);
-  uint totverts = mesh->totvert;
-  float *verts = (float *)MEM_malloc_arrayN(totverts * 3, sizeof(float), "remesh_input_verts");
-  uint *faces = (uint *)MEM_malloc_arrayN(totfaces * 3, sizeof(uint), "remesh_input_faces");
+  const int totfaces = BKE_mesh_runtime_looptri_len(mesh);
+  const int totverts = mesh->totvert;
+  Array<float3> verts(totverts);
+  Array<int> faces(totfaces * 3);
 
-  for (uint i = 0; i < totverts; i++) {
-    MVert *mvert = &mesh->mvert[i];
-    verts[i * 3] = mvert->co[0];
-    verts[i * 3 + 1] = mvert->co[1];
-    verts[i * 3 + 2] = mvert->co[2];
+  for (const int i : IndexRange(totverts)) {
+    verts[i] = mesh->mvert[i].co;
   }
 
-  for (uint i = 0; i < totfaces; i++) {
-    MVertTri *vt = &verttri[i];
-    faces[i * 3] = vt->tri[0];
-    faces[i * 3 + 1] = vt->tri[1];
-    faces[i * 3 + 2] = vt->tri[2];
+  for (const int i : IndexRange(totfaces)) {
+    MVertTri &vt = verttri[i];
+    faces[i * 3] = vt.tri[0];
+    faces[i * 3 + 1] = vt.tri[1];
+    faces[i * 3 + 2] = vt.tri[2];
   }
 
   struct OpenVDBLevelSet *level_set = OpenVDBLevelSet_create(false, nullptr);
-  OpenVDBLevelSet_mesh_to_level_set(level_set, verts, faces, totverts, totfaces, transform);
+  OpenVDBLevelSet_mesh_to_level_set(
+      level_set, (const float *)verts.data(), faces.data(), totverts, totfaces, transform);
 
-  MEM_freeN(verts);
-  MEM_freeN(faces);
   MEM_freeN(verttri);
 
   return level_set;
@@ -111,29 +114,31 @@ Mesh *BKE_mesh_remesh_voxel_ovdb_volume_to_mesh_nomain(struct OpenVDBLevelSet *l
                                    (output_mesh.totquads * 4) + (output_mesh.tottriangles * 3),
                                    output_mesh.totquads + output_mesh.tottriangles);
 
-  for (int i = 0; i < output_mesh.totvertices; i++) {
+  for (const int i : IndexRange(output_mesh.totvertices)) {
     copy_v3_v3(mesh->mvert[i].co, &output_mesh.vertices[i * 3]);
   }
 
-  MPoly *mp = mesh->mpoly;
-  MLoop *ml = mesh->mloop;
-  for (int i = 0; i < output_mesh.totquads; i++, mp++, ml += 4) {
-    mp->loopstart = (int)(ml - mesh->mloop);
-    mp->totloop = 4;
-
-    ml[0].v = output_mesh.quads[i * 4 + 3];
-    ml[1].v = output_mesh.quads[i * 4 + 2];
-    ml[2].v = output_mesh.quads[i * 4 + 1];
-    ml[3].v = output_mesh.quads[i * 4];
+  for (const int i : IndexRange(output_mesh.totquads)) {
+    MPoly &poly = mesh->mpoly[i];
+    const int loopstart = i * 4;
+    poly.loopstart = loopstart;
+    poly.totloop = 4;
+    mesh->mloop[loopstart].v = output_mesh.quads[loopstart];
+    mesh->mloop[loopstart + 1].v = output_mesh.quads[loopstart + 1];
+    mesh->mloop[loopstart + 2].v = output_mesh.quads[loopstart + 2];
+    mesh->mloop[loopstart + 3].v = output_mesh.quads[loopstart + 3];
   }
 
-  for (int i = 0; i < output_mesh.tottriangles; i++, mp++, ml += 3) {
-    mp->loopstart = (int)(ml - mesh->mloop);
-    mp->totloop = 3;
-
-    ml[0].v = output_mesh.triangles[i * 3 + 2];
-    ml[1].v = output_mesh.triangles[i * 3 + 1];
-    ml[2].v = output_mesh.triangles[i * 3];
+  const int triangle_poly_start = output_mesh.totquads;
+  const int triangle_loop_start = output_mesh.totquads * 4;
+  for (const int i : IndexRange(output_mesh.tottriangles)) {
+    MPoly &poly = mesh->mpoly[triangle_poly_start + i];
+    const int loopstart = triangle_loop_start + i * 3;
+    poly.loopstart = loopstart;
+    poly.totloop = 3;
+    mesh->mloop[loopstart].v = output_mesh.triangles[i * 3 + 2];
+    mesh->mloop[loopstart + 1].v = output_mesh.triangles[i * 3 + 1];
+    mesh->mloop[loopstart + 2].v = output_mesh.triangles[i * 3];
   }
 
   BKE_mesh_calc_edges(mesh, false, false);
@@ -170,23 +175,20 @@ static Mesh *BKE_mesh_remesh_quadriflow(Mesh *input_mesh,
   BKE_mesh_runtime_verttri_from_looptri(
       verttri, input_mesh->mloop, looptri, BKE_mesh_runtime_looptri_len(input_mesh));
 
-  uint totfaces = BKE_mesh_runtime_looptri_len(input_mesh);
-  uint totverts = input_mesh->totvert;
-  float *verts = (float *)MEM_malloc_arrayN(totverts * 3, sizeof(float), "remesh_input_verts");
-  uint *faces = (uint *)MEM_malloc_arrayN(totfaces * 3, sizeof(uint), "remesh_input_faces");
+  const int totfaces = BKE_mesh_runtime_looptri_len(input_mesh);
+  const int totverts = input_mesh->totvert;
+  Array<float3> verts(totverts);
+  Array<int> faces(totfaces * 3);
 
-  for (uint i = 0; i < totverts; i++) {
-    MVert *mvert = &input_mesh->mvert[i];
-    verts[i * 3] = mvert->co[0];
-    verts[i * 3 + 1] = mvert->co[1];
-    verts[i * 3 + 2] = mvert->co[2];
+  for (const int i : IndexRange(totverts)) {
+    verts[i] = input_mesh->mvert[i].co;
   }
 
-  for (uint i = 0; i < totfaces; i++) {
-    MVertTri *vt = &verttri[i];
-    faces[i * 3] = vt->tri[0];
-    faces[i * 3 + 1] = vt->tri[1];
-    faces[i * 3 + 2] = vt->tri[2];
+  for (const int i : IndexRange(totfaces)) {
+    MVertTri &vt = verttri[i];
+    faces[i * 3] = vt.tri[0];
+    faces[i * 3 + 1] = vt.tri[1];
+    faces[i * 3 + 2] = vt.tri[2];
   }
 
   /* Fill out the required input data */
@@ -194,8 +196,8 @@ static Mesh *BKE_mesh_remesh_quadriflow(Mesh *input_mesh,
 
   qrd.totfaces = totfaces;
   qrd.totverts = totverts;
-  qrd.verts = verts;
-  qrd.faces = faces;
+  qrd.verts = (float *)verts.data();
+  qrd.faces = faces.data();
   qrd.target_faces = target_faces;
 
   qrd.preserve_sharp = preserve_sharp;
@@ -210,8 +212,6 @@ static Mesh *BKE_mesh_remesh_quadriflow(Mesh *input_mesh,
   /* Run the remesher */
   QFLOW_quadriflow_remesh(&qrd, update_cb, update_cb_data);
 
-  MEM_freeN(verts);
-  MEM_freeN(faces);
   MEM_freeN(verttri);
 
   if (qrd.out_faces == nullptr) {
@@ -227,23 +227,21 @@ static Mesh *BKE_mesh_remesh_quadriflow(Mesh *input_mesh,
   }
 
   /* Construct the new output mesh */
-  Mesh *mesh = BKE_mesh_new_nomain(
-      qrd.out_totverts, 0, 0, (qrd.out_totfaces * 4), qrd.out_totfaces);
+  Mesh *mesh = BKE_mesh_new_nomain(qrd.out_totverts, 0, 0, qrd.out_totfaces * 4, qrd.out_totfaces);
 
-  for (int i = 0; i < qrd.out_totverts; i++) {
+  for (const int i : IndexRange(qrd.out_totverts)) {
     copy_v3_v3(mesh->mvert[i].co, &qrd.out_verts[i * 3]);
   }
 
-  MPoly *mp = mesh->mpoly;
-  MLoop *ml = mesh->mloop;
-  for (int i = 0; i < qrd.out_totfaces; i++, mp++, ml += 4) {
-    mp->loopstart = (int)(ml - mesh->mloop);
-    mp->totloop = 4;
-
-    ml[0].v = qrd.out_faces[i * 4];
-    ml[1].v = qrd.out_faces[i * 4 + 1];
-    ml[2].v = qrd.out_faces[i * 4 + 2];
-    ml[3].v = qrd.out_faces[i * 4 + 3];
+  for (const int i : IndexRange(qrd.out_totfaces)) {
+    MPoly &poly = mesh->mpoly[i];
+    const int loopstart = i * 4;
+    poly.loopstart = loopstart;
+    poly.totloop = 4;
+    mesh->mloop[loopstart].v = qrd.out_faces[loopstart];
+    mesh->mloop[loopstart + 1].v = qrd.out_faces[loopstart + 1];
+    mesh->mloop[loopstart + 2].v = qrd.out_faces[loopstart + 2];
+    mesh->mloop[loopstart + 3].v = qrd.out_faces[loopstart + 3];
   }
 
   BKE_mesh_calc_edges(mesh, false, false);