diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 16:46:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 16:48:51 +0300 |
commit | 109cbdf2e1b609e93270100239906a8e17c64ab5 (patch) | |
tree | 821504319da91e5a5dea1ebaf64978560468288e /source/blender/editors/mesh | |
parent | e8777a729013d04dcb854b0b9f327e9b90191747 (diff) |
Cleanup: use BLI_kdtree_3d prefix
Use prefix now there isn't only the 3d version.
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r-- | source/blender/editors/mesh/editmesh_select_similar.c | 54 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 12 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_mirror.c | 14 |
3 files changed, 40 insertions, 40 deletions
diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index 299db63eca3..59c34578777 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -183,7 +183,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - KDTree *tree = NULL; + KDTree_3d *tree = NULL; KDTree_4d *tree_plane = NULL; GSet *gset = NULL; GSet **gset_array = NULL; @@ -193,7 +193,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) case SIMFACE_AREA: case SIMFACE_PERIMETER: case SIMFACE_NORMAL: - tree = BLI_kdtree_new(tot_faces_selected_all); + tree = BLI_kdtree_3d_new(tot_faces_selected_all); break; case SIMFACE_COPLANAR: tree_plane = BLI_kdtree_4d_new(tot_faces_selected_all); @@ -273,14 +273,14 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) { float area = BM_face_calc_area_with_mat3(face, ob_m3); float dummy[3] = {area, 0.0f, 0.0f}; - BLI_kdtree_insert(tree, tree_index++, dummy); + BLI_kdtree_3d_insert(tree, tree_index++, dummy); break; } case SIMFACE_PERIMETER: { float perimeter = BM_face_calc_perimeter_with_mat3(face, ob_m3); float dummy[3] = {perimeter, 0.0f, 0.0f}; - BLI_kdtree_insert(tree, tree_index++, dummy); + BLI_kdtree_3d_insert(tree, tree_index++, dummy); break; } case SIMFACE_NORMAL: @@ -290,7 +290,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) mul_transposed_mat3_m4_v3(ob->imat, normal); normalize_v3(normal); - BLI_kdtree_insert(tree, tree_index++, normal); + BLI_kdtree_3d_insert(tree, tree_index++, normal); break; } case SIMFACE_COPLANAR: @@ -337,7 +337,7 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) BLI_assert((type != SIMFACE_FREESTYLE) || (face_data_value != SIMFACE_DATA_NONE)); if (tree != NULL) { - BLI_kdtree_balance(tree); + BLI_kdtree_3d_balance(tree); } if (tree_plane != NULL) { BLI_kdtree_4d_balance(tree_plane); @@ -446,8 +446,8 @@ static int similar_face_select_exec(bContext *C, wmOperator *op) /* We are treating the normals as coordinates, the "nearest" one will * also be the one closest to the angle. */ - KDTreeNearest nearest; - if (BLI_kdtree_find_nearest(tree, normal, &nearest) != -1) { + KDTreeNearest_3d nearest; + if (BLI_kdtree_3d_find_nearest(tree, normal, &nearest) != -1) { if (angle_normalized_v3v3(normal, nearest.co) <= thresh_radians) { select = true; } @@ -550,7 +550,7 @@ face_select_all: } MEM_freeN(objects); - BLI_kdtree_free(tree); + BLI_kdtree_3d_free(tree); BLI_kdtree_4d_free(tree_plane); if (gset != NULL) { BLI_gset_free(gset, NULL); @@ -671,7 +671,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - KDTree *tree = NULL; + KDTree_3d *tree = NULL; GSet *gset = NULL; int edge_data_value = SIMEDGE_DATA_NONE; @@ -681,7 +681,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) case SIMEDGE_FACE_ANGLE: case SIMEDGE_LENGTH: case SIMEDGE_DIR: - tree = BLI_kdtree_new(tot_edges_selected_all); + tree = BLI_kdtree_3d_new(tot_edges_selected_all); break; case SIMEDGE_FACE: gset = BLI_gset_ptr_new("Select similar edge: face"); @@ -721,7 +721,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) { if (!CustomData_has_layer(&bm->edata, custom_data_type)) { float dummy[3] = {0.0f, 0.0f, 0.0f}; - BLI_kdtree_insert(tree, tree_index++, dummy); + BLI_kdtree_3d_insert(tree, tree_index++, dummy); continue; } break; @@ -745,14 +745,14 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) { float dir[3]; edge_pos_direction_worldspace_get(ob, edge, dir); - BLI_kdtree_insert(tree, tree_index++, dir); + BLI_kdtree_3d_insert(tree, tree_index++, dir); break; } case SIMEDGE_LENGTH: { float length = edge_length_squared_worldspace_get(ob, edge); float dummy[3] = {length, 0.0f, 0.0f}; - BLI_kdtree_insert(tree, tree_index++, dummy); + BLI_kdtree_3d_insert(tree, tree_index++, dummy); break; } case SIMEDGE_FACE_ANGLE: @@ -760,7 +760,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) if (BM_edge_face_count_at_most(edge, 2) == 2) { float angle = BM_edge_calc_face_angle_with_imat3(edge, ob_m3_inv); float dummy[3] = {angle, 0.0f, 0.0f}; - BLI_kdtree_insert(tree, tree_index++, dummy); + BLI_kdtree_3d_insert(tree, tree_index++, dummy); } break; } @@ -794,7 +794,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) { const float *value = CustomData_bmesh_get(&bm->edata, edge->head.data, custom_data_type); float dummy[3] = {*value, 0.0f, 0.0f}; - BLI_kdtree_insert(tree, tree_index++, dummy); + BLI_kdtree_3d_insert(tree, tree_index++, dummy); break; } } @@ -805,7 +805,7 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) BLI_assert((type != SIMEDGE_FREESTYLE) || (edge_data_value != SIMEDGE_DATA_NONE)); if (tree != NULL) { - BLI_kdtree_balance(tree); + BLI_kdtree_3d_balance(tree); } for (uint ob_index = 0; ob_index < objects_len; ob_index++) { @@ -873,8 +873,8 @@ static int similar_edge_select_exec(bContext *C, wmOperator *op) /* We are treating the direction as coordinates, the "nearest" one will * also be the one closest to the intended direction. */ - KDTreeNearest nearest; - if (BLI_kdtree_find_nearest(tree, dir, &nearest) != -1) { + KDTreeNearest_3d nearest; + if (BLI_kdtree_3d_find_nearest(tree, dir, &nearest) != -1) { if (angle_normalized_v3v3(dir, nearest.co) <= thresh_radians) { select = true; } @@ -987,7 +987,7 @@ edge_select_all: } MEM_freeN(objects); - BLI_kdtree_free(tree); + BLI_kdtree_3d_free(tree); if (gset != NULL) { BLI_gset_free(gset, NULL); } @@ -1026,12 +1026,12 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - KDTree *tree = NULL; + KDTree_3d *tree = NULL; GSet *gset = NULL; switch (type) { case SIMVERT_NORMAL: - tree = BLI_kdtree_new(tot_verts_selected_all); + tree = BLI_kdtree_3d_new(tot_verts_selected_all); break; case SIMVERT_EDGE: case SIMVERT_FACE: @@ -1081,7 +1081,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) mul_transposed_mat3_m4_v3(ob->imat, normal); normalize_v3(normal); - BLI_kdtree_insert(tree, normal_tree_index++, normal); + BLI_kdtree_3d_insert(tree, normal_tree_index++, normal); break; } case SIMVERT_VGROUP: @@ -1123,7 +1123,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) /* Remove duplicated entries. */ if (tree != NULL) { - BLI_kdtree_balance(tree); + BLI_kdtree_3d_balance(tree); } /* Run .the BM operators. */ @@ -1204,8 +1204,8 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) /* We are treating the normals as coordinates, the "nearest" one will * also be the one closest to the angle. */ - KDTreeNearest nearest; - if (BLI_kdtree_find_nearest(tree, normal, &nearest) != -1) { + KDTreeNearest_3d nearest; + if (BLI_kdtree_3d_find_nearest(tree, normal, &nearest) != -1) { if (angle_normalized_v3v3(normal, nearest.co) <= thresh_radians) { select = true; } @@ -1243,7 +1243,7 @@ static int similar_vert_select_exec(bContext *C, wmOperator *op) } MEM_freeN(objects); - BLI_kdtree_free(tree); + BLI_kdtree_3d_free(tree); if (gset != NULL) { BLI_gset_free(gset, NULL); } diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index ed6ab38e5ab..68a2f382278 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -1006,7 +1006,7 @@ void EDBM_verts_mirror_cache_begin_ex( const float maxdist_sq = SQUARE(maxdist); /* one or the other is used depending if topo is enabled */ - KDTree *tree = NULL; + KDTree_3d *tree = NULL; MirrTopoStore_t mesh_topo_store = {NULL, -1, -1, -1}; BM_mesh_elem_table_ensure(bm, BM_VERT); @@ -1032,11 +1032,11 @@ void EDBM_verts_mirror_cache_begin_ex( ED_mesh_mirrtopo_init(me, NULL, &mesh_topo_store, true); } else { - tree = BLI_kdtree_new(bm->totvert); + tree = BLI_kdtree_3d_new(bm->totvert); BM_ITER_MESH_INDEX (v, &iter, bm, BM_VERTS_OF_MESH, i) { - BLI_kdtree_insert(tree, i, v->co); + BLI_kdtree_3d_insert(tree, i, v->co); } - BLI_kdtree_balance(tree); + BLI_kdtree_3d_balance(tree); } #define VERT_INTPTR(_v, _i) r_index ? &r_index[_i] : BM_ELEM_CD_GET_VOID_P(_v, cd_vmirr_offset); @@ -1062,7 +1062,7 @@ void EDBM_verts_mirror_cache_begin_ex( co[axis] *= -1.0f; v_mirr = NULL; - i_mirr = BLI_kdtree_find_nearest(tree, co, NULL); + i_mirr = BLI_kdtree_3d_find_nearest(tree, co, NULL); if (i_mirr != -1) { BMVert *v_test = BM_vert_at_index(bm, i_mirr); if (len_squared_v3v3(co, v_test->co) < maxdist_sq) { @@ -1090,7 +1090,7 @@ void EDBM_verts_mirror_cache_begin_ex( ED_mesh_mirrtopo_free(&mesh_topo_store); } else { - BLI_kdtree_free(tree); + BLI_kdtree_3d_free(tree); } } diff --git a/source/blender/editors/mesh/mesh_mirror.c b/source/blender/editors/mesh/mesh_mirror.c index 3d49d874503..a1859bf70b0 100644 --- a/source/blender/editors/mesh/mesh_mirror.c +++ b/source/blender/editors/mesh/mesh_mirror.c @@ -51,8 +51,8 @@ int ED_mesh_mirror_spatial_table(Object *ob, BMEditMesh *em, Mesh *me_eval, cons ED_mesh_mirror_spatial_table(ob, em, me_eval, NULL, 's'); if (MirrKdStore.tree) { - KDTreeNearest nearest; - const int i = BLI_kdtree_find_nearest(MirrKdStore.tree, co, &nearest); + KDTreeNearest_3d nearest; + const int i = BLI_kdtree_3d_find_nearest(MirrKdStore.tree, co, &nearest); if (i != -1) { if (nearest.dist < KD_THRESH) { @@ -70,7 +70,7 @@ int ED_mesh_mirror_spatial_table(Object *ob, BMEditMesh *em, Mesh *me_eval, cons if (MirrKdStore.tree) /* happens when entering this call without ending it */ ED_mesh_mirror_spatial_table(ob, em, me_eval, co, 'e'); - MirrKdStore.tree = BLI_kdtree_new(totvert); + MirrKdStore.tree = BLI_kdtree_3d_new(totvert); if (use_em) { BMVert *eve; @@ -81,7 +81,7 @@ int ED_mesh_mirror_spatial_table(Object *ob, BMEditMesh *em, Mesh *me_eval, cons BM_mesh_elem_table_ensure(em->bm, BM_VERT); BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, i) { - BLI_kdtree_insert(MirrKdStore.tree, i, eve->co); + BLI_kdtree_3d_insert(MirrKdStore.tree, i, eve->co); } } else { @@ -89,15 +89,15 @@ int ED_mesh_mirror_spatial_table(Object *ob, BMEditMesh *em, Mesh *me_eval, cons int i; for (i = 0; i < totvert; i++, mvert++) { - BLI_kdtree_insert(MirrKdStore.tree, i, mvert->co); + BLI_kdtree_3d_insert(MirrKdStore.tree, i, mvert->co); } } - BLI_kdtree_balance(MirrKdStore.tree); + BLI_kdtree_3d_balance(MirrKdStore.tree); } else if (mode == 'e') { /* end table */ if (MirrKdStore.tree) { - BLI_kdtree_free(MirrKdStore.tree); + BLI_kdtree_3d_free(MirrKdStore.tree); MirrKdStore.tree = NULL; } } |