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. --- .../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 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) (limited to 'source/blender/nodes/geometry') 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); } -- cgit v1.2.3