Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BMesh API: optimize BM_edge_exists().

Browse Source
This commit is contained in:
Campbell Barton
2013-12-23 16:52:43 +11:00
parent 63a2cc2ab7
commit 133bc4b991
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/blender/bmesh/intern/bmesh_queries.c
View File

@@ -1327,26 +1327,56 @@ BMLoop *BM_face_find_longest_loop(BMFace *f)
} }
/** /**
* Returns the edge existing between v1 and v2, or NULL if there isn't one. * Returns the edge existing between \a v_a and \a v_b, or NULL if there isn't one.
* *
* \note multiple edges may exist between any two vertices, and therefore * \note multiple edges may exist between any two vertices, and therefore
* this function only returns the first one found. * this function only returns the first one found.
*/ */
BMEdge *BM_edge_exists(BMVert *v1, BMVert *v2) #if 0
BMEdge *BM_edge_exists(BMVert *v_a, BMVert *v_b)
{ {
BMIter iter; BMIter iter;
BMEdge *e; BMEdge *e;
BLI_assert(v1 != v2);
BLI_assert(v1->head.htype == BM_VERT && v2->head.htype == BM_VERT);
BM_ITER_ELEM (e, &iter, v1, BM_EDGES_OF_VERT) { BLI_assert(v_a != v_b);
if (e->v1 == v2 || e->v2 == v2) BLI_assert(v_a->head.htype == BM_VERT && v_b->head.htype == BM_VERT);
BM_ITER_ELEM (e, &iter, v_a, BM_EDGES_OF_VERT) {
if (e->v1 == v_b || e->v2 == v_b)
return e; return e;
} }
return NULL; return NULL;
} }
#else
BMEdge *BM_edge_exists(BMVert *v_a, BMVert *v_b)
{
/* speedup by looping over both edges verts
* where one vert may connect to many edges but not the other. */
BMEdge *e_a, *e_b;
BLI_assert(v_a != v_b);
BLI_assert(v_a->head.htype == BM_VERT && v_b->head.htype == BM_VERT);
if ((e_a = v_a->e) && (e_b = v_b->e)) {
BMEdge *e_a_iter = e_a, *e_b_iter = e_b;
do {
if (BM_vert_in_edge(e_a_iter, v_b)) {
return e_a_iter;
}
if (BM_vert_in_edge(e_b_iter, v_a)) {
return e_b_iter;
}
} while (((e_a_iter = bmesh_disk_edge_next(e_a_iter, v_a)) != e_a) &&
((e_b_iter = bmesh_disk_edge_next(e_b_iter, v_b)) != e_b));
}
return NULL;
}
#endif
/** /**
* Returns an edge sharing the same vertices as this one. * Returns an edge sharing the same vertices as this one.