diff options
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_tangent.cc')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_tangent.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc index 8f9af5e9258..7c12e15ca7b 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.cc +++ b/source/blender/blenkernel/intern/mesh_tangent.cc @@ -36,34 +36,34 @@ struct BKEMeshToTangent { uint GetNumFaces() { - return (uint)num_polys; + return uint(num_polys); } uint GetNumVerticesOfFace(const uint face_num) { - return (uint)mpolys[face_num].totloop; + return uint(mpolys[face_num].totloop); } mikk::float3 GetPosition(const uint face_num, const uint vert_num) { - const uint loop_idx = (uint)mpolys[face_num].loopstart + vert_num; + const uint loop_idx = uint(mpolys[face_num].loopstart) + vert_num; return mikk::float3(mverts[mloops[loop_idx].v].co); } mikk::float3 GetTexCoord(const uint face_num, const uint vert_num) { - const float *uv = luvs[(uint)mpolys[face_num].loopstart + vert_num].uv; + const float *uv = luvs[uint(mpolys[face_num].loopstart) + vert_num].uv; return mikk::float3(uv[0], uv[1], 1.0f); } mikk::float3 GetNormal(const uint face_num, const uint vert_num) { - return mikk::float3(lnors[(uint)mpolys[face_num].loopstart + vert_num]); + return mikk::float3(lnors[uint(mpolys[face_num].loopstart) + vert_num]); } void SetTangentSpace(const uint face_num, const uint vert_num, mikk::float3 T, bool orientation) { - float *p_res = tangents[(uint)mpolys[face_num].loopstart + vert_num]; + float *p_res = tangents[uint(mpolys[face_num].loopstart) + vert_num]; copy_v4_fl4(p_res, T.x, T.y, T.z, orientation ? 1.0f : -1.0f); } @@ -166,9 +166,9 @@ struct SGLSLMeshToTangent { uint GetNumFaces() { #ifdef USE_LOOPTRI_DETECT_QUADS - return (uint)num_face_as_quad_map; + return uint(num_face_as_quad_map); #else - return (uint)numTessFaces; + return uint(numTessFaces); #endif } @@ -196,7 +196,7 @@ struct SGLSLMeshToTangent { lt = &looptri[face_as_quad_map[face_num]]; const MPoly *mp = &mpoly[lt->poly]; if (mp->totloop == 4) { - return ((uint)mp->loopstart + vert_num); + return (uint(mp->loopstart) + vert_num); } /* fall through to regular triangle */ } @@ -382,7 +382,7 @@ void BKE_mesh_calc_loop_tangent_step_0(const CustomData *loopData, add = true; } if (add) { - *rtangent_mask |= (short)(1 << n); + *rtangent_mask |= short(1 << n); } } @@ -437,21 +437,21 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert, for (int i = 0; i < tangent_names_len; i++) { if (tangent_names[i][0]) { BKE_mesh_add_loop_tangent_named_layer_for_uv( - loopdata, loopdata_out, (int)loopdata_out_len, tangent_names[i]); + loopdata, loopdata_out, int(loopdata_out_len), tangent_names[i]); } } if ((tangent_mask & DM_TANGENT_MASK_ORCO) && CustomData_get_named_layer_index(loopdata, CD_TANGENT, "") == -1) { CustomData_add_layer_named( - loopdata_out, CD_TANGENT, CD_SET_DEFAULT, nullptr, (int)loopdata_out_len, ""); + loopdata_out, CD_TANGENT, CD_SET_DEFAULT, nullptr, int(loopdata_out_len), ""); } if (calc_act && act_uv_name[0]) { BKE_mesh_add_loop_tangent_named_layer_for_uv( - loopdata, loopdata_out, (int)loopdata_out_len, act_uv_name); + loopdata, loopdata_out, int(loopdata_out_len), act_uv_name); } if (calc_ren && ren_uv_name[0]) { BKE_mesh_add_loop_tangent_named_layer_for_uv( - loopdata, loopdata_out, (int)loopdata_out_len, ren_uv_name); + loopdata, loopdata_out, int(loopdata_out_len), ren_uv_name); } #ifdef USE_LOOPTRI_DETECT_QUADS @@ -465,7 +465,7 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert, /* map fake face index to looptri */ face_as_quad_map = static_cast<int *>(MEM_mallocN(sizeof(int) * looptri_len, __func__)); int k, j; - for (k = 0, j = 0; j < (int)looptri_len; k++, j++) { + for (k = 0, j = 0; j < int(looptri_len); k++, j++) { face_as_quad_map[k] = j; /* step over all quads */ if (mpoly[looptri[j].poly].totloop == 4) { @@ -475,7 +475,7 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert, num_face_as_quad_map = k; } else { - num_face_as_quad_map = (int)looptri_len; + num_face_as_quad_map = int(looptri_len); } #endif @@ -491,7 +491,7 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert, int index = CustomData_get_layer_index_n(loopdata_out, CD_TANGENT, n); BLI_assert(n < MAX_MTFACE); SGLSLMeshToTangent *mesh2tangent = &data_array[n]; - mesh2tangent->numTessFaces = (int)looptri_len; + mesh2tangent->numTessFaces = int(looptri_len); #ifdef USE_LOOPTRI_DETECT_QUADS mesh2tangent->face_as_quad_map = face_as_quad_map; mesh2tangent->num_face_as_quad_map = num_face_as_quad_map; @@ -525,7 +525,7 @@ void BKE_mesh_calc_loop_tangent_ex(const MVert *mvert, int uv_start = CustomData_get_layer_index(loopdata, CD_MLOOPUV); BLI_assert(uv_ind != -1 && uv_start != -1); BLI_assert(uv_ind - uv_start < MAX_MTFACE); - tangent_mask_curr |= (short)(1 << (uv_ind - uv_start)); + tangent_mask_curr |= short(1 << (uv_ind - uv_start)); } mesh2tangent->tangent = static_cast<float(*)[4]>(loopdata_out->layers[index].data); @@ -583,10 +583,10 @@ void BKE_mesh_calc_loop_tangents(Mesh *me_eval, BKE_mesh_calc_loop_tangent_ex( BKE_mesh_verts(me_eval), BKE_mesh_polys(me_eval), - (uint)me_eval->totpoly, + uint(me_eval->totpoly), BKE_mesh_loops(me_eval), me_eval->runtime.looptris.array, - (uint)me_eval->runtime.looptris.len, + uint(me_eval->runtime.looptris.len), &me_eval->ldata, calc_active_tangent, tangent_names, @@ -598,7 +598,7 @@ void BKE_mesh_calc_loop_tangents(Mesh *me_eval, static_cast<const float(*)[3]>(CustomData_get_layer(&me_eval->vdata, CD_ORCO)), /* result */ &me_eval->ldata, - (uint)me_eval->totloop, + uint(me_eval->totloop), &tangent_mask); } |