diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2018-11-05 19:14:40 +0300 |
|---|---|---|
| committer | Alexander Gavrilov <angavrilov@gmail.com> | 2018-11-05 20:49:17 +0300 |
| commit | fee6ab18e7e9a38203bf8eb95d114ac837578aa7 (patch) | |
| tree | 8dc1830ce6dabf781e8d0c2d709db76fab1fd1b9 /source/blender/editors/mesh/editmesh_tools.c | |
| parent | a120b120ce380017324e982c2277cb8fca52f39d (diff) | |
BLI_heap: implement a limited but faster version of heap.
If the user only needs insertion and removal from top, there is
no need to allocate and manage separate HeapNode objects: the
data can be stored directly in the main tree array.
This measured a 24% FPS increase on a ~50% heap-heavy workload.
Reviewers: brecht
Differential Revision: https://developer.blender.org/D3898
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index b16195023c9..71dbdfdbfb2 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7818,7 +7818,7 @@ static int edbm_average_normals_exec(bContext *C, wmOperator *op) BM_normals_loops_edges_tag(bm, true); - Heap *loop_weight = BLI_heap_new(); + FastHeap *loop_weight = BLI_fastheap_new(); BM_ITER_MESH(f, &fiter, bm, BM_FACES_OF_MESH) { l_curr = l_first = BM_FACE_FIRST_LOOP(f); @@ -7858,7 +7858,7 @@ static int edbm_average_normals_exec(bContext *C, wmOperator *op) val = 1.0f / BM_loop_calc_face_angle(lfan_pivot); } - BLI_heap_insert(loop_weight, val, lfan_pivot); + BLI_fastheap_insert(loop_weight, val, lfan_pivot); if (!BM_elem_flag_test(e_next, BM_ELEM_TAG) || (e_next == e_org)) { break; @@ -7868,15 +7868,15 @@ static int edbm_average_normals_exec(bContext *C, wmOperator *op) BLI_SMALLSTACK_DECLARE(loops, BMLoop *); float wnor[3], avg_normal[3] = { 0.0f }, count = 0; - float val = BLI_heap_top_value(loop_weight); + float val = BLI_fastheap_top_value(loop_weight); - while (!BLI_heap_is_empty(loop_weight)) { - const float cur_val = BLI_heap_top_value(loop_weight); + while (!BLI_fastheap_is_empty(loop_weight)) { + const float cur_val = BLI_fastheap_top_value(loop_weight); if (!compare_ff(val, cur_val, threshold)) { count++; val = cur_val; } - l = BLI_heap_pop_min(loop_weight); + l = BLI_fastheap_pop_min(loop_weight); BLI_SMALLSTACK_PUSH(loops, l); const float n_weight = pow(weight, count); @@ -7907,7 +7907,7 @@ static int edbm_average_normals_exec(bContext *C, wmOperator *op) } while ((l_curr = l_curr->next) != l_first); } - BLI_heap_free(loop_weight, NULL); + BLI_fastheap_free(loop_weight, NULL); EDBM_update_generic(em, true, false); return OPERATOR_FINISHED; |