From d2c688e3819240e41602483e23625d684c60ac98 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 26 Jan 2025 20:07:59 +0100 Subject: [PATCH] Cleanup: Various clang-tidy warnings in geometry Pull Request: https://projects.blender.org/blender/blender/pulls/133734 --- source/blender/geometry/GEO_extend_curves.hh | 3 --- source/blender/geometry/GEO_fillet_curves.hh | 1 - .../geometry/GEO_interpolate_curves.hh | 3 --- .../blender/geometry/GEO_join_geometries.hh | 1 - .../geometry/GEO_mesh_copy_selection.hh | 2 +- .../geometry/GEO_mesh_primitive_cuboid.hh | 1 - .../blender/geometry/GEO_mesh_split_edges.hh | 2 +- source/blender/geometry/GEO_mesh_to_volume.hh | 2 +- source/blender/geometry/GEO_reorder.hh | 1 - .../blender/geometry/GEO_resample_curves.hh | 1 - .../geometry/GEO_reverse_uv_sampler.hh | 3 --- source/blender/geometry/GEO_set_curve_type.hh | 1 - .../blender/geometry/GEO_simplify_curves.hh | 5 ++++- .../blender/geometry/GEO_subdivide_curves.hh | 1 - source/blender/geometry/GEO_trim_curves.hh | 3 --- source/blender/geometry/GEO_uv_pack.hh | 2 -- .../blender/geometry/GEO_uv_parametrizer.hh | 2 +- .../geometry/intern/mesh_merge_by_distance.cc | 6 +++--- source/blender/geometry/intern/reorder.cc | 12 +++++------ .../geometry/intern/reverse_uv_sampler.cc | 1 + source/blender/geometry/intern/uv_pack.cc | 21 +++++++------------ .../geometry/intern/uv_parametrizer.cc | 2 +- 22 files changed, 26 insertions(+), 50 deletions(-) diff --git a/source/blender/geometry/GEO_extend_curves.hh b/source/blender/geometry/GEO_extend_curves.hh index e73012c241a..05abd3542d3 100644 --- a/source/blender/geometry/GEO_extend_curves.hh +++ b/source/blender/geometry/GEO_extend_curves.hh @@ -4,12 +4,9 @@ #pragma once -#include "BLI_span.hh" #include "DNA_node_types.h" #include "BKE_curves.hh" -#include "BKE_curves_utils.hh" -#include "BKE_geometry_set.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_fillet_curves.hh b/source/blender/geometry/GEO_fillet_curves.hh index f3631e5836e..4344985561d 100644 --- a/source/blender/geometry/GEO_fillet_curves.hh +++ b/source/blender/geometry/GEO_fillet_curves.hh @@ -4,7 +4,6 @@ #pragma once -#include "BLI_function_ref.hh" #include "BLI_index_mask.hh" #include "BKE_curves.hh" diff --git a/source/blender/geometry/GEO_interpolate_curves.hh b/source/blender/geometry/GEO_interpolate_curves.hh index 16eb37ffc6f..7c48dc0425d 100644 --- a/source/blender/geometry/GEO_interpolate_curves.hh +++ b/source/blender/geometry/GEO_interpolate_curves.hh @@ -4,9 +4,6 @@ #pragma once -#include "FN_field.hh" - -#include "BKE_attribute.hh" #include "BKE_curves.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_join_geometries.hh b/source/blender/geometry/GEO_join_geometries.hh index 4fc2396b56d..f278f3c1168 100644 --- a/source/blender/geometry/GEO_join_geometries.hh +++ b/source/blender/geometry/GEO_join_geometries.hh @@ -4,7 +4,6 @@ #pragma once -#include "BKE_anonymous_attribute_id.hh" #include "BKE_geometry_set.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_mesh_copy_selection.hh b/source/blender/geometry/GEO_mesh_copy_selection.hh index 5f27fbf872a..ec37c0a52a1 100644 --- a/source/blender/geometry/GEO_mesh_copy_selection.hh +++ b/source/blender/geometry/GEO_mesh_copy_selection.hh @@ -6,7 +6,7 @@ #include -#include "BLI_index_mask.hh" +#include "BLI_virtual_array.hh" #include "BKE_attribute_filter.hh" diff --git a/source/blender/geometry/GEO_mesh_primitive_cuboid.hh b/source/blender/geometry/GEO_mesh_primitive_cuboid.hh index b9fe24394a5..bdc3c26a67a 100644 --- a/source/blender/geometry/GEO_mesh_primitive_cuboid.hh +++ b/source/blender/geometry/GEO_mesh_primitive_cuboid.hh @@ -5,7 +5,6 @@ #pragma once #include -#include #include "BLI_math_vector_types.hh" #include "BLI_string_ref.hh" diff --git a/source/blender/geometry/GEO_mesh_split_edges.hh b/source/blender/geometry/GEO_mesh_split_edges.hh index af760d5300f..4afc86b61a5 100644 --- a/source/blender/geometry/GEO_mesh_split_edges.hh +++ b/source/blender/geometry/GEO_mesh_split_edges.hh @@ -13,7 +13,7 @@ struct Mesh; namespace blender::geometry { void split_edges(Mesh &mesh, - const IndexMask &mask, + const IndexMask &selected_edges, const bke::AttributeFilter &attribute_filter = {}); } // namespace blender::geometry diff --git a/source/blender/geometry/GEO_mesh_to_volume.hh b/source/blender/geometry/GEO_mesh_to_volume.hh index 38655fab70a..91d2fa9e39a 100644 --- a/source/blender/geometry/GEO_mesh_to_volume.hh +++ b/source/blender/geometry/GEO_mesh_to_volume.hh @@ -4,7 +4,7 @@ #pragma once -#include "BLI_bounds.hh" +#include "BLI_bounds_types.hh" #include "BLI_function_ref.hh" #include "BLI_math_matrix_types.hh" #include "BLI_math_vector_types.hh" diff --git a/source/blender/geometry/GEO_reorder.hh b/source/blender/geometry/GEO_reorder.hh index 32b58fc14c9..9aa2db8782a 100644 --- a/source/blender/geometry/GEO_reorder.hh +++ b/source/blender/geometry/GEO_reorder.hh @@ -7,7 +7,6 @@ #include "BLI_multi_value_map.hh" #include "BLI_span.hh" -#include "BKE_anonymous_attribute_id.hh" #include "BKE_attribute.hh" #include "BKE_curves.hh" #include "BKE_geometry_set.hh" diff --git a/source/blender/geometry/GEO_resample_curves.hh b/source/blender/geometry/GEO_resample_curves.hh index 349a23b6682..6199bf2bd29 100644 --- a/source/blender/geometry/GEO_resample_curves.hh +++ b/source/blender/geometry/GEO_resample_curves.hh @@ -6,7 +6,6 @@ #include "FN_field.hh" -#include "BKE_attribute.hh" #include "BKE_curves.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_reverse_uv_sampler.hh b/source/blender/geometry/GEO_reverse_uv_sampler.hh index f9a21dca41a..24b899c35c7 100644 --- a/source/blender/geometry/GEO_reverse_uv_sampler.hh +++ b/source/blender/geometry/GEO_reverse_uv_sampler.hh @@ -4,10 +4,7 @@ #pragma once -#include - #include "BLI_math_vector_types.hh" -#include "BLI_multi_value_map.hh" #include "BLI_span.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_set_curve_type.hh b/source/blender/geometry/GEO_set_curve_type.hh index 7c1c72c2672..9ae30e3c769 100644 --- a/source/blender/geometry/GEO_set_curve_type.hh +++ b/source/blender/geometry/GEO_set_curve_type.hh @@ -4,7 +4,6 @@ #pragma once -#include "BLI_function_ref.hh" #include "BLI_index_mask.hh" #include "BKE_curves.hh" diff --git a/source/blender/geometry/GEO_simplify_curves.hh b/source/blender/geometry/GEO_simplify_curves.hh index c81651267e4..1e1cb77e814 100644 --- a/source/blender/geometry/GEO_simplify_curves.hh +++ b/source/blender/geometry/GEO_simplify_curves.hh @@ -4,7 +4,10 @@ #pragma once -#include "BKE_curves.hh" +#include "BLI_generic_span.hh" +#include "BLI_index_mask.hh" +#include "BLI_math_vector_types.hh" +#include "BLI_span.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_subdivide_curves.hh b/source/blender/geometry/GEO_subdivide_curves.hh index 4d168a087de..2cd2cf3a261 100644 --- a/source/blender/geometry/GEO_subdivide_curves.hh +++ b/source/blender/geometry/GEO_subdivide_curves.hh @@ -4,7 +4,6 @@ #pragma once -#include "BLI_function_ref.hh" #include "BLI_index_mask.hh" #include "BLI_virtual_array.hh" diff --git a/source/blender/geometry/GEO_trim_curves.hh b/source/blender/geometry/GEO_trim_curves.hh index 5ded3f732e7..badd5f6c505 100644 --- a/source/blender/geometry/GEO_trim_curves.hh +++ b/source/blender/geometry/GEO_trim_curves.hh @@ -4,12 +4,9 @@ #pragma once -#include "BLI_span.hh" #include "DNA_node_types.h" #include "BKE_curves.hh" -#include "BKE_curves_utils.hh" -#include "BKE_geometry_set.hh" namespace blender::geometry { diff --git a/source/blender/geometry/GEO_uv_pack.hh b/source/blender/geometry/GEO_uv_pack.hh index 4c830ed7ecc..03e4cda3846 100644 --- a/source/blender/geometry/GEO_uv_pack.hh +++ b/source/blender/geometry/GEO_uv_pack.hh @@ -5,13 +5,11 @@ #pragma once #include "BLI_heap.h" -#include "BLI_math_matrix.hh" #include "BLI_memarena.h" #include "BLI_span.hh" #include "BLI_vector.hh" #include "DNA_space_types.h" -#include "DNA_vec_types.h" /** \file * \ingroup geo diff --git a/source/blender/geometry/GEO_uv_parametrizer.hh b/source/blender/geometry/GEO_uv_parametrizer.hh index bf7281d5409..92392ca42f3 100644 --- a/source/blender/geometry/GEO_uv_parametrizer.hh +++ b/source/blender/geometry/GEO_uv_parametrizer.hh @@ -4,7 +4,7 @@ #pragma once -#include "BLI_sys_types.h" /* for intptr_t support */ +#include namespace slim { struct MatrixTransfer; diff --git a/source/blender/geometry/intern/mesh_merge_by_distance.cc b/source/blender/geometry/intern/mesh_merge_by_distance.cc index 161bfc09631..bc4632699fa 100644 --- a/source/blender/geometry/intern/mesh_merge_by_distance.cc +++ b/source/blender/geometry/intern/mesh_merge_by_distance.cc @@ -1337,7 +1337,7 @@ static void customdata_weld( return; } - CustomData_interp(source, dest, (const int *)src_indices, nullptr, nullptr, count, dest_index); + CustomData_interp(source, dest, src_indices, nullptr, nullptr, count, dest_index); int src_i, dest_i; int j; @@ -1819,9 +1819,9 @@ std::optional mesh_merge_by_distance_connected(const Mesh &mesh, Mesh *mesh_merge_verts(const Mesh &mesh, MutableSpan vert_dest_map, int vert_dest_map_len, - const bool do_mix_vert_data) + const bool do_mix_data) { - return create_merged_mesh(mesh, vert_dest_map, vert_dest_map_len, do_mix_vert_data); + return create_merged_mesh(mesh, vert_dest_map, vert_dest_map_len, do_mix_data); } /** \} */ diff --git a/source/blender/geometry/intern/reorder.cc b/source/blender/geometry/intern/reorder.cc index d3a87040524..0e326311429 100644 --- a/source/blender/geometry/intern/reorder.cc +++ b/source/blender/geometry/intern/reorder.cc @@ -381,22 +381,22 @@ bke::GeometryComponentPtr reordered_component(const bke::GeometryComponent &src_ *src_mesh_component->get(), old_by_new_map, domain, attribute_filter); return bke::GeometryComponentPtr(new bke::MeshComponent(result_mesh)); } - else if (const bke::PointCloudComponent *src_points_component = - dynamic_cast(&src_component)) + if (const bke::PointCloudComponent *src_points_component = + dynamic_cast(&src_component)) { PointCloud *result_point_cloud = reorder_points( *src_points_component->get(), old_by_new_map, attribute_filter); return bke::GeometryComponentPtr(new bke::PointCloudComponent(result_point_cloud)); } - else if (const bke::CurveComponent *src_curves_component = - dynamic_cast(&src_component)) + if (const bke::CurveComponent *src_curves_component = dynamic_cast( + &src_component)) { Curves *result_curves = reorder_curves( *src_curves_component->get(), old_by_new_map, attribute_filter); return bke::GeometryComponentPtr(new bke::CurveComponent(result_curves)); } - else if (const bke::InstancesComponent *src_instances_component = - dynamic_cast(&src_component)) + if (const bke::InstancesComponent *src_instances_component = + dynamic_cast(&src_component)) { bke::Instances *result_instances = reorder_instaces( *src_instances_component->get(), old_by_new_map, attribute_filter); diff --git a/source/blender/geometry/intern/reverse_uv_sampler.cc b/source/blender/geometry/intern/reverse_uv_sampler.cc index 796b2c0de0e..061519021c6 100644 --- a/source/blender/geometry/intern/reverse_uv_sampler.cc +++ b/source/blender/geometry/intern/reverse_uv_sampler.cc @@ -10,6 +10,7 @@ #include "BLI_bounds.hh" #include "BLI_enumerable_thread_specific.hh" #include "BLI_linear_allocator_chunked_list.hh" +#include "BLI_map.hh" #include "BLI_math_geom.h" #include "BLI_math_vector.hh" #include "BLI_offset_indices.hh" diff --git a/source/blender/geometry/intern/uv_pack.cc b/source/blender/geometry/intern/uv_pack.cc index 7bb00e21c3a..032845c1190 100644 --- a/source/blender/geometry/intern/uv_pack.cc +++ b/source/blender/geometry/intern/uv_pack.cc @@ -30,19 +30,14 @@ namespace blender::geometry { /** Store information about an island's placement such as translation, rotation and reflection. */ class UVPhi { public: - UVPhi(); + UVPhi() = default; bool is_valid() const; - float2 translation; - float rotation; - // bool reflect; + float2 translation = float2(-1.0f, -1.0f); + float rotation = 0.0f; + // bool reflect = false; }; -UVPhi::UVPhi() : translation(-1.0f, -1.0f), rotation(0.0f) -{ - /* Initialize invalid. */ -} - bool UVPhi::is_valid() const { return translation.x != -1.0f; @@ -1152,8 +1147,8 @@ class Occupancy { const float margin, const bool write) const; - int bitmap_radix; /* Width and Height of `bitmap`. */ - float bitmap_scale_reciprocal; /* == 1.0f / `bitmap_scale`. */ + int bitmap_radix = 800; /* Width and Height of `bitmap`. */ + float bitmap_scale_reciprocal = 1.0f; /* == 1.0f / `bitmap_scale`. */ private: mutable Array bitmap_; @@ -1164,10 +1159,8 @@ class Occupancy { const float terminal = 1048576.0f; /* 4 * bitmap_radix < terminal < INT_MAX / 4. */ }; -Occupancy::Occupancy(const float initial_scale) - : bitmap_radix(800), bitmap_(bitmap_radix * bitmap_radix, false) +Occupancy::Occupancy(const float initial_scale) : bitmap_(bitmap_radix * bitmap_radix, false) { - bitmap_scale_reciprocal = 1.0f; /* lint, prevent uninitialized memory access. */ increase_scale(); bitmap_scale_reciprocal = bitmap_radix / initial_scale; /* Actually set the value. */ } diff --git a/source/blender/geometry/intern/uv_parametrizer.cc b/source/blender/geometry/intern/uv_parametrizer.cc index 0de4e58ea89..75fc5954268 100644 --- a/source/blender/geometry/intern/uv_parametrizer.cc +++ b/source/blender/geometry/intern/uv_parametrizer.cc @@ -1834,7 +1834,7 @@ static bool p_collapse_allowed_topologic(PEdge *edge, PEdge *pair) if (edge && !edge->next->pair && !edge->next->next->pair) { return false; } - else if (pair && !pair->next->pair && !pair->next->next->pair) { + if (pair && !pair->next->pair && !pair->next->next->pair) { return false; } }