[Bf-blender-cvs] [b73814c65cb] master: Cleanup: use function style casts for C++
Campbell Barton
noreply at git.blender.org
Fri Jan 20 04:04:57 CET 2023
Commit: b73814c65cbe8fef6ef5f8ae16d4d1fd4ecbcf20
Author: Campbell Barton
Date: Fri Jan 20 13:22:00 2023 +1100
Branches: master
https://developer.blender.org/rBb73814c65cbe8fef6ef5f8ae16d4d1fd4ecbcf20
Cleanup: use function style casts for C++
===================================================================
M source/blender/modifiers/intern/MOD_correctivesmooth.cc
M source/blender/modifiers/intern/MOD_ocean.cc
M source/blender/modifiers/intern/MOD_solidify_extrude.cc
M source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
index 83b51187c6b..bf98483ce8a 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc
@@ -131,8 +131,8 @@ static void mesh_get_boundaries(Mesh *mesh, float *smooth_weights)
const MPoly *mpoly = BKE_mesh_polys(mesh);
const MLoop *mloop = BKE_mesh_loops(mesh);
- const uint mpoly_num = (uint)mesh->totpoly;
- const uint medge_num = (uint)mesh->totedge;
+ const uint mpoly_num = uint(mesh->totpoly);
+ const uint medge_num = uint(mesh->totedge);
/* Flag boundary edges so only boundaries are set to 1. */
uint8_t *boundaries = static_cast<uint8_t *>(
@@ -144,7 +144,7 @@ static void mesh_get_boundaries(Mesh *mesh, float *smooth_weights)
int j;
for (j = 0; j < totloop; j++) {
uint8_t *e_value = &boundaries[mloop[p->loopstart + j].e];
- *e_value |= (uint8_t)((*e_value) + 1);
+ *e_value |= uint8_t((*e_value) + 1);
}
}
@@ -173,7 +173,7 @@ static void smooth_iter__simple(CorrectiveSmoothModifierData *csmd,
const float lambda = csmd->lambda;
uint i;
- const uint edges_num = (uint)mesh->totedge;
+ const uint edges_num = uint(mesh->totedge);
const MEdge *edges = BKE_mesh_edges(mesh);
struct SmoothingData_Simple {
@@ -248,7 +248,7 @@ static void smooth_iter__length_weight(CorrectiveSmoothModifierData *csmd,
uint iterations)
{
const float eps = FLT_EPSILON * 10.0f;
- const uint edges_num = (uint)mesh->totedge;
+ const uint edges_num = uint(mesh->totedge);
/* NOTE: the way this smoothing method works, its approx half as strong as the simple-smooth,
* and 2.0 rarely spikes, double the value for consistent behavior. */
const float lambda = csmd->lambda * 2.0f;
@@ -384,7 +384,7 @@ static void smooth_verts(CorrectiveSmoothModifierData *csmd,
}
}
- smooth_iter(csmd, mesh, vertexCos, verts_num, smooth_weights, (uint)csmd->repeat);
+ smooth_iter(csmd, mesh, vertexCos, verts_num, smooth_weights, uint(csmd->repeat));
if (smooth_weights) {
MEM_freeN(smooth_weights);
@@ -437,8 +437,8 @@ static void calc_tangent_spaces(const Mesh *mesh,
float *r_tangent_weights,
float *r_tangent_weights_per_vertex)
{
- const uint mpoly_num = (uint)mesh->totpoly;
- const uint mvert_num = (uint)mesh->totvert;
+ const uint mpoly_num = uint(mesh->totpoly);
+ const uint mvert_num = uint(mesh->totvert);
const MPoly *mpoly = BKE_mesh_polys(mesh);
const MLoop *mloop = BKE_mesh_loops(mesh);
uint i;
@@ -462,7 +462,7 @@ static void calc_tangent_spaces(const Mesh *mesh,
normalize_v3(v_dir_prev);
for (; l_next != l_term; l_prev = l_curr, l_curr = l_next, l_next++) {
- uint l_index = (uint)(l_curr - mloop);
+ uint l_index = uint(l_curr - mloop);
float(*ts)[3] = r_tangent_spaces[l_index];
/* re-use the previous value */
@@ -520,7 +520,7 @@ static void calc_deltas(CorrectiveSmoothModifierData *csmd,
uint verts_num)
{
const MLoop *mloop = BKE_mesh_loops(mesh);
- const uint loops_num = (uint)mesh->totloop;
+ const uint loops_num = uint(mesh->totloop);
float(*smooth_vertex_coords)[3] = static_cast<float(*)[3]>(MEM_dupallocN(rest_coords));
@@ -579,7 +579,7 @@ static void correctivesmooth_modifier_do(ModifierData *md,
(((ID *)ob->data)->recalc & ID_RECALC_ALL));
const MLoop *mloop = BKE_mesh_loops(mesh);
- const uint loops_num = (uint)mesh->totloop;
+ const uint loops_num = uint(mesh->totloop);
bool use_only_smooth = (csmd->flag & MOD_CORRECTIVESMOOTH_ONLY_SMOOTH) != 0;
const MDeformVert *dvert = nullptr;
@@ -590,7 +590,7 @@ static void correctivesmooth_modifier_do(ModifierData *md,
/* if rest bind_coords not are defined, set them (only run during bind) */
if ((csmd->rest_source == MOD_CORRECTIVESMOOTH_RESTSOURCE_BIND) &&
/* signal to recalculate, whoever sets MUST also free bind coords */
- (csmd->bind_coords_num == (uint)-1)) {
+ (csmd->bind_coords_num == uint(-1))) {
if (DEG_is_active(depsgraph)) {
BLI_assert(csmd->bind_coords == nullptr);
csmd->bind_coords = static_cast<float(*)[3]>(MEM_dupallocN(vertexCos));
@@ -633,7 +633,7 @@ static void correctivesmooth_modifier_do(ModifierData *md,
goto error;
}
else {
- uint me_numVerts = (uint)((em) ? em->bm->totvert : ((Mesh *)ob->data)->totvert);
+ uint me_numVerts = uint((em) ? em->bm->totvert : ((Mesh *)ob->data)->totvert);
if (me_numVerts != verts_num) {
BKE_modifier_set_error(
@@ -747,7 +747,7 @@ static void deformVerts(ModifierData *md,
Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, nullptr, mesh, nullptr, verts_num, false);
correctivesmooth_modifier_do(
- md, ctx->depsgraph, ctx->object, mesh_src, vertexCos, (uint)verts_num, nullptr);
+ md, ctx->depsgraph, ctx->object, mesh_src, vertexCos, uint(verts_num), nullptr);
if (!ELEM(mesh_src, nullptr, mesh)) {
BKE_id_free(nullptr, mesh_src);
@@ -770,7 +770,7 @@ static void deformVertsEM(ModifierData *md,
}
correctivesmooth_modifier_do(
- md, ctx->depsgraph, ctx->object, mesh_src, vertexCos, (uint)verts_num, editData);
+ md, ctx->depsgraph, ctx->object, mesh_src, vertexCos, uint(verts_num), editData);
if (!ELEM(mesh_src, nullptr, mesh)) {
BKE_id_free(nullptr, mesh_src);
diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc
index d5ae1caf703..6ca8c25ef28 100644
--- a/source/blender/modifiers/intern/MOD_ocean.cc
+++ b/source/blender/modifiers/intern/MOD_ocean.cc
@@ -416,7 +416,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
foam = BKE_ocean_jminus_to_foam(ocr.Jminus, omd->foam_coverage);
}
- mlcol->r = mlcol->g = mlcol->b = (char)(foam * 255);
+ mlcol->r = mlcol->g = mlcol->b = char(foam * 255);
/* This needs to be set (render engine uses) */
mlcol->a = 255;
diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.cc b/source/blender/modifiers/intern/MOD_solidify_extrude.cc
index 48cdbc89f38..cbca9c3527d 100644
--- a/source/blender/modifiers/intern/MOD_solidify_extrude.cc
+++ b/source/blender/modifiers/intern/MOD_solidify_extrude.cc
@@ -73,7 +73,7 @@ static void mesh_calc_hq_normal(Mesh *mesh,
const MPoly *mp = mpoly;
{
- EdgeFaceRef *edge_ref_array = MEM_cnew_array<EdgeFaceRef>((size_t)edges_num, __func__);
+ EdgeFaceRef *edge_ref_array = MEM_cnew_array<EdgeFaceRef>(size_t(edges_num), __func__);
EdgeFaceRef *edge_ref;
float edge_normal[3];
@@ -231,8 +231,8 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
uint eidx;
uint i;
-#define INVALID_UNUSED ((uint)-1)
-#define INVALID_PAIR ((uint)-2)
+#define INVALID_UNUSED uint(-1)
+#define INVALID_PAIR uint(-2)
new_vert_arr = static_cast<uint *>(
MEM_malloc_arrayN(verts_num, 2 * sizeof(*new_vert_arr), __func__));
@@ -530,7 +530,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
eidx = ml_prev->e;
const MEdge *ed = orig_medge + eidx;
BLI_assert(ELEM(ml_prev->v, ed->v1, ed->v2) && ELEM(ml->v, ed->v1, ed->v2));
- char flip = (char)((ml_prev->v > ml->v) == (ed->v1 < ed->v2));
+ char flip = char((ml_prev->v > ml->v) == (ed->v1 < ed->v2));
if (edge_user_pairs[eidx][flip] == INVALID_UNUSED) {
edge_user_pairs[eidx][flip] = i;
}
@@ -827,7 +827,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
eidx = ml_prev->e;
const MEdge *ed = orig_medge + eidx;
BLI_assert(ELEM(ml_prev->v, ed->v1, ed->v2) && ELEM(ml->v, ed->v1, ed->v2));
- char flip = (char)((ml_prev->v > ml->v) == (ed->v1 < ed->v2));
+ char flip = char((ml_prev->v > ml->v) == (ed->v1 < ed->v2));
if (edge_user_pairs[eidx][flip] == INVALID_UNUSED) {
edge_user_pairs[eidx][flip] = i;
}
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
index 2b07998932b..53ebf814a26 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc
@@ -204,7 +204,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
uint new_loops_num = 0;
uint new_polys_num = 0;
-#define MOD_SOLIDIFY_EMPTY_TAG ((uint)-1)
+#define MOD_SOLIDIFY_EMPTY_TAG uint(-1)
/* Calculate only face normals. Copied because they are modified directly below. */
float(*poly_nors)[3] = static_cast<float(*)[3]>(
@@ -420,7 +420,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
mul_v3_fl(edgedir,
(combined_verts[v2] + 1) /
- (float)(combined_verts[v1] + combined_verts[v2] + 2));
+ float(combined_verts[v1] + combined_verts[v2] + 2));
add_v3_v3(orig_mvert_co[v1], edgedir);
for (uint j = v2; j < verts_num; j++) {
if (vm[j] == v2) {
@@ -2537,8 +2537,8 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
uint *face_edges = static_cast<uint *>(
MEM_malloc_arrayN(largest_ngon * 2, sizeof(*face_edges), __func__));
for (uint i = 0; i < polys_num * 2; i++, fr++) {
- const uint loopstart = (uint)fr->face->loopstart;
- uint totloop = (uint)fr->face->totloop;
+ const uint loopstart = uint(fr->face->loopstart);
+ uint totloop = uint(fr->face->totloop);
uint valid_edges = 0;
uint k = 0;
while (totloop > 0 && (!fr->link_edges[totloop - 1] ||
@@ -2547,14 +2547,14 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
}
if (totloop > 0) {
NewEdgeRef *prior_edge = fr->link_edges[totloop - 1];
- uint prior_flip = (uint)(vm[ori
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list