diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-10-07 01:34:53 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-10-07 01:35:02 +0300 |
| commit | b04b87b32244fe1aa00878ca596b3c763dc7297b (patch) | |
| tree | 4b9f398f204c70b478dc62d41369ed1ac9ce7916 /source/blender/blenkernel | |
| parent | 79b1e267ef9ab21afccd4a569d83ae2b8c9d4654 (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_mesh_mapping.h | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_fair.cc | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_mapping.cc | 4 |
3 files changed, 7 insertions, 7 deletions
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<int> build_corner_to_poly_map(Span<MPoly> polys, int loops_num); +Array<int> build_loop_to_poly_map(Span<MPoly> polys, int loops_num); Array<Vector<int>> build_vert_to_edge_map(Span<MEdge> edges, int verts_num); -Array<Vector<int>> build_vert_to_corner_map(Span<MLoop> loops, int verts_num); +Array<Vector<int>> build_vert_to_loop_map(Span<MLoop> 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<int> build_corner_to_poly_map(const Span<MPoly> polys, const int loops_num) +Array<int> build_loop_to_poly_map(const Span<MPoly> polys, const int loops_num) { Array<int> map(loops_num); threading::parallel_for(polys.index_range(), 1024, [&](IndexRange range) { @@ -577,7 +577,7 @@ Array<Vector<int>> build_vert_to_edge_map(const Span<MEdge> edges, const int ver return map; } -Array<Vector<int>> build_vert_to_corner_map(const Span<MLoop> loops, const int verts_num) +Array<Vector<int>> build_vert_to_loop_map(const Span<MLoop> loops, const int verts_num) { Array<Vector<int>> map(verts_num); for (const int64_t i : loops.index_range()) { |