[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56556] trunk/blender/source/blender/bmesh : add option to only beauty fill between vertices with non-matching tags,
Campbell Barton
ideasman42 at gmail.com
Wed May 8 14:56:41 CEST 2013
Revision: 56556
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56556
Author: campbellbarton
Date: 2013-05-08 12:56:41 +0000 (Wed, 08 May 2013)
Log Message:
-----------
add option to only beauty fill between vertices with non-matching tags,
useful for beauty filling the result of a bridge between 2 edge-loops.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/bmesh/operators/bmo_beautify.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2013-05-08 12:56:31 UTC (rev 56555)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2013-05-08 12:56:41 UTC (rev 56556)
@@ -1450,6 +1450,7 @@
/* slots_in */
{{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */
{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* edges that can be flipped */
+ {"use_restrict_tag", BMO_OP_SLOT_BOOL}, /* restrict edge rotation to mixed tagged vertices */
{{'\0'}},
},
/* slots_out */
Modified: trunk/blender/source/blender/bmesh/operators/bmo_beautify.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_beautify.c 2013-05-08 12:56:31 UTC (rev 56555)
+++ trunk/blender/source/blender/bmesh/operators/bmo_beautify.c 2013-05-08 12:56:41 UTC (rev 56556)
@@ -49,6 +49,10 @@
# include "PIL_time.h"
#endif
+enum {
+ VERT_RESTRICT_TAG = (1 << 0),
+};
+
/* -------------------------------------------------------------------- */
/* GHash for edge rotation */
@@ -129,7 +133,7 @@
/**
* \return a negative value means the edge can be rotated.
*/
-static float bm_edge_calc_rotate_beauty(const BMEdge *e)
+static float bm_edge_calc_rotate_beauty(const BMEdge *e, const int flag)
{
/* not a loop (only to be able to break out) */
do {
@@ -147,6 +151,13 @@
v3 = e->l->radial_next->prev->v->co; /* second face co */
v4 = e->l->next->v->co; /* e->v1 or e->v2*/
+ if (flag & VERT_RESTRICT_TAG) {
+ BMVert *v_a = e->l->prev->v, *v_b = e->l->radial_next->prev->v;
+ if (BM_elem_flag_test(v_a, BM_ELEM_TAG) == BM_elem_flag_test(v_b, BM_ELEM_TAG)) {
+ break;
+ }
+ }
+
if (UNLIKELY(v1 == v3)) {
// printf("This should never happen, but does sometimes!\n");
break;
@@ -225,7 +236,8 @@
/* Update the edge cost of rotation in the heap */
/* recalc an edge in the heap (surrounding geometry has changed) */
-static void bm_edge_update_beauty_cost_single(BMEdge *e, Heap *eheap, HeapNode **eheap_table, GHash **edge_state_arr)
+static void bm_edge_update_beauty_cost_single(BMEdge *e, Heap *eheap, HeapNode **eheap_table, GHash **edge_state_arr,
+ const int flag)
{
if (BM_elem_flag_test(e, BM_ELEM_TAG)) {
const int i = BM_elem_index_get(e);
@@ -253,7 +265,7 @@
{
/* recalculate edge */
- const float cost = bm_edge_calc_rotate_beauty(e);
+ const float cost = bm_edge_calc_rotate_beauty(e, flag);
if (cost < 0.0f) {
eheap_table[i] = BLI_heap_insert(eheap, cost, e);
}
@@ -265,18 +277,19 @@
}
/* we have rotated an edge, tag other egdes and clear this one */
-static void bm_edge_update_beauty_cost(BMEdge *e, Heap *eheap, HeapNode **eheap_table, GHash **edge_state_arr)
+static void bm_edge_update_beauty_cost(BMEdge *e, Heap *eheap, HeapNode **eheap_table, GHash **edge_state_arr,
+ const int flag)
{
BMLoop *l;
BLI_assert(e->l->f->len == 3 &&
e->l->radial_next->f->len == 3);
l = e->l;
- bm_edge_update_beauty_cost_single(l->next->e, eheap, eheap_table, edge_state_arr);
- bm_edge_update_beauty_cost_single(l->prev->e, eheap, eheap_table, edge_state_arr);
+ bm_edge_update_beauty_cost_single(l->next->e, eheap, eheap_table, edge_state_arr, flag);
+ bm_edge_update_beauty_cost_single(l->prev->e, eheap, eheap_table, edge_state_arr, flag);
l = l->radial_next;
- bm_edge_update_beauty_cost_single(l->next->e, eheap, eheap_table, edge_state_arr);
- bm_edge_update_beauty_cost_single(l->prev->e, eheap, eheap_table, edge_state_arr);
+ bm_edge_update_beauty_cost_single(l->next->e, eheap, eheap_table, edge_state_arr, flag);
+ bm_edge_update_beauty_cost_single(l->prev->e, eheap, eheap_table, edge_state_arr, flag);
}
/* -------------------------------------------------------------------- */
@@ -289,7 +302,8 @@
* \note All edges in \a edge_array must be tagged and
* have their index values set according to their position in the array.
*/
-static void bm_mesh_beautify_fill(BMesh *bm, BMEdge **edge_array, const int edge_array_len)
+static void bm_mesh_beautify_fill(BMesh *bm, BMEdge **edge_array, const int edge_array_len,
+ const int flag)
{
Heap *eheap; /* edge heap */
HeapNode **eheap_table; /* edge index aligned table pointing to the eheap */
@@ -308,7 +322,7 @@
/* build heap */
for (i = 0; i < edge_array_len; i++) {
BMEdge *e = edge_array[i];
- const float cost = bm_edge_calc_rotate_beauty(e);
+ const float cost = bm_edge_calc_rotate_beauty(e, flag);
if (cost < 0.0f) {
eheap_table[i] = BLI_heap_insert(eheap, cost, e);
}
@@ -345,7 +359,7 @@
BM_elem_index_set(e, i);
/* recalculate faces connected on the heap */
- bm_edge_update_beauty_cost(e, eheap, eheap_table, edge_state_arr);
+ bm_edge_update_beauty_cost(e, eheap, eheap_table, edge_state_arr, flag);
/* update flags */
BMO_elem_flag_enable(bm, e, ELE_NEW);
@@ -378,6 +392,8 @@
BMOIter siter;
BMFace *f;
BMEdge *e;
+ const bool use_restrict_tag = BMO_slot_bool_get(op->slots_in, "use_restrict_tag");
+ const int flag = (use_restrict_tag ? VERT_RESTRICT_TAG : 0);
BMEdge **edge_array;
int edge_array_len = 0;
@@ -411,7 +427,7 @@
}
bm->elem_index_dirty |= BM_EDGE;
- bm_mesh_beautify_fill(bm, edge_array, edge_array_len);
+ bm_mesh_beautify_fill(bm, edge_array, edge_array_len, flag);
MEM_freeN(edge_array);
More information about the Bf-blender-cvs
mailing list