code cleanup: make bmesh operator names more consistant since python has access to...
[blender.git] / source / blender / bmesh / operators / bmo_removedoubles.c
index d3e98dd96c187c41e48166352166ec2636b4927a..e866abcb6dc2e8327a4dfde0754911ad58d4983b 100644 (file)
@@ -44,7 +44,7 @@ static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op)
        int split = FALSE;
 
        BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
-               v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", l->v);
+               v2 = BMO_slot_map_ptr_get(op->slots_in, "targetmap", l->v);
                /* ok: if v2 is NULL (e.g. not in the map) then it's
                 *     a target vert, otherwise it's a double */
                if ((v2 && BM_vert_in_face(f, v2)) &&
@@ -109,7 +109,7 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
 
        /* mark merge verts for deletion */
        BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
-               if ((v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", v))) {
+               if ((v2 = BMO_slot_map_ptr_get(op->slots_in, "targetmap", v))) {
                        BMO_elem_flag_enable(bm, v, ELE_DEL);
 
                        /* merge the vertex flags, else we get randomly selected/unselected verts */
@@ -125,8 +125,8 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
 
        BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
                if (BMO_elem_flag_test(bm, e->v1, ELE_DEL) || BMO_elem_flag_test(bm, e->v2, ELE_DEL)) {
-                       v = BMO_slot_map_ptr_get(bm, op, "targetmap", e->v1);
-                       v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", e->v2);
+                       v  = BMO_slot_map_ptr_get(op->slots_in, "targetmap", e->v1);
+                       v2 = BMO_slot_map_ptr_get(op->slots_in, "targetmap", e->v2);
                        
                        if (!v) v = e->v1;
                        if (!v2) v2 = e->v2;
@@ -174,10 +174,10 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
                        v = l->v;
                        v2 = l->next->v;
                        if (BMO_elem_flag_test(bm, v, ELE_DEL)) {
-                               v = BMO_slot_map_ptr_get(bm, op, "targetmap", v);
+                               v = BMO_slot_map_ptr_get(op->slots_in, "targetmap", v);
                        }
                        if (BMO_elem_flag_test(bm, v2, ELE_DEL)) {
-                               v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", v2);
+                               v2 = BMO_slot_map_ptr_get(op->slots_in, "targetmap", v2);
                        }
                        
                        e2 = v != v2 ? BM_edge_exists(v, v2) : NULL;
@@ -207,10 +207,10 @@ void bmo_weld_verts_exec(BMesh *bm, BMOperator *op)
                v2 = loops[1]->v;
 
                if (BMO_elem_flag_test(bm, v, ELE_DEL)) {
-                       v = BMO_slot_map_ptr_get(bm, op, "targetmap", v);
+                       v = BMO_slot_map_ptr_get(op->slots_in, "targetmap", v);
                }
                if (BMO_elem_flag_test(bm, v2, ELE_DEL)) {
-                       v2 = BMO_slot_map_ptr_get(bm, op, "targetmap", v2);
+                       v2 = BMO_slot_map_ptr_get(op->slots_in, "targetmap", v2);
                }
                
                f2 = BM_face_create_ngon(bm, v, v2, edges, a, TRUE);
@@ -262,7 +262,7 @@ void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
        float fac;
        int i, tot;
 
-       snapv = BMO_iter_new(&siter, bm, op, "snapv", BM_VERT);
+       snapv = BMO_iter_new(&siter, op->slots_in, "snapv", BM_VERT);
        tot = BM_vert_face_count(snapv);
 
        if (!tot)
@@ -290,7 +290,7 @@ void bmo_pointmerge_facedata_exec(BMesh *bm, BMOperator *op)
                }
        }
 
-       BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+       BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
                BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
                        if (l == firstl) {
                                continue;
@@ -318,7 +318,7 @@ void bmo_average_vert_facedata_exec(BMesh *bm, BMOperator *op)
                type = bm->ldata.layers[i].type;
                CustomData_data_initminmax(type, &min, &max);
 
-               BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+               BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
                        BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
                                block = CustomData_bmesh_get_layer_n(&bm->ldata, l->head.data, i);
                                CustomData_data_dominmax(type, block, &min, &max);
@@ -329,7 +329,7 @@ void bmo_average_vert_facedata_exec(BMesh *bm, BMOperator *op)
                CustomData_data_multiply(type, &max, 0.5f);
                CustomData_data_add(type, &min, &max);
 
-               BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+               BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
                        BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
                                block = CustomData_bmesh_get_layer_n(&bm->ldata, l->head.data, i);
                                CustomData_data_copy_value(type, &min, block);
@@ -345,18 +345,18 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
        BMVert *v, *snapv = NULL;
        float vec[3];
        
-       BMO_slot_vec_get(op, "merge_co", vec);
+       BMO_slot_vec_get(op->slots_in, "merge_co", vec);
 
        //BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges");
        BMO_op_init(bm, &weldop, op->flag, "weld_verts");
        
-       BMO_ITER (v, &siter, bm, op, "verts", BM_VERT) {
+       BMO_ITER (v, &siter, op->slots_in, "verts", BM_VERT) {
                if (!snapv) {
                        snapv = v;
                        copy_v3_v3(snapv->co, vec);
                }
                else {
-                       BMO_slot_map_ptr_insert(bm, &weldop, "targetmap", v, snapv);
+                       BMO_slot_map_ptr_insert(&weldop, weldop.slots_in, "targetmap", v, snapv);
                }
        }
 
@@ -371,13 +371,13 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op)
        BMIter iter;
        BMEdge *e, **edges = NULL;
        BLI_array_declare(edges);
-       float min[3], max[3];
+       float min[3], max[3], center[3];
        int i, tot;
        
        BMO_op_callf(bm, op->flag, "collapse_uvs edges=%s", op, "edges");
        BMO_op_init(bm, &weldop, op->flag, "weld_verts");
 
-       BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK);
+       BMO_slot_buffer_flag_enable(bm, op->slots_in, "edges", BM_EDGE, EDGE_MARK);
 
        BMW_init(&walker, bm, BMW_SHELL,
                 BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP,
@@ -400,18 +400,17 @@ void bmo_collapse_exec(BMesh *bm, BMOperator *op)
                        minmax_v3v3_v3(min, max, e->v2->co);
                }
 
-               add_v3_v3v3(min, min, max);
-               mul_v3_fl(min, 0.5f);
+               mid_v3_v3v3(center, min, max);
 
                /* snap edges to a point.  for initial testing purposes anyway */
                for (i = 0; i < tot; i++) {
-                       copy_v3_v3(edges[i]->v1->co, min);
-                       copy_v3_v3(edges[i]->v2->co, min);
+                       copy_v3_v3(edges[i]->v1->co, center);
+                       copy_v3_v3(edges[i]->v2->co, center);
                        
                        if (edges[i]->v1 != edges[0]->v1)
-                               BMO_slot_map_ptr_insert(bm, &weldop, "targetmap", edges[i]->v1, edges[0]->v1);
+                               BMO_slot_map_ptr_insert(&weldop, weldop.slots_in, "targetmap", edges[i]->v1, edges[0]->v1);
                        if (edges[i]->v2 != edges[0]->v1)
-                               BMO_slot_map_ptr_insert(bm, &weldop, "targetmap", edges[i]->v2, edges[0]->v1);
+                               BMO_slot_map_ptr_insert(&weldop, weldop.slots_in, "targetmap", edges[i]->v2, edges[0]->v1);
                }
        }
        
@@ -437,7 +436,7 @@ static void bmo_collapsecon_do_layer(BMesh *bm, BMOperator *op, int layer)
        /* clear all short flags */
        BMO_mesh_flag_disable_all(bm, op, BM_ALL, (1 << 16) - 1);
 
-       BMO_slot_buffer_flag_enable(bm, op, "edges", BM_EDGE, EDGE_MARK);
+       BMO_slot_buffer_flag_enable(bm, op->slots_in, "edges", BM_EDGE, EDGE_MARK);
 
        BMW_init(&walker, bm, BMW_LOOPDATA_ISLAND,
                 BMW_MASK_NOP, EDGE_MARK, BMW_MASK_NOP,
@@ -487,74 +486,76 @@ void bmo_collapse_uvs_exec(BMesh *bm, BMOperator *op)
        }
 }
 
-static void bmesh_find_doubles_common(BMesh *bm, BMOperator *op, BMOperator *optarget, const char *targetmapname)
+static void bmesh_find_doubles_common(BMesh *bm, BMOperator *op,
+                                      BMOperator *optarget,
+                                      BMOpSlot optarget_slot_args[BMO_OP_MAX_SLOTS],
+                                      const char *targetmapname)
 {
-       BMOIter oiter;
-       BMVert *v, *v2;
-       BMVert **verts = NULL;
-       BLI_array_declare(verts);
-       float dist, dist3;
-       int i, j, len, keepvert = 0;
-
-       dist = BMO_slot_float_get(op, "dist");
-       dist3 = dist * 3.0f;
-
-       i = 0;
-       BMO_ITER (v, &oiter, bm, op, "verts", BM_VERT) {
-               BLI_array_grow_one(verts);
-               verts[i++] = v;
-       }
+       BMVert  **verts;
+       int       verts_len;
+
+       int i, j, keepvert = 0;
+
+       const float dist  = BMO_slot_float_get(op->slots_in, "dist");
+       const float dist3 = dist * 3.0f;
 
        /* Test whether keep_verts arg exists and is non-empty */
-       if (BMO_slot_exists(op, "keep_verts")) {
-               keepvert = BMO_iter_new(&oiter, bm, op, "keep_verts", BM_VERT) != NULL;
+       if (BMO_slot_exists(op->slots_in, "keep_verts")) {
+               BMOIter oiter;
+               keepvert = BMO_iter_new(&oiter, op->slots_in, "keep_verts", BM_VERT) != NULL;
        }
 
+       /* get the verts as an array we can sort */
+       verts = BMO_slot_as_arrayN(op->slots_in, "verts", &verts_len);
+
        /* sort by vertex coordinates added together */
-       qsort(verts, BLI_array_count(verts), sizeof(void *), vergaverco);
+       qsort(verts, verts_len, sizeof(BMVert *), vergaverco);
 
        /* Flag keep_verts */
        if (keepvert) {
-               BMO_slot_buffer_flag_enable(bm, op, "keep_verts", BM_VERT, VERT_KEEP);
+               BMO_slot_buffer_flag_enable(bm, op->slots_in, "keep_verts", BM_VERT, VERT_KEEP);
        }
 
-       len = BLI_array_count(verts);
-       for (i = 0; i < len; i++) {
-               v = verts[i];
-               if (BMO_elem_flag_test(bm, v, VERT_DOUBLE)) {
+       for (i = 0; i < verts_len; i++) {
+               BMVert *v_check = verts[i];
+
+               if (BMO_elem_flag_test(bm, v_check, VERT_DOUBLE)) {
                        continue;
                }
 
-               for (j = i + 1; j < len; j++) {
-                       v2 = verts[j];
+               for (j = i + 1; j < verts_len; j++) {
+                       BMVert *v_other = verts[j];
 
                        /* Compare sort values of the verts using 3x tolerance (allowing for the tolerance
                         * on each of the three axes). This avoids the more expensive length comparison
                         * for most vertex pairs. */
-                       if ((v2->co[0] + v2->co[1] + v2->co[2]) - (v->co[0] + v->co[1] + v->co[2]) > dist3)
+                       if ((v_other->co[0] + v_other->co[1] + v_other->co[2]) -
+                           (v_check->co[0] + v_check->co[1] + v_check->co[2]) > dist3)
+                       {
                                break;
+                       }
 
                        if (keepvert) {
-                               if (BMO_elem_flag_test(bm, v2, VERT_KEEP) == BMO_elem_flag_test(bm, v, VERT_KEEP))
+                               if (BMO_elem_flag_test(bm, v_other, VERT_KEEP) == BMO_elem_flag_test(bm, v_check, VERT_KEEP))
                                        continue;
                        }
 
-                       if (compare_len_v3v3(v->co, v2->co, dist)) {
+                       if (compare_len_v3v3(v_check->co, v_other->co, dist)) {
 
                                /* If one vert is marked as keep, make sure it will be the target */
-                               if (BMO_elem_flag_test(bm, v2, VERT_KEEP)) {
-                                       SWAP(BMVert *, v, v2);
+                               if (BMO_elem_flag_test(bm, v_other, VERT_KEEP)) {
+                                       SWAP(BMVert *, v_check, v_other);
                                }
 
-                               BMO_elem_flag_enable(bm, v2, VERT_DOUBLE);
-                               BMO_elem_flag_enable(bm, v, VERT_TARGET);
+                               BMO_elem_flag_enable(bm, v_other, VERT_DOUBLE);
+                               BMO_elem_flag_enable(bm, v_check, VERT_TARGET);
 
-                               BMO_slot_map_ptr_insert(bm, optarget, targetmapname, v2, v);
+                               BMO_slot_map_ptr_insert(optarget, optarget_slot_args, targetmapname, v_other, v_check);
                        }
                }
        }
 
-       BLI_array_free(verts);
+       MEM_freeN(verts);
 }
 
 void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op)
@@ -562,7 +563,8 @@ void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op)
        BMOperator weldop;
 
        BMO_op_init(bm, &weldop, op->flag, "weld_verts");
-       bmesh_find_doubles_common(bm, op, &weldop, "targetmap");
+       bmesh_find_doubles_common(bm, op,
+                                 &weldop, weldop.slots_in, "targetmap");
        BMO_op_exec(bm, &weldop);
        BMO_op_finish(bm, &weldop);
 }
@@ -570,7 +572,8 @@ void bmo_remove_doubles_exec(BMesh *bm, BMOperator *op)
 
 void bmo_find_doubles_exec(BMesh *bm, BMOperator *op)
 {
-       bmesh_find_doubles_common(bm, op, op, "targetmapout");
+       bmesh_find_doubles_common(bm, op,
+                                 op, op->slots_out, "targetmap.out");
 }
 
 void bmo_automerge_exec(BMesh *bm, BMOperator *op)
@@ -582,7 +585,7 @@ void bmo_automerge_exec(BMesh *bm, BMOperator *op)
        /* The "verts" input sent to this op is the set of verts that
         * can be merged away into any other verts. Mark all other verts
         * as VERT_KEEP. */
-       BMO_slot_buffer_flag_enable(bm, op, "verts", BM_VERT, VERT_IN);
+       BMO_slot_buffer_flag_enable(bm, op->slots_in, "verts", BM_VERT, VERT_IN);
        BM_ITER_MESH (v, &viter, bm, BM_VERTS_OF_MESH) {
                if (!BMO_elem_flag_test(bm, v, VERT_IN)) {
                        BMO_elem_flag_enable(bm, v, VERT_KEEP);
@@ -592,12 +595,14 @@ void bmo_automerge_exec(BMesh *bm, BMOperator *op)
        /* Search for doubles among all vertices, but only merge non-VERT_KEEP
         * vertices into VERT_KEEP vertices. */
        BMO_op_initf(bm, &findop, op->flag, "find_doubles verts=%av keep_verts=%fv", VERT_KEEP);
-       BMO_slot_copy(op, &findop, "dist", "dist");
+       BMO_slot_copy(op,      slots_in, "dist",
+                     &findop, slots_in, "dist");
        BMO_op_exec(bm, &findop);
 
        /* weld the vertices */
        BMO_op_init(bm, &weldop, op->flag, "weld_verts");
-       BMO_slot_copy(&findop, &weldop, "targetmapout", "targetmap");
+       BMO_slot_copy(&findop, slots_out, "targetmap.out",
+                     &weldop, slots_in,  "targetmap");
        BMO_op_exec(bm, &weldop);
 
        BMO_op_finish(bm, &findop);