diff options
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_construct.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 219 |
1 files changed, 0 insertions, 219 deletions
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 1a7464ce340..a8f8f92518a 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -494,225 +494,6 @@ BMFace *BM_face_create_ngon_vcloud(BMesh *bm, BMVert **vert_arr, int len, return f; } -/** - * Called by operators to remove elements that they have marked for - * removal. - */ -void BMO_remove_tagged_faces(BMesh *bm, const short oflag) -{ - BMFace *f, *f_next; - BMIter iter; - - BM_ITER_MESH_MUTABLE (f, f_next, &iter, bm, BM_FACES_OF_MESH) { - if (BMO_elem_flag_test(bm, f, oflag)) { - BM_face_kill(bm, f); - } - } -} - -void BMO_remove_tagged_edges(BMesh *bm, const short oflag) -{ - BMEdge *e, *e_next; - BMIter iter; - - BM_ITER_MESH_MUTABLE (e, e_next, &iter, bm, BM_EDGES_OF_MESH) { - if (BMO_elem_flag_test(bm, e, oflag)) { - BM_edge_kill(bm, e); - } - } -} - -void BMO_remove_tagged_verts(BMesh *bm, const short oflag) -{ - BMVert *v, *v_next; - BMIter iter; - - BM_ITER_MESH_MUTABLE (v, v_next, &iter, bm, BM_VERTS_OF_MESH) { - if (BMO_elem_flag_test(bm, v, oflag)) { - BM_vert_kill(bm, v); - } - } -} - -/** - * you need to make remove tagged verts/edges/faces - * api functions that take a filter callback..... - * and this new filter type will be for opstack flags. - * This is because the BM_remove_taggedXXX functions bypass iterator API. - * - Ops don't care about 'UI' considerations like selection state, hide state, etc. - * If you want to work on unhidden selections for instance, - * copy output from a 'select context' operator to another operator.... - */ - -static void bmo_remove_tagged_context_verts(BMesh *bm, const short oflag) -{ - BMVert *v; - BMEdge *e; - BMFace *f; - - BMIter iter; - BMIter itersub; - - BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) { - if (BMO_elem_flag_test(bm, v, oflag)) { - /* Visit edge */ - BM_ITER_ELEM (e, &itersub, v, BM_EDGES_OF_VERT) { - BMO_elem_flag_enable(bm, e, oflag); - } - /* Visit face */ - BM_ITER_ELEM (f, &itersub, v, BM_FACES_OF_VERT) { - BMO_elem_flag_enable(bm, f, oflag); - } - } - } - - BMO_remove_tagged_faces(bm, oflag); - BMO_remove_tagged_edges(bm, oflag); - BMO_remove_tagged_verts(bm, oflag); -} - -static void bmo_remove_tagged_context_edges(BMesh *bm, const short oflag) -{ - BMEdge *e; - BMFace *f; - - BMIter iter; - BMIter itersub; - - BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { - if (BMO_elem_flag_test(bm, e, oflag)) { - BM_ITER_ELEM (f, &itersub, e, BM_FACES_OF_EDGE) { - BMO_elem_flag_enable(bm, f, oflag); - } - } - } - BMO_remove_tagged_faces(bm, oflag); - BMO_remove_tagged_edges(bm, oflag); -} - -#define DEL_WIREVERT (1 << 10) - -/** - * \warning oflag applies to different types in some contexts, - * not just the type being removed. - * - * \warning take care, uses operator flag DEL_WIREVERT - */ -void BMO_remove_tagged_context(BMesh *bm, const short oflag, const int type) -{ - BMVert *v; - BMEdge *e; - BMFace *f; - - BMIter viter; - BMIter eiter; - BMIter fiter; - - switch (type) { - case DEL_VERTS: - { - bmo_remove_tagged_context_verts(bm, oflag); - - break; - } - case DEL_EDGES: - { - /* flush down to vert */ - BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { - if (BMO_elem_flag_test(bm, e, oflag)) { - BMO_elem_flag_enable(bm, e->v1, oflag); - BMO_elem_flag_enable(bm, e->v2, oflag); - } - } - bmo_remove_tagged_context_edges(bm, oflag); - /* remove loose vertice */ - BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) { - if (BMO_elem_flag_test(bm, v, oflag) && (!(v->e))) - BMO_elem_flag_enable(bm, v, DEL_WIREVERT); - } - BMO_remove_tagged_verts(bm, DEL_WIREVERT); - - break; - } - case DEL_EDGESFACES: - { - bmo_remove_tagged_context_edges(bm, oflag); - - break; - } - case DEL_ONLYFACES: - { - BMO_remove_tagged_faces(bm, oflag); - - break; - } - case DEL_ONLYTAGGED: - { - BMO_remove_tagged_faces(bm, oflag); - BMO_remove_tagged_edges(bm, oflag); - BMO_remove_tagged_verts(bm, oflag); - - break; - } - case DEL_FACES: - { - /* go through and mark all edges and all verts of all faces for delete */ - BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { - if (BMO_elem_flag_test(bm, f, oflag)) { - for (e = BM_iter_new(&eiter, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&eiter)) - BMO_elem_flag_enable(bm, e, oflag); - for (v = BM_iter_new(&viter, bm, BM_VERTS_OF_FACE, f); v; v = BM_iter_step(&viter)) - BMO_elem_flag_enable(bm, v, oflag); - } - } - /* now go through and mark all remaining faces all edges for keeping */ - BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { - if (!BMO_elem_flag_test(bm, f, oflag)) { - for (e = BM_iter_new(&eiter, bm, BM_EDGES_OF_FACE, f); e; e = BM_iter_step(&eiter)) { - BMO_elem_flag_disable(bm, e, oflag); - } - for (v = BM_iter_new(&viter, bm, BM_VERTS_OF_FACE, f); v; v = BM_iter_step(&viter)) { - BMO_elem_flag_disable(bm, v, oflag); - } - } - } - /* also mark all the vertices of remaining edges for keeping */ - BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { - if (!BMO_elem_flag_test(bm, e, oflag)) { - BMO_elem_flag_disable(bm, e->v1, oflag); - BMO_elem_flag_disable(bm, e->v2, oflag); - } - } - /* now delete marked face */ - BMO_remove_tagged_faces(bm, oflag); - /* delete marked edge */ - BMO_remove_tagged_edges(bm, oflag); - /* remove loose vertice */ - BMO_remove_tagged_verts(bm, oflag); - - break; - } - case DEL_ALL: - { - /* does this option even belong in here? */ - BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) { - BMO_elem_flag_enable(bm, f, oflag); - } - BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) { - BMO_elem_flag_enable(bm, e, oflag); - } - BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) { - BMO_elem_flag_enable(bm, v, oflag); - } - - BMO_remove_tagged_faces(bm, oflag); - BMO_remove_tagged_edges(bm, oflag); - BMO_remove_tagged_verts(bm, oflag); - - break; - } - } -} /*************************************************************/ |