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

minor speedup for dyntopo edge queue - replace iterator with while loop.

Browse Source
This commit is contained in:
Campbell Barton
2013-01-16 23:20:09 +00:00
parent d6c4d2a415
commit 93b58752d2
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -505,36 +505,34 @@ static void short_edge_queue_edge_add(EdgeQueue *q, BLI_mempool *pool,
edge_queue_insert(q, pool, e, len_sq); edge_queue_insert(q, pool, e, len_sq);
} }
static int long_edge_queue_face_add(EdgeQueue *q, BLI_mempool *pool, static void long_edge_queue_face_add(EdgeQueue *q, BLI_mempool *pool,
BMFace *f) BMFace *f)
{ {
BMIter bm_iter;
BMEdge *e;
if (edge_queue_tri_in_sphere(q, f)) { if (edge_queue_tri_in_sphere(q, f)) {
/* Check each edge of the face */ BMLoop *l_iter;
BM_ITER_ELEM (e, &bm_iter, f, BM_EDGES_OF_FACE) { BMLoop *l_first;
long_edge_queue_edge_add(q, pool, e);
}
}
return TRUE; /* Check each edge of the face */
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
do {
long_edge_queue_edge_add(q, pool, l_iter->e);
} while ((l_iter = l_iter->next) != l_first);
}
} }
static int short_edge_queue_face_add(EdgeQueue *q, BLI_mempool *pool, static void short_edge_queue_face_add(EdgeQueue *q, BLI_mempool *pool,
BMFace *f) BMFace *f)
{ {
BMIter bm_iter;
BMEdge *e;
if (edge_queue_tri_in_sphere(q, f)) { if (edge_queue_tri_in_sphere(q, f)) {
/* Check each edge of the face */ BMLoop *l_iter;
BM_ITER_ELEM (e, &bm_iter, f, BM_EDGES_OF_FACE) { BMLoop *l_first;
short_edge_queue_edge_add(q, pool, e);
}
}
return TRUE; /* Check each edge of the face */
l_iter = l_first = BM_FACE_FIRST_LOOP(f);
do {
short_edge_queue_edge_add(q, pool, l_iter->e);
} while ((l_iter = l_iter->next) != l_first);
}
} }
/* Create a priority queue containing vertex pairs connected by a long /* Create a priority queue containing vertex pairs connected by a long
@@ -814,7 +812,7 @@ static void pbvh_bmesh_collapse_edge(PBVH *bvh, BMEdge *e, BMVert *v1,
BM_face_as_array_vert_tri(f_del, v_tri); BM_face_as_array_vert_tri(f_del, v_tri);
/* Check if any of the face's vertices are now unused, if so /* Check if any of the face's vertices are now unused, if so
remove them from the PBVH */ * remove them from the PBVH */
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
if (v_tri[j] != v2 && BM_vert_face_count(v_tri[j]) == 1) { if (v_tri[j] != v2 && BM_vert_face_count(v_tri[j]) == 1) {
BLI_ghash_insert(deleted_verts, v_tri[j], NULL); BLI_ghash_insert(deleted_verts, v_tri[j], NULL);