Revision: 42110
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42110
Author: campbellbarton
Date: 2011-11-24 01:07:36 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
per type restrict masks for walkers
- vert/edge/loop/face each get their own restrict masks
- any invalid restrict masks (which are not supported by the walkers) raise an
error.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h 2011-11-24
00:14:13 UTC (rev 42109)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h 2011-11-24
01:07:36 UTC (rev 42110)
@@ -19,19 +19,29 @@
void *(*yield)(struct BMWalker *walker);
int structsize;
BMWOrder order;
+ int valid_mask;
+
+ /* runtime */
int layer;
BMesh *bm;
BLI_mempool *worklist;
ListBase states;
- short restrictflag;
+
+ short mask_vert;
+ short mask_edge;
+ short mask_loop;
+ short mask_face;
+
GHash *visithash;
int depth;
} BMWalker;
/*initialize a walker. searchmask restricts some (not all) walkers to
elements with a specific tool flag set. flags is specific to each walker.*/
-void BMW_Init(struct BMWalker *walker, BMesh *bm, int type, short searchmask,
int layer);
+void BMW_Init(struct BMWalker *walker, BMesh *bm, int type,
+ short mask_vert, short mask_edge, short mask_loop, short
mask_face,
+ int layer);
void *BMW_Begin(BMWalker *walker, void *start);
void *BMW_Step(struct BMWalker *walker);
void BMW_End(struct BMWalker *walker);
@@ -86,6 +96,8 @@
BMW_ISLAND,
/*walk from a vertex to all connected vertices.*/
BMW_CONNECTED_VERTEX,
+ /* end of array index enum vals */
+
/*do not intitialze function pointers and struct size in BMW_Init*/
BMW_CUSTOM,
BMW_MAXWALKERS
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
2011-11-24 00:14:13 UTC (rev 42109)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
2011-11-24 01:07:36 UTC (rev 42110)
@@ -83,18 +83,28 @@
*
*/
-void BMW_Init(BMWalker *walker, BMesh *bm, int type, short searchmask, int
layer)
+void BMW_Init(BMWalker *walker, BMesh *bm, int type,
+ short mask_vert, short mask_edge, short mask_loop, short
mask_face,
+ int layer)
{
memset(walker, 0, sizeof(BMWalker));
walker->layer = layer;
walker->bm = bm;
- walker->restrictflag = searchmask;
+
+ walker->mask_vert = mask_vert;
+ walker->mask_edge = mask_edge;
+ walker->mask_loop = mask_loop;
+ walker->mask_face = mask_face;
+
walker->visithash = BLI_ghash_new(BLI_ghashutil_ptrhash,
BLI_ghashutil_ptrcmp, "bmesh walkers 1");
if (type >= BMW_MAXWALKERS || type < 0) {
bmesh_error();
- fprintf(stderr, "Invalid walker type in BMW_Init; type: %d,
searchmask: %d, flag: %d\n", type, searchmask, layer);
+ fprintf(stderr,
+ "Invalid walker type in BMW_Init; type: %d, "
+ "searchmask: (v:%d,e:%d,l:%d,f:%d), flag: %d\n",
+ type, mask_vert, mask_edge, mask_loop, mask_face,
layer);
}
if (type != BMW_CUSTOM) {
@@ -103,6 +113,15 @@
walker->step = bm_walker_types[type]->step;
walker->structsize = bm_walker_types[type]->structsize;
walker->order = bm_walker_types[type]->order;
+ walker->valid_mask = bm_walker_types[type]->valid_mask;
+
+ /* safety checks */
+ /* if this raises an error either the caller is wrong or
+ * 'bm_walker_types' needs updating */
+ BLI_assert(mask_vert==0 || (walker->valid_mask & BM_VERT));
+ BLI_assert(mask_edge==0 || (walker->valid_mask & BM_EDGE));
+ BLI_assert(mask_loop==0 || (walker->valid_mask & BM_LOOP));
+ BLI_assert(mask_face==0 || (walker->valid_mask & BM_FACE));
}
walker->worklist = BLI_mempool_create(walker->structsize, 100, 100,
TRUE, FALSE);
Modified:
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
2011-11-24 00:14:13 UTC (rev 42109)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
2011-11-24 01:07:36 UTC (rev 42110)
@@ -61,7 +61,7 @@
return;
}
- if (walker->restrictflag && !BMO_TestFlag(walker->bm, e,
walker->restrictflag)) {
+ if (walker->mask_edge && !BMO_TestFlag(walker->bm, e,
walker->mask_edge)) {
return;
}
@@ -188,7 +188,7 @@
/* already visited */
return;
}
- if (walker->restrictflag && !BMO_TestFlag(walker->bm, v,
walker->restrictflag)) {
+ if (walker->mask_vert && !BMO_TestFlag(walker->bm, v,
walker->mask_vert)) {
/* not flagged for walk */
return;
}
@@ -296,7 +296,7 @@
l = bmesh_radial_nextloop(l);
f = l->f;
e = l->e;
- if(walker->restrictflag && !BMO_TestFlag(walker->bm, f,
walker->restrictflag)){
+ if(walker->mask_face && !BMO_TestFlag(walker->bm, f,
walker->mask_face)){
l = l->radial_next;
break;
}
@@ -337,7 +337,7 @@
{
islandWalker *iwalk = NULL;
- if (walker->restrictflag && !BMO_TestFlag(walker->bm, data,
walker->restrictflag)) {
+ if (walker->mask_face && !BMO_TestFlag(walker->bm, data,
walker->mask_face)) {
return;
}
@@ -368,7 +368,7 @@
for (; l; l=BMIter_Step(&liter)) {
f = BMIter_New(&iter, walker->bm, BM_FACES_OF_EDGE, l->e);
for (; f; f=BMIter_Step(&iter)) {
- if (walker->restrictflag && !BMO_TestFlag(walker->bm,
f, walker->restrictflag)) {
+ if (walker->mask_face && !BMO_TestFlag(walker->bm, f,
walker->mask_face)) {
continue;
}
if (BLI_ghash_haskey(walker->visithash, f)) continue;
@@ -765,7 +765,7 @@
BMW_removestate(walker);
- if (walker->restrictflag && !BMO_TestFlag(walker->bm, l->e,
walker->restrictflag))
+ if (walker->mask_edge && !BMO_TestFlag(walker->bm, l->e,
walker->mask_edge))
return l;
/*go over loops around l->v and nl->v and see which ones share l and
nl's
@@ -780,7 +780,7 @@
for (j=0; j<rlen; j++) {
if (BLI_ghash_haskey(walker->visithash, l2))
continue;
- if (walker->restrictflag &&
!(BMO_TestFlag(walker->bm, l2->e, walker->restrictflag)))
+ if (walker->mask_edge &&
!(BMO_TestFlag(walker->bm, l2->e, walker->mask_edge)))
{
if (l2->v != cl->v)
continue;
@@ -812,6 +812,7 @@
shellWalker_yield,
sizeof(shellWalker),
BMW_BREADTH_FIRST,
+ BM_EDGE, /* valid restrict masks */
};
static BMWalker islandbound_walker_type = {
@@ -820,6 +821,7 @@
islandboundWalker_yield,
sizeof(islandboundWalker),
BMW_DEPTH_FIRST,
+ BM_FACE, /* valid restrict masks */
};
static BMWalker island_walker_type = {
@@ -828,6 +830,7 @@
islandWalker_yield,
sizeof(islandWalker),
BMW_BREADTH_FIRST,
+ BM_FACE, /* valid restrict masks */
};
static BMWalker loop_walker_type = {
@@ -836,6 +839,7 @@
loopWalker_yield,
sizeof(loopWalker),
BMW_DEPTH_FIRST,
+ 0, /* valid restrict masks */ /* could add flags here but so far none
are used */
};
static BMWalker faceloop_walker_type = {
@@ -844,6 +848,7 @@
faceloopWalker_yield,
sizeof(faceloopWalker),
BMW_DEPTH_FIRST,
+ 0, /* valid restrict masks */ /* could add flags here but so far none
are used */
};
static BMWalker edgering_walker_type = {
@@ -852,6 +857,7 @@
edgeringWalker_yield,
sizeof(edgeringWalker),
BMW_DEPTH_FIRST,
+ 0, /* valid restrict masks */ /* could add flags here but so far none
are used */
};
static BMWalker loopdata_region_walker_type = {
@@ -860,6 +866,7 @@
uvedgeWalker_yield,
sizeof(uvedgeWalker),
BMW_DEPTH_FIRST,
+ BM_EDGE, /* valid restrict masks */
};
static BMWalker connected_vertex_walker_type = {
@@ -868,17 +875,18 @@
connectedVertexWalker_yield,
sizeof(connectedVertexWalker),
BMW_BREADTH_FIRST,
+ BM_VERT, /* valid restrict masks */
};
BMWalker *bm_walker_types[] = {
- &shell_walker_type,
- &loop_walker_type,
- &faceloop_walker_type,
- &edgering_walker_type,
- &loopdata_region_walker_type,
- &islandbound_walker_type,
- &island_walker_type,
- &connected_vertex_walker_type,
+ &shell_walker_type, /* BMW_SHELL */
+ &loop_walker_type, /* BMW_LOOP */
+ &faceloop_walker_type, /* BMW_FACELOOP */
+ &edgering_walker_type, /* BMW_EDGERING */
+ &loopdata_region_walker_type, /* BMW_LOOPDATA_ISLAND */
+ &islandbound_walker_type, /* BMW_ISLANDBOUND */
+ &island_walker_type, /* BMW_ISLAND */
+ &connected_vertex_walker_type, /* BMW_CONNECTED_VERTEX */
};
int bm_totwalkers = sizeof(bm_walker_types) / sizeof(*bm_walker_types);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
2011-11-24 00:14:13 UTC (rev 42109)
+++ branches/bmesh/blender/source/blender/bmesh/operators/dissolveops.c
2011-11-24 01:07:36 UTC (rev 42110)
@@ -28,7 +28,7 @@
/*checks if there are any unmarked boundary edges in the face region*/
- BMW_Init(®walker, bm, BMW_ISLAND, FACE_MARK, BMW_NIL_LAY);
+ BMW_Init(®walker, bm, BMW_ISLAND, 0,0,0,FACE_MARK, BMW_NIL_LAY);
f2 = BMW_Begin(®walker, f);
for (; f2; f2=BMW_Step(®walker)) {
l2 = BMIter_New(&liter2, bm, BM_LOOPS_OF_FACE, f2);
@@ -69,7 +69,7 @@
faces = NULL; /*forces different allocation*/
/*yay, walk!*/
- BMW_Init(®walker, bm, BMW_ISLAND, FACE_MARK, BMW_NIL_LAY);
+ BMW_Init(®walker, bm, BMW_ISLAND, 0,0,0,FACE_MARK,
BMW_NIL_LAY);
f2 = BMW_Begin(®walker, f);
for (; f2; f2=BMW_Step(®walker)) {
BLI_array_append(faces, f2);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
2011-11-24 00:14:13 UTC (rev 42109)
+++ branches/bmesh/blender/source/blender/bmesh/operators/removedoubles.c
2011-11-24 01:07:36 UTC (rev 42110)
@@ -347,7 +347,7 @@
BMO_Init_Op(bm, &weldop, "weldverts");
BMO_Flag_Buffer(bm, op, "edges", EDGE_MARK, BM_EDGE);
- BMW_Init(&walker, bm, BMW_SHELL, EDGE_MARK, BMW_NIL_LAY);
+ BMW_Init(&walker, bm, BMW_SHELL, 0,EDGE_MARK,0,0, BMW_NIL_LAY);
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
if (!BMO_TestFlag(bm, e, EDGE_MARK))
@@ -402,7 +402,7 @@
BMO_Clear_Flag_All(bm, op, BM_ALL, 65535);
BMO_Flag_Buffer(bm, op, "edges", EDGE_MARK, BM_EDGE);
- BMW_Init(&walker, bm, BMW_LOOPDATA_ISLAND, EDGE_MARK, layer);
+ BMW_Init(&walker, bm, BMW_LOOPDATA_ISLAND, 0,EDGE_MARK,0,0, layer);
BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
