[Bf-blender-cvs] [c2c11de] master: BMesh: simplify calculating grid edge loops
Campbell Barton
noreply at git.blender.org
Wed Nov 18 11:47:21 CET 2015
Commit: c2c11debe5abf52afa46b99c6dc6a5acd12d97ae
Author: Campbell Barton
Date: Wed Nov 18 17:22:00 2015 +1100
Branches: master
https://developer.blender.org/rBc2c11debe5abf52afa46b99c6dc6a5acd12d97ae
BMesh: simplify calculating grid edge loops
===================================================================
M source/blender/bmesh/operators/bmo_fill_grid.c
===================================================================
diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c
index fd1e91a..0146453 100644
--- a/source/blender/bmesh/operators/bmo_fill_grid.c
+++ b/source/blender/bmesh/operators/bmo_fill_grid.c
@@ -569,6 +569,20 @@ static void bm_grid_fill(
#undef USE_FLIP_DETECT
}
+static void bm_edgeloop_flag_set(struct BMEdgeLoopStore *estore, char hflag, bool set)
+{
+ /* only handle closed loops in this case */
+ LinkData *link = BM_edgeloop_verts_get(estore)->first;
+ link = link->next;
+ while (link) {
+ BMEdge *e = BM_edge_exists(link->data, link->prev->data);
+ if (e) {
+ BM_elem_flag_set(e, hflag, set);
+ }
+ link = link->next;
+ }
+}
+
static bool bm_edge_test_cb(BMEdge *e, void *bm_v)
{
return BMO_elem_flag_test_bool((BMesh *)bm_v, e, EDGE_MARK);
@@ -630,48 +644,40 @@ void bmo_grid_fill_exec(BMesh *bm, BMOperator *op)
/* ok. all error checking done, now we can find the rail edges */
- if (BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, bm, v_a_first, v_b_first) == false) {
- BMO_error_raise(bm, op, BMERR_INVALID_SELECTION,
- "Loops are not connected by wire/boundary edges");
- goto cleanup;
- }
- /* We may find a first path, but not a second one! See geometry attached to bug [#37388]. */
- if (BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, bm, v_a_first, v_b_last) == false) {
- BMO_error_raise(bm, op, BMERR_INVALID_SELECTION,
- "Loops are not connected by wire/boundary edges");
- goto cleanup;
+ /* cheat here, temp hide all edges so they won't be included in rails
+ * this puts the mesh in an invalid state for a short time. */
+ bm_edgeloop_flag_set(estore_a, BM_ELEM_HIDDEN, true);
+ bm_edgeloop_flag_set(estore_b, BM_ELEM_HIDDEN, true);
+
+ if ((BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, bm, v_a_first, v_b_first)) &&
+ (BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, bm, v_a_last, v_b_last)))
+ {
+ estore_rail_a = eloops_rail.first;
+ estore_rail_b = eloops_rail.last;
}
+ else {
+ BM_mesh_edgeloops_free(&eloops_rail);
- /* Check flipping by comparing path length */
- estore_rail_a = eloops_rail.first;
- estore_rail_b = eloops_rail.last;
+ if ((BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, bm, v_a_first, v_b_last)) &&
+ (BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, bm, v_a_last, v_b_first)))
+ {
+ estore_rail_a = eloops_rail.first;
+ estore_rail_b = eloops_rail.last;
+ }
+ else {
+ BM_mesh_edgeloops_free(&eloops_rail);
+ }
+ }
- BLI_assert(BM_edgeloop_length_get(estore_rail_a) != BM_edgeloop_length_get(estore_rail_b));
+ bm_edgeloop_flag_set(estore_a, BM_ELEM_HIDDEN, false);
+ bm_edgeloop_flag_set(estore_b, BM_ELEM_HIDDEN, false);
- if (BM_edgeloop_length_get(estore_rail_a) < BM_edgeloop_length_get(estore_rail_b)) {
- BLI_remlink(&eloops_rail, estore_rail_b);
- BM_edgeloop_free(estore_rail_b);
- estore_rail_b = NULL;
- BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, (void *)bm,
- v_a_last,
- v_b_last);
- estore_rail_b = eloops_rail.last;
- }
- else { /* a > b */
- BLI_remlink(&eloops_rail, estore_rail_a);
- BM_edgeloop_free(estore_rail_a);
- estore_rail_a = estore_rail_b;
-
- /* reverse so both are sorted the same way */
- BM_edgeloop_flip(bm, estore_b);
- SWAP(BMVert *, v_b_first, v_b_last);
-
- BM_mesh_edgeloops_find_path(bm, &eloops_rail, bm_edge_test_rail_cb, (void *)bm,
- v_a_last,
- v_b_last);
- estore_rail_b = eloops_rail.last;
+ if (BLI_listbase_is_empty(&eloops_rail)) {
+ BMO_error_raise(bm, op, BMERR_INVALID_SELECTION,
+ "Loops are not connected by wire/boundary edges");
+ goto cleanup;
}
BLI_assert(estore_a != estore_b);
More information about the Bf-blender-cvs
mailing list