blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Fix T52748: Select shortest face path fails

This commit is contained in:
Campbell Barton 2017-09-14 22:56:48 +10:00
parent 7aafa32c09
commit 8c21003248
Notes: blender-bot 2023-02-14 06:34:45 +01:00 
Referenced by issue #53683, 2.79a release
Referenced by issue #52748, path select fails in select the short path.
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
source/blender/bmesh/tools/bmesh_path.c
View File

@ -38,7 +38,12 @@
/* -------------------------------------------------------------------- */
/* Generic Helpers */
static float step_cost_3_v3(const float v1[3], const float v2[3], const float v3[3])
/**
* Use skip options when we want to start measuring from a boundary.
*/
static float step_cost_3_v3_ex(
const float v1[3], const float v2[3], const float v3[3],
bool skip_12, bool skip_23)
{
float cost, d1[3], d2[3];
@ -46,7 +51,8 @@ static float step_cost_3_v3(const float v1[3], const float v2[3], const float v3
/* The cost is based on the simple sum of the length of the two edgees... */
sub_v3_v3v3(d1, v2, v1);
sub_v3_v3v3(d2, v3, v2);
cost = normalize_v3(d1) + normalize_v3(d2);
cost = ((skip_12 ? 0.0f : normalize_v3(d1)) +
(skip_23 ? 0.0f : normalize_v3(d2)));
/* but is biased to give higher values to sharp turns, so that it will take
* paths with fewer "turns" when selecting between equal-weighted paths between
@ -56,6 +62,11 @@ static float step_cost_3_v3(const float v1[3], const float v2[3], const float v3
return cost;
}
static float step_cost_3_v3(
const float v1[3], const float v2[3], const float v3[3])
{
return step_cost_3_v3_ex(v1, v2, v3, false, false);
}
/* -------------------------------------------------------------------- */
@ -364,7 +375,7 @@ LinkNode *BM_mesh_calc_path_edge(
/* -------------------------------------------------------------------- */
/* BM_mesh_calc_path_face */
static float facetag_cut_cost_edge(BMFace *f_a, BMFace *f_b, BMEdge *e)
static float facetag_cut_cost_edge(BMFace *f_a, BMFace *f_b, BMEdge *e, const void * const f_endpoints[2])
{
float f_a_cent[3];
float f_b_cent[3];
@ -392,10 +403,12 @@ static float facetag_cut_cost_edge(BMFace *f_a, BMFace *f_b, BMEdge *e)
}
#endif
return step_cost_3_v3(f_a_cent, e_cent, f_b_cent);
return step_cost_3_v3_ex(
f_a_cent, e_cent, f_b_cent,
(f_a == f_endpoints[0]), (f_b == f_endpoints[1]));
}
static float facetag_cut_cost_vert(BMFace *f_a, BMFace *f_b, BMVert *v)
static float facetag_cut_cost_vert(BMFace *f_a, BMFace *f_b, BMVert *v, const void * const f_endpoints[2])
{
float f_a_cent[3];
float f_b_cent[3];
@ -403,12 +416,14 @@ static float facetag_cut_cost_vert(BMFace *f_a, BMFace *f_b, BMVert *v)
BM_face_calc_center_mean_weighted(f_a, f_a_cent);
BM_face_calc_center_mean_weighted(f_b, f_b_cent);
return step_cost_3_v3(f_a_cent, v->co, f_b_cent);
return step_cost_3_v3_ex(
f_a_cent, v->co, f_b_cent,
(f_a == f_endpoints[0]), (f_b == f_endpoints[1]));
}
static void facetag_add_adjacent(
Heap *heap, BMFace *f_a, BMFace **faces_prev, float *cost,
const struct BMCalcPathParams *params)
const void * const f_endpoints[2], const struct BMCalcPathParams *params)
{
const int f_a_index = BM_elem_index_get(f_a);
@ -427,7 +442,7 @@ static void facetag_add_adjacent(
/* we know 'f_b' is not visited, check it out! */
const int f_b_index = BM_elem_index_get(f_b);
const float cost_cut = params->use_topology_distance ?
1.0f : facetag_cut_cost_edge(f_a, f_b, l_iter->e);
1.0f : facetag_cut_cost_edge(f_a, f_b, l_iter->e, f_endpoints);
const float cost_new = cost[f_a_index] + cost_cut;
if (cost[f_b_index] > cost_new) {
@ -454,7 +469,7 @@ static void facetag_add_adjacent(
/* we know 'f_b' is not visited, check it out! */
const int f_b_index = BM_elem_index_get(f_b);
const float cost_cut = params->use_topology_distance ?
1.0f : facetag_cut_cost_vert(f_a, f_b, l_a->v);
1.0f : facetag_cut_cost_vert(f_a, f_b, l_a->v, f_endpoints);
const float cost_new = cost[f_a_index] + cost_cut;
if (cost[f_b_index] > cost_new) {
@ -482,6 +497,9 @@ LinkNode *BM_mesh_calc_path_face(
BMFace **faces_prev;
int i, totface;
/* Start measuring face path at the face edges, ignoring their centers. */
const void * const f_endpoints[2] = {f_src, f_dst};
/* note, would pass BM_EDGE except we are looping over all faces anyway */
// BM_mesh_elem_index_ensure(bm, BM_VERT /* | BM_EDGE */); // NOT NEEDED FOR FACETAG
@ -522,7 +540,7 @@ LinkNode *BM_mesh_calc_path_face(
if (!BM_elem_flag_test(f, BM_ELEM_TAG)) {
BM_elem_flag_enable(f, BM_ELEM_TAG);
facetag_add_adjacent(heap, f, faces_prev, cost, params);
facetag_add_adjacent(heap, f, faces_prev, cost, f_endpoints, params);
}
}