add beauty option for triangle fill since you might want to use the initial scanfill...
[blender.git] / source / blender / bmesh / operators / bmo_triangulate.c
index 1007e05..3d78ff6 100644 (file)
@@ -75,7 +75,9 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
                stop = 1;
                
                BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
-                       BMVert *v1, *v2, *v3, *v4;
+                       float v1_xy[2], v2_xy[2], v3_xy[2], v4_xy[2];
+                       float no[3];
+                       float axis_mat[3][3];
                        
                        if (!BM_edge_is_manifold(e) || !BMO_elem_flag_test(bm, e, EDGE_MARK)) {
                                continue;
@@ -87,30 +89,44 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
                                continue;
                        }
                        
-                       v1 = e->l->prev->v;
-                       v2 = e->l->v;
-                       v3 = e->l->radial_next->prev->v;
-                       v4 = e->l->next->v;
-                       
-                       if (is_quad_convex_v3(v1->co, v2->co, v3->co, v4->co)) {
+                       {
+                               float *v1, *v2, *v3, *v4;
+                               float no_a[3], no_b[3];
+                               v1 = e->l->prev->v->co;
+                               v2 = e->l->v->co;
+                               v3 = e->l->radial_next->prev->v->co;
+                               v4 = e->l->next->v->co;
+
+                               normal_tri_v3(no_a, v1, v2, v3);
+                               normal_tri_v3(no_b, v1, v3, v4);
+                               add_v3_v3v3(no, no_a, no_b);
+                               normalize_v3(no);
+                               axis_dominant_v3_to_m3(axis_mat, no);
+                               mul_v2_m3v3(v1_xy, axis_mat, v1);
+                               mul_v2_m3v3(v2_xy, axis_mat, v2);
+                               mul_v2_m3v3(v3_xy, axis_mat, v3);
+                               mul_v2_m3v3(v4_xy, axis_mat, v4);
+                       }
+
+                       if (is_quad_convex_v2(v1_xy, v2_xy, v3_xy, v4_xy)) {
                                float len1, len2, len3, len4, len5, len6, opp1, opp2, fac1, fac2;
                                /* testing rule:
                                 * the area divided by the total edge lengths
                                 */
-                               len1 = len_v3v3(v1->co, v2->co);
-                               len2 = len_v3v3(v2->co, v3->co);
-                               len3 = len_v3v3(v3->co, v4->co);
-                               len4 = len_v3v3(v4->co, v1->co);
-                               len5 = len_v3v3(v1->co, v3->co);
-                               len6 = len_v3v3(v2->co, v4->co);
+                               len1 = len_v2v2(v1_xy, v2_xy);
+                               len2 = len_v2v2(v2_xy, v3_xy);
+                               len3 = len_v2v2(v3_xy, v4_xy);
+                               len4 = len_v2v2(v4_xy, v1_xy);
+                               len5 = len_v2v2(v1_xy, v3_xy);
+                               len6 = len_v2v2(v2_xy, v4_xy);
 
-                               opp1 = area_tri_v3(v1->co, v2->co, v3->co);
-                               opp2 = area_tri_v3(v1->co, v3->co, v4->co);
+                               opp1 = area_tri_v2(v1_xy, v2_xy, v3_xy);
+                               opp2 = area_tri_v2(v1_xy, v3_xy, v4_xy);
 
                                fac1 = opp1 / (len1 + len2 + len5) + opp2 / (len3 + len4 + len5);
 
-                               opp1 = area_tri_v3(v2->co, v3->co, v4->co);
-                               opp2 = area_tri_v3(v2->co, v4->co, v1->co);
+                               opp1 = area_tri_v2(v2_xy, v3_xy, v4_xy);
+                               opp2 = area_tri_v2(v2_xy, v4_xy, v1_xy);
 
                                fac2 = opp1 / (len2 + len3 + len6) + opp2 / (len4 + len1 + len6);
                                
@@ -133,9 +149,9 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
 
 void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
 {
+       const bool use_beauty = BMO_slot_bool_get(op->slots_in, "use_beauty");
        BMOIter siter;
        BMEdge *e;
-       BMOperator bmop;
        ScanFillContext sf_ctx;
        /* ScanFillEdge *sf_edge; */ /* UNUSED */
        ScanFillVert *sf_vert, *sf_vert_1, *sf_vert_2;
@@ -187,11 +203,14 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
        BLI_scanfill_end(&sf_ctx);
        BLI_smallhash_release(&hash);
        
-       /* clean up fill */
-       BMO_op_initf(bm, &bmop, op->flag, "beautify_fill faces=%ff edges=%Fe", ELE_NEW, EDGE_MARK);
-       BMO_op_exec(bm, &bmop);
-       BMO_slot_buffer_flag_enable(bm, bmop.slots_out, "geom.out", BM_FACE | BM_EDGE, ELE_NEW);
-       BMO_op_finish(bm, &bmop);
+       if (use_beauty) {
+               BMOperator bmop;
+
+               BMO_op_initf(bm, &bmop, op->flag, "beautify_fill faces=%ff edges=%Fe", ELE_NEW, EDGE_MARK);
+               BMO_op_exec(bm, &bmop);
+               BMO_slot_buffer_flag_enable(bm, bmop.slots_out, "geom.out", BM_FACE | BM_EDGE, ELE_NEW);
+               BMO_op_finish(bm, &bmop);
+       }
        
        BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
 }