griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BMesh: optimize lookups for triangle fill

Browse Source
This commit is contained in:
Campbell Barton
2014-02-02 17:09:38 +11:00
parent c4345a808c
commit b4ae05e4db
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/bmesh/operators/bmo_triangulate.c
View File

@@ -65,7 +65,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
BMEdge *e;
ScanFillContext sf_ctx;
/* ScanFillEdge *sf_edge; */ /* UNUSED */
ScanFillVert *sf_vert, *sf_vert_1, *sf_vert_2;
ScanFillVert *sf_vert_1, *sf_vert_2;
ScanFillFace *sf_tri;
SmallHash hash;
float normal[3], *normal_pt;
@@ -79,20 +79,19 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
BMO_ITER (e, &siter, op->slots_in, "edges", BM_EDGE) {
BMO_elem_flag_enable(bm, e, EDGE_MARK);
if (!BLI_smallhash_haskey(&hash, (uintptr_t)e->v1)) {
sf_vert = BLI_scanfill_vert_add(&sf_ctx, e->v1->co);
sf_vert->tmp.p = e->v1;
BLI_smallhash_insert(&hash, (uintptr_t)e->v1, sf_vert);
if ((sf_vert_1 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v1)) == NULL) {
sf_vert_1 = BLI_scanfill_vert_add(&sf_ctx, e->v1->co);
sf_vert_1->tmp.p = e->v1;
BLI_smallhash_insert(&hash, (uintptr_t)e->v1, sf_vert_1);
}
if (!BLI_smallhash_haskey(&hash, (uintptr_t)e->v2)) {
sf_vert = BLI_scanfill_vert_add(&sf_ctx, e->v2->co);
sf_vert->tmp.p = e->v2;
BLI_smallhash_insert(&hash, (uintptr_t)e->v2, sf_vert);
if ((sf_vert_2 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v2)) == NULL) {
sf_vert_2 = BLI_scanfill_vert_add(&sf_ctx, e->v2->co);
sf_vert_2->tmp.p = e->v2;
BLI_smallhash_insert(&hash, (uintptr_t)e->v2, sf_vert_2);
}
sf_vert_1 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v1);
sf_vert_2 = BLI_smallhash_lookup(&hash, (uintptr_t)e->v2);
/* sf_edge = */ BLI_scanfill_edge_add(&sf_ctx, sf_vert_1, sf_vert_2);
/* sf_edge->tmp.p = e; */ /* UNUSED */
}