diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/operators/bmo_planar_faces.c | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/bmesh/operators/bmo_planar_faces.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_planar_faces.c | 196 |
1 files changed, 99 insertions, 97 deletions
diff --git a/source/blender/bmesh/operators/bmo_planar_faces.c b/source/blender/bmesh/operators/bmo_planar_faces.c index f5a0e6aec74..ca336175f19 100644 --- a/source/blender/bmesh/operators/bmo_planar_faces.c +++ b/source/blender/bmesh/operators/bmo_planar_faces.c @@ -33,122 +33,124 @@ #define ELE_FACE_ADJUST (1 << 1) struct VertAccum { - float co[3]; - int co_tot; + float co[3]; + int co_tot; }; void bmo_planar_faces_exec(BMesh *bm, BMOperator *op) { - const float fac = BMO_slot_float_get(op->slots_in, "factor"); - const int iterations = BMO_slot_int_get(op->slots_in, "iterations"); - const int faces_num = BMO_slot_buffer_count(op->slots_in, "faces"); + const float fac = BMO_slot_float_get(op->slots_in, "factor"); + const int iterations = BMO_slot_int_get(op->slots_in, "iterations"); + const int faces_num = BMO_slot_buffer_count(op->slots_in, "faces"); - const float eps = 0.00001f; - const float eps_sq = SQUARE(eps); + const float eps = 0.00001f; + const float eps_sq = SQUARE(eps); - BMOIter oiter; - BMFace *f; - BLI_mempool *vert_accum_pool; - GHash *vaccum_map; - float (*faces_center)[3]; - int i, iter_step, shared_vert_num; + BMOIter oiter; + BMFace *f; + BLI_mempool *vert_accum_pool; + GHash *vaccum_map; + float(*faces_center)[3]; + int i, iter_step, shared_vert_num; - faces_center = MEM_mallocN(sizeof(*faces_center) * faces_num, __func__); + faces_center = MEM_mallocN(sizeof(*faces_center) * faces_num, __func__); - shared_vert_num = 0; - BMO_ITER_INDEX (f, &oiter, op->slots_in, "faces", BM_FACE, i) { - BMLoop *l_iter, *l_first; + shared_vert_num = 0; + BMO_ITER_INDEX(f, &oiter, op->slots_in, "faces", BM_FACE, i) + { + BMLoop *l_iter, *l_first; - if (f->len == 3) { - continue; - } + if (f->len == 3) { + continue; + } - BM_face_calc_center_median_weighted(f, faces_center[i]); + BM_face_calc_center_median_weighted(f, faces_center[i]); - l_iter = l_first = BM_FACE_FIRST_LOOP(f); - do { - if (!BMO_vert_flag_test(bm, l_iter->v, ELE_VERT_ADJUST)) { - BMO_vert_flag_enable(bm, l_iter->v, ELE_VERT_ADJUST); - shared_vert_num += 1; - } - } while ((l_iter = l_iter->next) != l_first); + l_iter = l_first = BM_FACE_FIRST_LOOP(f); + do { + if (!BMO_vert_flag_test(bm, l_iter->v, ELE_VERT_ADJUST)) { + BMO_vert_flag_enable(bm, l_iter->v, ELE_VERT_ADJUST); + shared_vert_num += 1; + } + } while ((l_iter = l_iter->next) != l_first); - BMO_face_flag_enable(bm, f, ELE_FACE_ADJUST); - } + BMO_face_flag_enable(bm, f, ELE_FACE_ADJUST); + } - vert_accum_pool = BLI_mempool_create(sizeof(struct VertAccum), 0, 512, BLI_MEMPOOL_NOP); - vaccum_map = BLI_ghash_ptr_new_ex(__func__, shared_vert_num); + vert_accum_pool = BLI_mempool_create(sizeof(struct VertAccum), 0, 512, BLI_MEMPOOL_NOP); + vaccum_map = BLI_ghash_ptr_new_ex(__func__, shared_vert_num); - for (iter_step = 0; iter_step < iterations; iter_step++) { - GHashIterator gh_iter; - bool changed = false; + for (iter_step = 0; iter_step < iterations; iter_step++) { + GHashIterator gh_iter; + bool changed = false; - BMO_ITER_INDEX (f, &oiter, op->slots_in, "faces", BM_FACE, i) { - BMLoop *l_iter, *l_first; - float plane[4]; + BMO_ITER_INDEX(f, &oiter, op->slots_in, "faces", BM_FACE, i) + { + BMLoop *l_iter, *l_first; + float plane[4]; - if (!BMO_face_flag_test(bm, f, ELE_FACE_ADJUST)) { - continue; - } - BMO_face_flag_disable(bm, f, ELE_FACE_ADJUST); + if (!BMO_face_flag_test(bm, f, ELE_FACE_ADJUST)) { + continue; + } + BMO_face_flag_disable(bm, f, ELE_FACE_ADJUST); - BLI_assert(f->len != 3); + BLI_assert(f->len != 3); - /* keep original face data (else we 'move' the face) */ + /* keep original face data (else we 'move' the face) */ #if 0 - BM_face_normal_update(f); - BM_face_calc_center_median_weighted(f, f_center); + BM_face_normal_update(f); + BM_face_calc_center_median_weighted(f, f_center); #endif - plane_from_point_normal_v3(plane, faces_center[i], f->no); - - l_iter = l_first = BM_FACE_FIRST_LOOP(f); - do { - struct VertAccum *va; - void **va_p; - float co[3]; - - if (!BLI_ghash_ensure_p(vaccum_map, l_iter->v, &va_p)) { - *va_p = BLI_mempool_calloc(vert_accum_pool); - } - va = *va_p; - - closest_to_plane_normalized_v3(co, plane, l_iter->v->co); - va->co_tot += 1; - - interp_v3_v3v3(va->co, va->co, co, 1.0f / (float)va->co_tot); - } while ((l_iter = l_iter->next) != l_first); - } - - GHASH_ITER (gh_iter, vaccum_map) { - BMVert *v = BLI_ghashIterator_getKey(&gh_iter); - struct VertAccum *va = BLI_ghashIterator_getValue(&gh_iter); - BMIter iter; - - if (len_squared_v3v3(v->co, va->co) > eps_sq) { - BMO_vert_flag_enable(bm, v, ELE_VERT_ADJUST); - interp_v3_v3v3(v->co, v->co, va->co, fac); - changed = true; - } - - /* tag for re-calculation */ - BM_ITER_ELEM (f, &iter, v, BM_FACES_OF_VERT) { - if (f->len != 3) { - BMO_face_flag_enable(bm, f, ELE_FACE_ADJUST); - } - } - } - - /* if nothing changed, break out early */ - if (changed == false) { - break; - } - - BLI_ghash_clear(vaccum_map, NULL, NULL); - BLI_mempool_clear(vert_accum_pool); - } - - MEM_freeN(faces_center); - BLI_ghash_free(vaccum_map, NULL, NULL); - BLI_mempool_destroy(vert_accum_pool); + plane_from_point_normal_v3(plane, faces_center[i], f->no); + + l_iter = l_first = BM_FACE_FIRST_LOOP(f); + do { + struct VertAccum *va; + void **va_p; + float co[3]; + + if (!BLI_ghash_ensure_p(vaccum_map, l_iter->v, &va_p)) { + *va_p = BLI_mempool_calloc(vert_accum_pool); + } + va = *va_p; + + closest_to_plane_normalized_v3(co, plane, l_iter->v->co); + va->co_tot += 1; + + interp_v3_v3v3(va->co, va->co, co, 1.0f / (float)va->co_tot); + } while ((l_iter = l_iter->next) != l_first); + } + + GHASH_ITER (gh_iter, vaccum_map) { + BMVert *v = BLI_ghashIterator_getKey(&gh_iter); + struct VertAccum *va = BLI_ghashIterator_getValue(&gh_iter); + BMIter iter; + + if (len_squared_v3v3(v->co, va->co) > eps_sq) { + BMO_vert_flag_enable(bm, v, ELE_VERT_ADJUST); + interp_v3_v3v3(v->co, v->co, va->co, fac); + changed = true; + } + + /* tag for re-calculation */ + BM_ITER_ELEM (f, &iter, v, BM_FACES_OF_VERT) { + if (f->len != 3) { + BMO_face_flag_enable(bm, f, ELE_FACE_ADJUST); + } + } + } + + /* if nothing changed, break out early */ + if (changed == false) { + break; + } + + BLI_ghash_clear(vaccum_map, NULL, NULL); + BLI_mempool_clear(vert_accum_pool); + } + + MEM_freeN(faces_center); + BLI_ghash_free(vaccum_map, NULL, NULL); + BLI_mempool_destroy(vert_accum_pool); } |