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/intern/bmesh_walkers.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/intern/bmesh_walkers.c')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers.c | 204 |
1 files changed, 106 insertions, 98 deletions
diff --git a/source/blender/bmesh/intern/bmesh_walkers.c b/source/blender/bmesh/intern/bmesh_walkers.c index 011addc9220..b850c87d5aa 100644 --- a/source/blender/bmesh/intern/bmesh_walkers.c +++ b/source/blender/bmesh/intern/bmesh_walkers.c @@ -54,11 +54,11 @@ void *BMW_begin(BMWalker *walker, void *start) { - BLI_assert(((BMHeader *)start)->htype & walker->begin_htype); + BLI_assert(((BMHeader *)start)->htype & walker->begin_htype); - walker->begin(walker, start); + walker->begin(walker, start); - return BMW_current_state(walker) ? walker->step(walker) : NULL; + return BMW_current_state(walker) ? walker->step(walker) : NULL; } /** @@ -68,53 +68,62 @@ void *BMW_begin(BMWalker *walker, void *start) * a given type. The elements visited are filtered * by the bitmask 'searchmask'. */ -void BMW_init( - BMWalker *walker, BMesh *bm, int type, - short mask_vert, short mask_edge, short mask_face, - BMWFlag flag, - int layer) +void BMW_init(BMWalker *walker, + BMesh *bm, + int type, + short mask_vert, + short mask_edge, + short mask_face, + BMWFlag flag, + int layer) { - memset(walker, 0, sizeof(BMWalker)); + memset(walker, 0, sizeof(BMWalker)); - walker->layer = layer; - walker->flag = flag; - walker->bm = bm; + walker->layer = layer; + walker->flag = flag; + walker->bm = bm; - walker->mask_vert = mask_vert; - walker->mask_edge = mask_edge; - walker->mask_face = mask_face; + walker->mask_vert = mask_vert; + walker->mask_edge = mask_edge; + walker->mask_face = mask_face; - walker->visit_set = BLI_gset_ptr_new("bmesh walkers"); - walker->visit_set_alt = BLI_gset_ptr_new("bmesh walkers sec"); + walker->visit_set = BLI_gset_ptr_new("bmesh walkers"); + walker->visit_set_alt = BLI_gset_ptr_new("bmesh walkers sec"); - if (UNLIKELY(type >= BMW_MAXWALKERS || type < 0)) { - fprintf(stderr, - "%s: Invalid walker type in BMW_init; type: %d, " - "searchmask: (v:%d, e:%d, f:%d), flag: %u, layer: %d\n", - __func__, type, mask_vert, mask_edge, mask_face, flag, layer); - BLI_assert(0); - return; - } + if (UNLIKELY(type >= BMW_MAXWALKERS || type < 0)) { + fprintf(stderr, + "%s: Invalid walker type in BMW_init; type: %d, " + "searchmask: (v:%d, e:%d, f:%d), flag: %u, layer: %d\n", + __func__, + type, + mask_vert, + mask_edge, + mask_face, + flag, + layer); + BLI_assert(0); + return; + } - if (type != BMW_CUSTOM) { - walker->begin_htype = bm_walker_types[type]->begin_htype; - walker->begin = bm_walker_types[type]->begin; - walker->yield = bm_walker_types[type]->yield; - walker->step = bm_walker_types[type]->step; - walker->structsize = bm_walker_types[type]->structsize; - walker->order = bm_walker_types[type]->order; - walker->valid_mask = bm_walker_types[type]->valid_mask; + if (type != BMW_CUSTOM) { + walker->begin_htype = bm_walker_types[type]->begin_htype; + walker->begin = bm_walker_types[type]->begin; + walker->yield = bm_walker_types[type]->yield; + walker->step = bm_walker_types[type]->step; + walker->structsize = bm_walker_types[type]->structsize; + walker->order = bm_walker_types[type]->order; + walker->valid_mask = bm_walker_types[type]->valid_mask; - /* safety checks */ - /* if this raises an error either the caller is wrong or - * 'bm_walker_types' needs updating */ - BLI_assert(mask_vert == 0 || (walker->valid_mask & BM_VERT)); - BLI_assert(mask_edge == 0 || (walker->valid_mask & BM_EDGE)); - BLI_assert(mask_face == 0 || (walker->valid_mask & BM_FACE)); - } + /* safety checks */ + /* if this raises an error either the caller is wrong or + * 'bm_walker_types' needs updating */ + BLI_assert(mask_vert == 0 || (walker->valid_mask & BM_VERT)); + BLI_assert(mask_edge == 0 || (walker->valid_mask & BM_EDGE)); + BLI_assert(mask_face == 0 || (walker->valid_mask & BM_FACE)); + } - walker->worklist = BLI_mempool_create(walker->structsize, 0, 128, BLI_MEMPOOL_NOP); - BLI_listbase_clear(&walker->states); + walker->worklist = BLI_mempool_create(walker->structsize, 0, 128, BLI_MEMPOOL_NOP); + BLI_listbase_clear(&walker->states); } /** @@ -124,22 +133,21 @@ void BMW_init( */ void BMW_end(BMWalker *walker) { - BLI_mempool_destroy(walker->worklist); - BLI_gset_free(walker->visit_set, NULL); - BLI_gset_free(walker->visit_set_alt, NULL); + BLI_mempool_destroy(walker->worklist); + BLI_gset_free(walker->visit_set, NULL); + BLI_gset_free(walker->visit_set_alt, NULL); } - /** * \brief Step Walker */ void *BMW_step(BMWalker *walker) { - BMHeader *head; + BMHeader *head; - head = BMW_walk(walker); + head = BMW_walk(walker); - return head; + return head; } /** @@ -150,7 +158,7 @@ void *BMW_step(BMWalker *walker) int BMW_current_depth(BMWalker *walker) { - return walker->depth; + return walker->depth; } /** @@ -160,15 +168,15 @@ int BMW_current_depth(BMWalker *walker) */ void *BMW_walk(BMWalker *walker) { - void *current = NULL; + void *current = NULL; - while (BMW_current_state(walker)) { - current = walker->step(walker); - if (current) { - return current; - } - } - return NULL; + while (BMW_current_state(walker)) { + current = walker->step(walker); + if (current) { + return current; + } + } + return NULL; } /** @@ -180,21 +188,21 @@ void *BMW_walk(BMWalker *walker) */ void *BMW_current_state(BMWalker *walker) { - BMwGenericWalker *currentstate = walker->states.first; - if (currentstate) { - /* Automatic update of depth. For most walkers that - * follow the standard "Step" pattern of: - * - read current state - * - remove current state - * - push new states - * - return walk result from just-removed current state - * this simple automatic update should keep track of depth - * just fine. Walkers that deviate from that pattern may - * need to manually update the depth if they care about - * keeping it correct. */ - walker->depth = currentstate->depth + 1; - } - return currentstate; + BMwGenericWalker *currentstate = walker->states.first; + if (currentstate) { + /* Automatic update of depth. For most walkers that + * follow the standard "Step" pattern of: + * - read current state + * - remove current state + * - push new states + * - return walk result from just-removed current state + * this simple automatic update should keep track of depth + * just fine. Walkers that deviate from that pattern may + * need to manually update the depth if they care about + * keeping it correct. */ + walker->depth = currentstate->depth + 1; + } + return currentstate; } /** @@ -205,10 +213,10 @@ void *BMW_current_state(BMWalker *walker) */ void BMW_state_remove(BMWalker *walker) { - void *oldstate; - oldstate = BMW_current_state(walker); - BLI_remlink(&walker->states, oldstate); - BLI_mempool_free(walker->worklist, oldstate); + void *oldstate; + oldstate = BMW_current_state(walker); + BLI_remlink(&walker->states, oldstate); + BLI_mempool_free(walker->worklist, oldstate); } /** @@ -222,21 +230,21 @@ void BMW_state_remove(BMWalker *walker) */ void *BMW_state_add(BMWalker *walker) { - BMwGenericWalker *newstate; - newstate = BLI_mempool_alloc(walker->worklist); - newstate->depth = walker->depth; - switch (walker->order) { - case BMW_DEPTH_FIRST: - BLI_addhead(&walker->states, newstate); - break; - case BMW_BREADTH_FIRST: - BLI_addtail(&walker->states, newstate); - break; - default: - BLI_assert(0); - break; - } - return newstate; + BMwGenericWalker *newstate; + newstate = BLI_mempool_alloc(walker->worklist); + newstate->depth = walker->depth; + switch (walker->order) { + case BMW_DEPTH_FIRST: + BLI_addhead(&walker->states, newstate); + break; + case BMW_BREADTH_FIRST: + BLI_addtail(&walker->states, newstate); + break; + default: + BLI_assert(0); + break; + } + return newstate; } /** @@ -247,10 +255,10 @@ void *BMW_state_add(BMWalker *walker) */ void BMW_reset(BMWalker *walker) { - while (BMW_current_state(walker)) { - BMW_state_remove(walker); - } - walker->depth = 0; - BLI_gset_clear(walker->visit_set, NULL); - BLI_gset_clear(walker->visit_set_alt, NULL); + while (BMW_current_state(walker)) { + BMW_state_remove(walker); + } + walker->depth = 0; + BLI_gset_clear(walker->visit_set, NULL); + BLI_gset_clear(walker->visit_set_alt, NULL); } |