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

BMesh: slight speedup loop-of-verts iterator

Browse Source
This commit is contained in:
Campbell Barton
2014-09-24 18:45:23 +10:00
parent 3c0605c0ef
commit ff0b24c4e2
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/bmesh/intern/bmesh_structure.c
View File

@@ -108,6 +108,7 @@ bool bmesh_edge_swapverts(BMEdge *e, BMVert *v_orig, BMVert *v_new)
* - #bmesh_radial_append * - #bmesh_radial_append
* - #bmesh_radial_loop_remove * - #bmesh_radial_loop_remove
* - #bmesh_radial_facevert_count * - #bmesh_radial_facevert_count
* - #bmesh_radial_facevert_check
* - #bmesh_radial_faceloop_find_first * - #bmesh_radial_faceloop_find_first
* - #bmesh_radial_faceloop_find_next * - #bmesh_radial_faceloop_find_next
* - #bmesh_radial_validate * - #bmesh_radial_validate
@@ -265,7 +266,7 @@ BMEdge *bmesh_disk_faceedge_find_first(const BMEdge *e, const BMVert *v)
{ {
const BMEdge *e_find = e; const BMEdge *e_find = e;
do { do {
if (e_find->l && bmesh_radial_facevert_count(e_find->l, v)) { if (e_find->l && bmesh_radial_facevert_check(e_find->l, v)) {
return (BMEdge *)e_find; return (BMEdge *)e_find;
} }
} while ((e_find = bmesh_disk_edge_next(e_find, v)) != e); } while ((e_find = bmesh_disk_edge_next(e_find, v)) != e);
@@ -275,10 +276,10 @@ BMEdge *bmesh_disk_faceedge_find_first(const BMEdge *e, const BMVert *v)
BMEdge *bmesh_disk_faceedge_find_next(const BMEdge *e, const BMVert *v) BMEdge *bmesh_disk_faceedge_find_next(const BMEdge *e, const BMVert *v)
{ {
BMEdge *e_find = NULL; BMEdge *e_find;
e_find = bmesh_disk_edge_next(e, v); e_find = bmesh_disk_edge_next(e, v);
do { do {
if (e_find->l && bmesh_radial_facevert_count(e_find->l, v)) { if (e_find->l && bmesh_radial_facevert_check(e_find->l, v)) {
return e_find; return e_find;
} }
} while ((e_find = bmesh_disk_edge_next(e_find, v)) != e); } while ((e_find = bmesh_disk_edge_next(e_find, v)) != e);
@@ -455,6 +456,24 @@ int bmesh_radial_facevert_count(const BMLoop *l, const BMVert *v)
return count; return count;
} }
/**
* \brief RADIAL CHECK FACE VERT
*
* Quicker check for ``bmesh_radial_facevert_count(...) != 0``
*/
bool bmesh_radial_facevert_check(const BMLoop *l, const BMVert *v)
{
const BMLoop *l_iter;
l_iter = l;
do {
if (l_iter->v == v) {
return true;
}
} while ((l_iter = l_iter->radial_next) != l);
return false;
}
/*****loop cycle functions, e.g. loops surrounding a face**** */ /*****loop cycle functions, e.g. loops surrounding a face**** */
bool bmesh_loop_validate(BMFace *f) bool bmesh_loop_validate(BMFace *f)
{ {

1
source/blender/bmesh/intern/bmesh_structure.h
View File

@@ -61,6 +61,7 @@ void bmesh_radial_loop_remove(BMLoop *l, BMEdge *e) ATTR_NONNULL(1);
* just use member access l->radial_next, l->radial_prev now */ * just use member access l->radial_next, l->radial_prev now */
int bmesh_radial_facevert_count(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); int bmesh_radial_facevert_count(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
bool bmesh_radial_facevert_check(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
BMLoop *bmesh_radial_faceloop_find_first(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMLoop *bmesh_radial_faceloop_find_first(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
BMLoop *bmesh_radial_faceloop_find_next(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMLoop *bmesh_radial_faceloop_find_next(const BMLoop *l, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
BMLoop *bmesh_radial_faceloop_find_vert(const BMFace *f, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); BMLoop *bmesh_radial_faceloop_find_vert(const BMFace *f, const BMVert *v) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();