From b04b87b32244fe1aa00878ca596b3c763dc7297b Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 6 Oct 2022 17:34:53 -0500 Subject: Cleanup: Avoid inconsistent naming in mesh topology API Mesh corners are called "loops" in the code currently. Avoid diverging naming and just use that convention in some newly added code. --- source/blender/blenkernel/BKE_mesh_mapping.h | 8 ++++---- source/blender/blenkernel/intern/mesh_fair.cc | 2 +- source/blender/blenkernel/intern/mesh_mapping.cc | 4 ++-- .../geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc | 6 +++--- .../geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc | 8 ++++---- .../geometry/nodes/node_geo_mesh_topology_face_of_corner.cc | 9 ++++----- .../nodes/node_geo_mesh_topology_offset_corner_in_face.cc | 4 ++-- source/blender/render/intern/texture_margin.cc | 4 ++-- 8 files changed, 22 insertions(+), 23 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h index 350c4c4bb36..da8431d4f27 100644 --- a/source/blender/blenkernel/BKE_mesh_mapping.h +++ b/source/blender/blenkernel/BKE_mesh_mapping.h @@ -338,14 +338,14 @@ int *BKE_mesh_calc_smoothgroups(const struct MEdge *medge, #ifdef __cplusplus namespace blender::mesh_topology { -Array build_corner_to_poly_map(Span polys, int loops_num); +Array build_loop_to_poly_map(Span polys, int loops_num); Array> build_vert_to_edge_map(Span edges, int verts_num); -Array> build_vert_to_corner_map(Span loops, int verts_num); +Array> build_vert_to_loop_map(Span loops, int verts_num); -inline int previous_poly_corner(const MPoly &poly, int corner_i) +inline int previous_poly_loop(const MPoly &poly, int loop_i) { - return corner_i - 1 + (corner_i == poly.loopstart) * poly.totloop; + return loop_i - 1 + (loop_i == poly.loopstart) * poly.totloop; } } // namespace blender::mesh_topology diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index 501f01e3368..5369bc782b6 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -221,7 +221,7 @@ class MeshFairingContext : public FairingContext { } } - loop_to_poly_map_ = blender::mesh_topology::build_corner_to_poly_map(mpoly_, mloop_.size()); + loop_to_poly_map_ = blender::mesh_topology::build_loop_to_poly_map(mpoly_, mloop_.size()); } ~MeshFairingContext() override diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc index bb9f8274b72..667802d5f48 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.cc +++ b/source/blender/blenkernel/intern/mesh_mapping.cc @@ -555,7 +555,7 @@ void BKE_mesh_origindex_map_create_looptri(MeshElemMap **r_map, namespace blender::mesh_topology { -Array build_corner_to_poly_map(const Span polys, const int loops_num) +Array build_loop_to_poly_map(const Span polys, const int loops_num) { Array map(loops_num); threading::parallel_for(polys.index_range(), 1024, [&](IndexRange range) { @@ -577,7 +577,7 @@ Array> build_vert_to_edge_map(const Span edges, const int ver return map; } -Array> build_vert_to_corner_map(const Span loops, const int verts_num) +Array> build_vert_to_loop_map(const Span loops, const int verts_num) { Array> map(verts_num); for (const int64_t i : loops.index_range()) { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc index 7c80e9fdf67..f45ff826a60 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_corners_of_vertex.cc @@ -60,8 +60,8 @@ class CornersOfVertInput final : public bke::MeshFieldInput { { const IndexRange vert_range(mesh.totvert); const Span loops = mesh.loops(); - Array> vert_to_corner_map = mesh_topology::build_vert_to_corner_map(loops, - mesh.totvert); + Array> vert_to_loop_map = mesh_topology::build_vert_to_loop_map(loops, + mesh.totvert); const bke::MeshFieldContext context{mesh, domain}; fn::FieldEvaluator evaluator{context, &mask}; @@ -92,7 +92,7 @@ class CornersOfVertInput final : public bke::MeshFieldInput { continue; } - const Span corners = vert_to_corner_map[vert_i]; + const Span corners = vert_to_loop_map[vert_i]; /* Retrieve the connected edge indices as 64 bit integers for #materialize_compressed. */ corner_indices.reinitialize(corners.size()); diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc index 866db4cf1b0..c46c64448bf 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc @@ -77,13 +77,13 @@ class CornerPreviousEdgeFieldInput final : public bke::MeshFieldInput { } const Span polys = mesh.polys(); const Span loops = mesh.loops(); - Array corner_to_poly_map = mesh_topology::build_corner_to_poly_map(polys, mesh.totloop); + Array loop_to_poly_map = mesh_topology::build_loop_to_poly_map(polys, mesh.totloop); return VArray::ForFunc( mesh.totloop, - [polys, loops, corner_to_poly_map = std::move(corner_to_poly_map)](const int corner_i) { - const int poly_i = corner_to_poly_map[corner_i]; + [polys, loops, loop_to_poly_map = std::move(loop_to_poly_map)](const int corner_i) { + const int poly_i = loop_to_poly_map[corner_i]; const MPoly &poly = polys[poly_i]; - const int corner_i_prev = mesh_topology::previous_poly_corner(poly, corner_i); + const int corner_i_prev = mesh_topology::previous_poly_loop(poly, corner_i); return loops[corner_i_prev].e; }); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc index 06a69682c90..99def9e8bd1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_face_of_corner.cc @@ -36,7 +36,7 @@ class CornerFaceIndexInput final : public bke::MeshFieldInput { return {}; } return VArray::ForContainer( - mesh_topology::build_corner_to_poly_map(mesh.polys(), mesh.totloop)); + mesh_topology::build_loop_to_poly_map(mesh.polys(), mesh.totloop)); } uint64_t hash() const final @@ -65,11 +65,10 @@ class CornerIndexInFaceInput final : public bke::MeshFieldInput { return {}; } const Span polys = mesh.polys(); - Array corner_to_poly_map = mesh_topology::build_corner_to_poly_map(polys, mesh.totloop); + Array loop_to_poly_map = mesh_topology::build_loop_to_poly_map(polys, mesh.totloop); return VArray::ForFunc( - mesh.totloop, - [polys, corner_to_poly_map = std::move(corner_to_poly_map)](const int corner_i) { - const int poly_i = corner_to_poly_map[corner_i]; + mesh.totloop, [polys, loop_to_poly_map = std::move(loop_to_poly_map)](const int corner_i) { + const int poly_i = loop_to_poly_map[corner_i]; return corner_i - polys[poly_i].loopstart; }); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc index e1b3572aa75..d7ea097be94 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_offset_corner_in_face.cc @@ -52,7 +52,7 @@ class OffsetCornerInFaceFieldInput final : public bke::MeshFieldInput { const VArray corner_indices = evaluator.get_evaluated(0); const VArray offsets = evaluator.get_evaluated(1); - Array corner_to_poly_map = mesh_topology::build_corner_to_poly_map(polys, mesh.totloop); + Array loop_to_poly_map = mesh_topology::build_loop_to_poly_map(polys, mesh.totloop); Array offset_corners(mask.min_array_size()); threading::parallel_for(mask.index_range(), 2048, [&](const IndexRange range) { @@ -64,7 +64,7 @@ class OffsetCornerInFaceFieldInput final : public bke::MeshFieldInput { continue; } - const int poly_i = corner_to_poly_map[corner_i]; + const int poly_i = loop_to_poly_map[corner_i]; const IndexRange poly_range(polys[poly_i].loopstart, polys[poly_i].totloop); offset_corners[selection_i] = apply_offset_in_cyclic_range(poly_range, corner_i, offset); } diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index a69449d9386..a42ddb6b830 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -290,8 +290,8 @@ class TextureMarginMap { void build_tables() { - loop_to_poly_map_ = blender::mesh_topology::build_corner_to_poly_map({mpoly_, totpoly_}, - totloop_); + loop_to_poly_map_ = blender::mesh_topology::build_loop_to_poly_map({mpoly_, totpoly_}, + totloop_); loop_adjacency_map_.resize(totloop_, -1); -- cgit v1.2.3