diff options
Diffstat (limited to 'source/blender/geometry')
6 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/geometry/intern/add_curves_on_mesh.cc b/source/blender/geometry/intern/add_curves_on_mesh.cc index bb5e2a0a28a..25935691bf4 100644 --- a/source/blender/geometry/intern/add_curves_on_mesh.cc +++ b/source/blender/geometry/intern/add_curves_on_mesh.cc @@ -51,7 +51,7 @@ static void initialize_straight_curve_positions(const float3 &p1, const float3 &p2, MutableSpan<float3> r_positions) { - const float step = 1.0f / (float)(r_positions.size() - 1); + const float step = 1.0f / float(r_positions.size() - 1); for (const int i : r_positions.index_range()) { r_positions[i] = math::interpolate(p1, p2, i * step); } diff --git a/source/blender/geometry/intern/mesh_merge_by_distance.cc b/source/blender/geometry/intern/mesh_merge_by_distance.cc index d7c35a4fcc1..55d757d0e81 100644 --- a/source/blender/geometry/intern/mesh_merge_by_distance.cc +++ b/source/blender/geometry/intern/mesh_merge_by_distance.cc @@ -21,11 +21,11 @@ namespace blender::geometry { /* Indicates when the element was not computed. */ -#define OUT_OF_CONTEXT (int)(-1) +#define OUT_OF_CONTEXT int(-1) /* Indicates if the edge or face will be collapsed. */ -#define ELEM_COLLAPSED (int)(-2) +#define ELEM_COLLAPSED int(-2) /* indicates whether an edge or vertex in groups_map will be merged. */ -#define ELEM_MERGED (int)(-2) +#define ELEM_MERGED int(-2) /* Used to indicate a range in an array specifying a group. */ struct WeldGroup { @@ -702,7 +702,7 @@ static bool weld_iter_loop_of_poly_next(WeldLoopOfPolyIter &iter) else { const MLoop &ml = iter.mloop[l]; #ifdef USE_WELD_DEBUG - BLI_assert((uint)iter.v != ml.v); + BLI_assert(uint(iter.v) != ml.v); #endif iter.v = ml.v; iter.e = ml.e; @@ -1311,9 +1311,9 @@ static void customdata_weld( #ifdef USE_WELD_NORMALS mul_v3_fl(no, fac); short *mv_no = mv->no; - mv_no[0] = (short)no[0]; - mv_no[1] = (short)no[1]; - mv_no[2] = (short)no[2]; + mv_no[0] = short(no[0]); + mv_no[1] = short(no[1]); + mv_no[2] = short(no[2]); #endif } else if (type == CD_MEDGE) { @@ -1532,7 +1532,7 @@ static Mesh *create_merged_mesh(const Mesh &mesh, r_i++; } - BLI_assert((int)r_i == result_npolys); + BLI_assert(int(r_i) == result_npolys); BLI_assert(loop_cur == result_nloops); return result; diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index 99b6bb29051..7b3c307cf37 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -495,10 +495,10 @@ static void gather_realize_tasks_for_instances(GatherTasksInfo &gather_info, uint32_t local_instance_id = 0; if (gather_info.create_id_attribute_on_any_component) { if (stored_instance_ids.is_empty()) { - local_instance_id = (uint32_t)i; + local_instance_id = uint32_t(i); } else { - local_instance_id = (uint32_t)stored_instance_ids[i]; + local_instance_id = uint32_t(stored_instance_ids[i]); } } const uint32_t instance_id = noise::hash(base_instance_context.id, local_instance_id); diff --git a/source/blender/geometry/intern/set_curve_type.cc b/source/blender/geometry/intern/set_curve_type.cc index 92609a45bdc..4233c62c7b3 100644 --- a/source/blender/geometry/intern/set_curve_type.cc +++ b/source/blender/geometry/intern/set_curve_type.cc @@ -186,12 +186,12 @@ static Vector<float3> create_nurbs_to_bezier_handles(const Span<float3> nurbs_po const int segments_num = nurbs_positions_num - 1; const bool ignore_interior_segment = segments_num == 3 && is_periodic == false; if (ignore_interior_segment == false) { - const float mid_offset = (float)(segments_num - 1) / 2.0f; + const float mid_offset = float(segments_num - 1) / 2.0f; for (const int i : IndexRange(1, segments_num - 2)) { /* Divisor can have values: 1, 2 or 3. */ const int divisor = is_periodic ? 3 : - std::min(3, (int)(-std::abs(i - mid_offset) + mid_offset + 1.0f)); + std::min(3, int(-std::abs(i - mid_offset) + mid_offset + 1.0f)); const float3 &p1 = nurbs_positions[i]; const float3 &p2 = nurbs_positions[i + 1]; const float3 displacement = (p2 - p1) / divisor; diff --git a/source/blender/geometry/intern/trim_curves.cc b/source/blender/geometry/intern/trim_curves.cc index bda44e09da8..370abe159b4 100644 --- a/source/blender/geometry/intern/trim_curves.cc +++ b/source/blender/geometry/intern/trim_curves.cc @@ -21,7 +21,7 @@ namespace blender::geometry { /** \name Curve Enums * \{ */ -#define CURVE_TYPE_AS_MASK(curve_type) ((CurveTypeMask)(1 << (int)(curve_type))) +#define CURVE_TYPE_AS_MASK(curve_type) ((CurveTypeMask)(1 << int(curve_type))) typedef enum CurveTypeMask { CURVE_TYPE_MASK_CATMULL_ROM = (1 << 0), @@ -165,7 +165,7 @@ static bke::curves::CurvePoint lookup_bezier_point(const Span<int> bezier_offset const int left = offset - bezier_offsets.begin(); const int right = left == last_index ? 0 : left + 1; - const int prev_offset = left == 0 ? 0 : bezier_offsets[(int64_t)left - 1]; + const int prev_offset = left == 0 ? 0 : bezier_offsets[int64_t(left) - 1]; const float offset_in_segment = eval_factor + eval_index - prev_offset; const int segment_resolution = bezier_offsets[left] - prev_offset; const float parameter = std::clamp(offset_in_segment / segment_resolution, 0.0f, 1.0f); @@ -267,13 +267,13 @@ Array<bke::curves::CurvePoint, 12> lookup_curve_points(const bke::CurvesGeometry * Determine curve type(s) for the copied curves given the supported set of types and knot modes. * If a curve type is not supported the default type is set. */ -static void determine_copyable_curve_types(const bke::CurvesGeometry &src_curves, - bke::CurvesGeometry &dst_curves, - const IndexMask selection, - const IndexMask selection_inverse, - const CurveTypeMask supported_curve_type_mask, - const int8_t default_curve_type = (int8_t) - CURVE_TYPE_POLY) +static void determine_copyable_curve_types( + const bke::CurvesGeometry &src_curves, + bke::CurvesGeometry &dst_curves, + const IndexMask selection, + const IndexMask selection_inverse, + const CurveTypeMask supported_curve_type_mask, + const int8_t default_curve_type = int8_t(CURVE_TYPE_POLY)) { const VArray<int8_t> src_curve_types = src_curves.curve_types(); const VArray<int8_t> src_knot_modes = src_curves.nurbs_knots_modes(); @@ -332,7 +332,7 @@ static void compute_trim_result_offsets(const bke::CurvesGeometry &src_curves, src_point_count = src_curves.evaluated_points_for_curve(curve_i).size(); } else { - src_point_count = (int64_t)src_curves.points_num_for_curve(curve_i); + src_point_count = int64_t(src_curves.points_num_for_curve(curve_i)); } BLI_assert(src_point_count > 0); @@ -376,8 +376,8 @@ static void fill_bezier_data(bke::CurvesGeometry &dst_curves, const IndexMask se threading::parallel_for(selection.index_range(), 4096, [&](const IndexRange range) { for (const int64_t curve_i : selection.slice(range)) { const IndexRange points = dst_curves.points_for_curve(curve_i); - handle_types_right.slice(points).fill((int8_t)BEZIER_HANDLE_FREE); - handle_types_left.slice(points).fill((int8_t)BEZIER_HANDLE_FREE); + handle_types_right.slice(points).fill(int8_t(BEZIER_HANDLE_FREE)); + handle_types_left.slice(points).fill(int8_t(BEZIER_HANDLE_FREE)); handle_positions_left.slice(points).fill({0.0f, 0.0f, 0.0f}); handle_positions_right.slice(points).fill({0.0f, 0.0f, 0.0f}); } @@ -743,7 +743,7 @@ static void sample_interval_bezier(const Span<float3> src_positions, dst_positions, dst_handles_l, dst_handles_r, - {{(int)dst_range.first(), (int)(dst_range.first() + 1)}, parameter}); + {{int(dst_range.first()), int(dst_range.first() + 1)}, parameter}); } else { /* General case, compute the insertion point. */ diff --git a/source/blender/geometry/intern/uv_parametrizer.cc b/source/blender/geometry/intern/uv_parametrizer.cc index b15c8b6e319..1829f943a5d 100644 --- a/source/blender/geometry/intern/uv_parametrizer.cc +++ b/source/blender/geometry/intern/uv_parametrizer.cc @@ -195,7 +195,7 @@ static int PHashSizes[] = { 1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 268435459, }; -#define PHASH_hash(ph, item) (((uintptr_t)(item)) % ((uint)(ph)->cursize)) +#define PHASH_hash(ph, item) (uintptr_t(item) % ((uint)(ph)->cursize)) #define PHASH_edge(v1, v2) (((v1) < (v2)) ? ((v1)*39) ^ ((v2)*31) : ((v1)*31) ^ ((v2)*39)) static PHash *phash_new(PHashLink **list, int sizehint) @@ -319,7 +319,7 @@ static void fix_large_angle(const float v_fix[3], float *r_a1, float *r_a2) { - const float max_angle = (float)M_PI * (179.0f / 180.0f); + const float max_angle = float(M_PI) * (179.0f / 180.0f); const float fix_amount = *r_fix - max_angle; if (fix_amount < 0.0f) { return; /* angle is reasonable, i.e. less than 179 degrees. */ @@ -4218,7 +4218,7 @@ void GEO_uv_parametrizer_pack(ParamHandle *handle, * ...Without using the area running pack multiple times also gives a bad feedback loop. * multiply by 0.1 so the margin value from the UI can be from * 0.0 to 1.0 but not give a massive margin */ - margin = (margin * (float)area) * 0.1f; + margin = (margin * float(area)) * 0.1f; unpacked = 0; for (i = 0; i < handle->ncharts; i++) { chart = handle->charts[i]; |