diff options
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 1 | ||||
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 1294 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.h | 35 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 126 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_intern.h | 1 | ||||
-rw-r--r-- | source/blender/editors/mesh/mesh_ops.c | 1 |
7 files changed, 1460 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index eb2aaf2a6dc..b7486990f74 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2266,6 +2266,7 @@ class VIEW3D_MT_edit_mesh_faces(Menu): layout.operator("mesh.inset") layout.operator("mesh.bevel").vertex_only = False layout.operator("mesh.solidify") + layout.operator("mesh.intersect") layout.operator("mesh.wireframe") layout.separator() diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 2cd256e2346..a43e835f022 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -136,6 +136,8 @@ set(SRC tools/bmesh_edgenet.h tools/bmesh_edgesplit.c tools/bmesh_edgesplit.h + tools/bmesh_intersect.c + tools/bmesh_intersect.h tools/bmesh_path.c tools/bmesh_path.h tools/bmesh_triangulate.c diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c new file mode 100644 index 00000000000..173ae955b5e --- /dev/null +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -0,0 +1,1294 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/bmesh/tools/bmesh_intersect.c + * \ingroup bmesh + * + * Cut meshes along intersections. + * + * Boolean-like modeling operation (without calculating inside/outside). + * + * Supported: + * - Concave faces. + * - Non-planare faces. + * - Custom-data (UV's etc). + * + * Unsupported: + * - Intersecting between different meshes. + * - No support for holes (cutting a hole into a single face). + */ + +#include "MEM_guardedalloc.h" + +#include "BLI_math.h" +#include "BLI_utildefines.h" +#include "BLI_memarena.h" +#include "BLI_alloca.h" +#include "BLI_sort_utils.h" + +#include "BLI_linklist_stack.h" +#include "BLI_stackdefines.h" +#include "BLI_array.h" + +#include "BLI_kdopbvh.h" + +#include "bmesh.h" +#include "bmesh_intersect.h" /* own include */ + +#include "tools/bmesh_edgesplit.h" + +#include "BLI_strict_flags.h" + +/* + * Some of these depend on each other: + */ + +/* splice verts into existing edges */ +#define USE_SPLICE +/* split faces by intersecting edges */ +#define USE_NET +/* split resulting edges */ +#define USE_SEPARATE +/* remove verts created by intersecting triangles */ +#define USE_DISSOLVE + +/* strict asserts that may fail in practice (handy for debugging cases which should succeed) */ +// #define USE_PARANOID +/* use accelerated overlap check */ +#define USE_BVH + + +static void tri_v3_scale( + float v1[3], float v2[3], float v3[3], + const float t) +{ + float p[3]; + + mid_v3_v3v3v3(p, v1, v2, v3); + + interp_v3_v3v3(v1, p, v1, t); + interp_v3_v3v3(v2, p, v2, t); + interp_v3_v3v3(v3, p, v3, t); +} + +#ifdef USE_DISSOLVE +/* other edge when a vert only has 2 edges */ +static BMEdge *bm_vert_other_edge(BMVert *v, BMEdge *e) +{ + BLI_assert(BM_vert_is_edge_pair(v)); + BLI_assert(BM_vert_in_edge(e, v)); + + if (v->e != e) { + return v->e; + } + else { + return BM_DISK_EDGE_NEXT(v->e, v); + } +} +#endif + +enum ISectType { + IX_NONE = -1, + IX_EDGE_TRI_EDGE0, + IX_EDGE_TRI_EDGE1, + IX_EDGE_TRI_EDGE2, + IX_EDGE_TRI, + IX_TOT, +}; + +struct ISectEpsilon { + float eps, eps_sq; + float eps2x, eps2x_sq; + float eps_margin, eps_margin_sq; +}; + +struct ISectState { + BMesh *bm; + GHash *edgetri_cache; /* int[4]: BMVert */ + GHash *edge_verts; /* BMEdge: LinkList(of verts), new and original edges */ + GHash *face_edges; /* BMFace-index: LinkList(of edges), only original faces */ + GSet *wire_edges; /* BMEdge (could use tags instead) */ + LinkNode *vert_dissolve; /* BMVert's */ + + MemArena *mem_arena; + + struct ISectEpsilon epsilon; +}; + +/** + * Store as value in GHash so we can get list-length without counting every time. + * Also means we don't need to update the GHash value each time. + */ +struct LinkBase { + LinkNode *list; + unsigned int list_len; +}; + +static bool ghash_insert_link( + GHash *gh, void *key, void *val, bool use_test, + MemArena *mem_arena) +{ + struct LinkBase *ls_base; + LinkNode *ls; + + ls_base = BLI_ghash_lookup(gh, key); + + if (ls_base) { + if (use_test && (BLI_linklist_index(ls_base->list, key) != -1)) { + return false; + } + } + else { + ls_base = BLI_memarena_alloc(mem_arena, sizeof(*ls_base)); + ls_base->list = NULL; + ls_base->list_len = 0; + BLI_ghash_insert(gh, key, ls_base); + } + + ls = BLI_memarena_alloc(mem_arena, sizeof(*ls)); + ls->next = ls_base->list; + ls->link = val; + ls_base->list = ls; + ls_base->list_len += 1; + + return true; +} + +struct vert_sort_t { + float val; + BMVert *v; +}; + +#ifdef USE_SPLICE +static void edge_verts_sort(BMEdge *e, struct LinkBase *v_ls_base) +{ + /* not optimal but list will be typically < 5 */ + const float *co = e->v1->co; + unsigned int i; + struct vert_sort_t *vert_sort = BLI_array_alloca(vert_sort, v_ls_base->list_len); + LinkNode *node; + + BLI_assert(v_ls_base->list_len > 1); + + for (i = 0, node = v_ls_base->list; i < v_ls_base->list_len; i++, node = node->next) { + BMVert *v = node->link; + BLI_assert(v->head.htype == BM_VERT); + vert_sort[i].val = len_squared_v3v3(co, v->co); + vert_sort[i].v = v; + } + + qsort(vert_sort, v_ls_base->list_len, sizeof(*vert_sort), BLI_sortutil_cmp_float_reverse); + + for (i = 0, node = v_ls_base->list; i < v_ls_base->list_len; i++, node = node->next) { + node->link = vert_sort[i].v; + } +} +#endif + +static void edge_verts_add( + struct ISectState *s, + BMEdge *e, + BMVert *v, + const bool use_test + ) +{ + BLI_assert(e->head.htype == BM_EDGE); + BLI_assert(v->head.htype == BM_VERT); + ghash_insert_link(s->edge_verts, (void *)e, v, use_test, s->mem_arena); +} + +static void face_edges_add( + struct ISectState *s, + const int f_index, + BMEdge *e, + const bool use_test) +{ + void *f_index_key = SET_INT_IN_POINTER(f_index); + BLI_assert(e->head.htype == BM_EDGE); + BLI_assert(BM_edge_in_face(e, s->bm->ftable[f_index]) == false); + BLI_assert(BM_elem_index_get(s->bm->ftable[f_index]) == f_index); + + ghash_insert_link(s->face_edges, f_index_key, e, use_test, s->mem_arena); +} + +#ifdef USE_NET +static void face_edges_split( + BMesh *bm, + BMFace *f, + struct LinkBase *e_ls_base) +{ + unsigned int i; + BMEdge **edge_arr = BLI_array_alloca(edge_arr, e_ls_base->list_len); + LinkNode *node; + BLI_assert(f->head.htype == BM_FACE); + + for (i = 0, node = e_ls_base->list; i < e_ls_base->list_len; i++, node = node->next) { + edge_arr[i] = node->link; + } + BLI_assert(node == NULL); + +#ifdef USE_DUMP + printf("# %s: %d %u\n", __func__, BM_elem_index_get(f), e_ls_base->list_len); +#endif + + BM_face_split_edgenet(bm, f, edge_arr, (int)e_ls_base->list_len, NULL, NULL); +} +#endif + +#ifdef USE_DISSOLVE +static void vert_dissolve_add( + struct ISectState *s, + BMVert *v) +{ + BLI_assert(v->head.htype == BM_VERT); + BLI_assert(!BM_elem_flag_test(v, BM_ELEM_TAG)); + BLI_assert(BLI_linklist_index(s->vert_dissolve, v) == -1); + + BM_elem_flag_enable(v, BM_ELEM_TAG); + BLI_linklist_prepend_arena(&s->vert_dissolve, v, s->mem_arena); +} +#endif + +static enum ISectType intersect_line_tri( + const float p0[3], const float p1[3], + const float *t_cos[3], const float t_nor[3], + float r_ix[3], + const struct ISectEpsilon *e) +{ + float p_dir[3]; + unsigned int i_t0; + float fac; + + sub_v3_v3v3(p_dir, p0, p1); + normalize_v3(p_dir); + + for (i_t0 = 0; i_t0 < 3; i_t0++) { + const unsigned int i_t1 = (i_t0 + 1) % 3; + float te_dir[3]; + + sub_v3_v3v3(te_dir, t_cos[i_t0], t_cos[i_t1]); + normalize_v3(te_dir); + if (fabsf(dot_v3v3(p_dir, te_dir)) >= 1.0f - e->eps) { + /* co-linear */ + } + else { + float ix_pair[2][3]; + int ix_pair_type; + + ix_pair_type = isect_line_line_epsilon_v3(p0, p1, t_cos[i_t0], t_cos[i_t1], ix_pair[0], ix_pair[1], 0.0f); + + if (ix_pair_type != 0) { + if (ix_pair_type == 1) { + copy_v3_v3(ix_pair[1], ix_pair[0]); + } + + if ((ix_pair_type == 1) || + (len_squared_v3v3(ix_pair[0], ix_pair[1]) <= e->eps_margin_sq)) + { + fac = line_point_factor_v3(ix_pair[1], t_cos[i_t0], t_cos[i_t1]); + if ((fac >= e->eps_margin) && (fac <= 1.0f - e->eps_margin)) { + fac = line_point_factor_v3(ix_pair[0], p0, p1); + if ((fac >= e->eps_margin) && (fac <= 1.0f - e->eps_margin)) { + copy_v3_v3(r_ix, ix_pair[0]); + return (IX_EDGE_TRI_EDGE0 + i_t0); + } + } + } + } + } + } + + /* check ray isn't planar with tri */ + if (fabsf(dot_v3v3(p_dir, t_nor)) >= e->eps) { + if (isect_line_tri_epsilon_v3(p0, p1, t_cos[0], t_cos[1], t_cos[2], &fac, NULL, 0.0f)) { + if ((fac >= e->eps_margin) && (fac <= 1.0f - e->eps_margin)) { + interp_v3_v3v3(r_ix, p0, p1, fac); + if (min_fff(len_squared_v3v3(t_cos[0], r_ix), + len_squared_v3v3(t_cos[1], r_ix), + len_squared_v3v3(t_cos[2], r_ix)) >= e->eps_margin_sq) + { + return IX_EDGE_TRI; + } + } + } + } + + /* r_ix may be unset */ + return IX_NONE; +} + +static BMVert *bm_isect_edge_tri( + struct ISectState *s, + BMVert *e_v0, BMVert *e_v1, + BMVert *t[3], const int t_index, + const float *t_cos[3], const float t_nor[3], + enum ISectType *r_side) +{ + BMesh *bm = s->bm; + int k_arr[IX_TOT][4]; + unsigned int i; + const int ti[3] = {UNPACK3_EX(BM_elem_index_get, t, )}; + float ix[3]; + + if (BM_elem_index_get(e_v0) > BM_elem_index_get(e_v1)) { + SWAP(BMVert *, e_v0, e_v1); + } + +#ifdef USE_PARANOID + BLI_assert(len_squared_v3v3(e_v0->co, t[0]->co) >= s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(e_v0->co, t[1]->co) >= s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(e_v0->co, t[2]->co) >= s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(e_v1->co, t[0]->co) >= s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(e_v1->co, t[1]->co) >= s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(e_v1->co, t[2]->co) >= s->epsilon.eps_sq); +#endif + +#define KEY_SET(k, i0, i1, i2, i3) { \ + (k)[0] = i0; \ + (k)[1] = i1; \ + (k)[2] = i2; \ + (k)[3] = i3; \ +} (void)0 + + /* order tri, then order (1-2, 2-3)*/ +#define KEY_EDGE_TRI_ORDER(k) { \ + if (k[2] > k[3]) { \ + SWAP(int, k[2], k[3]); \ + } \ + if (k[0] > k[2]) { \ + SWAP(int, k[0], k[2]); \ + SWAP(int, k[1], k[3]); \ + } \ +} (void)0 + + KEY_SET(k_arr[IX_EDGE_TRI], BM_elem_index_get(e_v0), BM_elem_index_get(e_v1), t_index, -1); + /* need to order here */ + KEY_SET(k_arr[IX_EDGE_TRI_EDGE0], BM_elem_index_get(e_v0), BM_elem_index_get(e_v1), ti[0], ti[1]); + KEY_SET(k_arr[IX_EDGE_TRI_EDGE1], BM_elem_index_get(e_v0), BM_elem_index_get(e_v1), ti[1], ti[2]); + KEY_SET(k_arr[IX_EDGE_TRI_EDGE2], BM_elem_index_get(e_v0), BM_elem_index_get(e_v1), ti[2], ti[0]); + + KEY_EDGE_TRI_ORDER(k_arr[IX_EDGE_TRI_EDGE0]); + KEY_EDGE_TRI_ORDER(k_arr[IX_EDGE_TRI_EDGE1]); + KEY_EDGE_TRI_ORDER(k_arr[IX_EDGE_TRI_EDGE2]); + +#undef KEY_SET +#undef KEY_EDGE_TRI_ORDER + + + + for (i = 0; i < ARRAY_SIZE(k_arr); i++) { + BMVert *iv; + + iv = BLI_ghash_lookup(s->edgetri_cache, k_arr[i]); + + if (iv) { +#ifdef USE_DUMP + printf("# cache hit (%d, %d, %d, %d)\n", UNPACK4(k_arr[i])); +#endif + *r_side = i; + return iv; + } + } + + *r_side = intersect_line_tri(e_v0->co, e_v1->co, t_cos, t_nor, ix, &s->epsilon); + if (*r_side != IX_NONE) { + BMVert *iv; + BMEdge *e; +#ifdef USE_DUMP + printf("# new vertex (%.6f, %.6f, %.6f) %d\n", UNPACK3(ix), *r_side); +#endif + +#ifdef USE_PARANOID + BLI_assert(len_squared_v3v3(ix, e_v0->co) > s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(ix, e_v1->co) > s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(ix, t[0]->co) > s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(ix, t[1]->co) > s->epsilon.eps_sq); + BLI_assert(len_squared_v3v3(ix, t[2]->co) > s->epsilon.eps_sq); +#endif + iv = BM_vert_create(bm, ix, NULL, 0); + + e = BM_edge_exists(e_v0, e_v1); + if (e) { +#ifdef USE_DUMP + printf("# adding to edge %d\n", BM_elem_index_get(e)); +#endif + edge_verts_add(s, e, iv, false); + } + else { +#ifdef USE_DISSOLVE + vert_dissolve_add(s, iv); +#endif + } + + if ((*r_side >= IX_EDGE_TRI_EDGE0) && (*r_side <= IX_EDGE_TRI_EDGE2)) { + i = (unsigned int)(*r_side - IX_EDGE_TRI_EDGE0); + e = BM_edge_exists(t[i], t[(i + 1) % 3]); + if (e) { + edge_verts_add(s, e, iv, false); + } + } + + { + int *k = BLI_memarena_alloc(s->mem_arena, sizeof(int[4])); + memcpy(k, k_arr[*r_side], sizeof(int[4])); + BLI_ghash_insert(s->edgetri_cache, k, iv); + } + + return iv; + + } + + *r_side = IX_NONE; + + return NULL; +} + +/** + * Return true if we have any intersections. + */ +static void bm_isect_tri_tri( + struct ISectState *s, + int a_index, int b_index, + BMLoop **a, BMLoop **b) +{ + BMFace *f_a = (*a)->f; + BMFace *f_b = (*b)->f; + BMVert *fv_a[3] = {UNPACK3_EX(, a, ->v)}; + BMVert *fv_b[3] = {UNPACK3_EX(, b, ->v)}; + const float *f_a_cos[3] = {UNPACK3_EX(, fv_a, ->co)}; + const float *f_b_cos[3] = {UNPACK3_EX(, fv_b, ->co)}; + float f_a_nor[3]; + float f_b_nor[3]; + int a_mask = 0; + int b_mask = 0; + unsigned int i; + + + /* should be enough but may need to bump */ + BMVert *iv_ls_a[8]; + BMVert *iv_ls_b[8]; + STACK_DECLARE(iv_ls_a); + STACK_DECLARE(iv_ls_b); + + if (UNLIKELY(ELEM(fv_a[0], UNPACK3(fv_b)) || + ELEM(fv_a[1], UNPACK3(fv_b)) || + ELEM(fv_a[2], UNPACK3(fv_b)))) + { + return; + } + + STACK_INIT(iv_ls_a, ARRAY_SIZE(iv_ls_a)); + STACK_INIT(iv_ls_b, ARRAY_SIZE(iv_ls_b)); + + /* vert-vert + * --------- */ + { + /* first check in any verts are touching + * (any case where we wont create new verts) + */ + unsigned int i_a; + for (i_a = 0; i_a < 3; i_a++) { + unsigned int i_b; + for (i_b = 0; i_b < 3; i_b++) { + if (len_squared_v3v3(fv_a[i_a]->co, fv_b[i_b]->co) <= s->epsilon.eps2x_sq) { + if (!((1 << i_a) & a_mask)) { + STACK_PUSH(iv_ls_a, fv_a[i_a]); + a_mask |= (1 << i_a); +#ifdef USE_DUMP + printf(" ('VERT-VERT-A') %d, %d),\n", + i_a, BM_elem_index_get(fv_a[i_a])); +#endif + } + if (!((1 << i_b) & b_mask)) { + STACK_PUSH(iv_ls_b, fv_b[i_b]); + b_mask |= (1 << i_b); +#ifdef USE_DUMP + printf(" ('VERT-VERT-B') %d, %d),\n", + i_b, BM_elem_index_get(fv_b[i_b])); +#endif + } + } + } + } + } + + /* vert-edge + * --------- */ + { + unsigned int i_a; + for (i_a = 0; i_a < 3; i_a++) { + if (!((1 << i_a) & a_mask)) { + unsigned int i_b_e0; + for (i_b_e0 = 0; i_b_e0 < 3; i_b_e0++) { + unsigned int i_b_e1 = (i_b_e0 + 1) % 3; + float fac; + if (((1 << i_b_e0) | (1 << i_b_e1)) & b_mask) + continue; + fac = line_point_factor_v3(fv_a[i_a]->co, fv_b[i_b_e0]->co, fv_b[i_b_e1]->co); + if ((fac > 0.0f - s->epsilon.eps) && (fac < 1.0 + s->epsilon.eps)) { + float ix[3]; + interp_v3_v3v3(ix, fv_b[i_b_e0]->co, fv_b[i_b_e1]->co, fac); + if (len_squared_v3v3(ix, fv_a[i_a]->co) <= s->epsilon.eps2x_sq) { + BMEdge *e; + STACK_PUSH(iv_ls_b, fv_a[i_a]); + // STACK_PUSH(iv_ls_a, fv_a[i_a]); + a_mask |= (1 << i_a); + e = BM_edge_exists(fv_b[i_b_e0], fv_b[i_b_e1]); +#ifdef USE_DUMP + printf(" ('VERT-EDGE-A', %d, %d),\n", + BM_elem_index_get(fv_b[i_b_e0]), BM_elem_index_get(fv_b[i_b_e1])); +#endif + if (e) { +#ifdef USE_DUMP + printf("# adding to edge %d\n", BM_elem_index_get(e)); +#endif + edge_verts_add(s, e, fv_a[i_a], true); + } + break; + } + } + } + } + } + } + + { + unsigned int i_b; + for (i_b = 0; i_b < 3; i_b++) { + if (!((1 << i_b) & b_mask)) { + unsigned int i_a_e0; + for (i_a_e0 = 0; i_a_e0 < 3; i_a_e0++) { + unsigned int i_a_e1 = (i_a_e0 + 1) % 3; + float fac; + if (((1 << i_a_e0) | (1 << i_a_e1)) & a_mask) + continue; + fac = line_point_factor_v3(fv_b[i_b]->co, fv_a[i_a_e0]->co, fv_a[i_a_e1]->co); + if ((fac > 0.0 - s->epsilon.eps) && (fac < 1.0 + s->epsilon.eps)) { + float ix[3]; + interp_v3_v3v3(ix, fv_a[i_a_e0]->co, fv_a[i_a_e1]->co, fac); + if (len_squared_v3v3(ix, fv_b[i_b]->co) <= s->epsilon.eps2x_sq) { + BMEdge *e; + STACK_PUSH(iv_ls_a, fv_b[i_b]); + // STACK_PUSH(iv_ls_b, fv_b[i_b]); + b_mask |= (1 << i_b); + e = BM_edge_exists(fv_a[i_a_e0], fv_a[i_a_e1]); +#ifdef USE_DUMP + printf(" ('VERT-EDGE-B', %d, %d),\n", + BM_elem_index_get(fv_a[i_a_e0]), BM_elem_index_get(fv_a[i_a_e1])); +#endif + if (e) { +#ifdef USE_DUMP + printf(" adding to edge %d\n", BM_elem_index_get(e)); +#endif + edge_verts_add(s, e, fv_b[i_b], true); + } + break; + } + } + } + } + } + } + + /* vert-tri + * -------- */ + { + + float t_scale[3][3]; + unsigned int i_a; + + copy_v3_v3(t_scale[0], fv_b[0]->co); + copy_v3_v3(t_scale[1], fv_b[1]->co); + copy_v3_v3(t_scale[2], fv_b[2]->co); + tri_v3_scale(UNPACK3(t_scale), 1.0f - s->epsilon.eps2x); + + // second check for verts intersecting the triangle + for (i_a = 0; i_a < 3; i_a++) { + float ix[3]; + if ((1 << i_a) & a_mask) + continue; + if (isect_point_tri_v3(fv_a[i_a]->co, UNPACK3(t_scale), ix)) { + if (len_squared_v3v3(ix, fv_a[i_a]->co) <= s->epsilon.eps2x_sq) { + BLI_assert(BLI_array_findindex(iv_ls_a, STACK_SIZE(iv_ls_a), fv_a[i_a]) == -1); + BLI_assert(BLI_array_findindex(iv_ls_b, STACK_SIZE(iv_ls_b), fv_a[i_a]) == -1); + + STACK_PUSH(iv_ls_a, fv_a[i_a]); + STACK_PUSH(iv_ls_b, fv_a[i_a]); + a_mask |= (1 << i_a); +#ifdef USE_DUMP + printf(" 'VERT TRI-A',\n"); +#endif + } + } + } + } + + { + float t_scale[3][3]; + unsigned int i_b; + + copy_v3_v3(t_scale[0], fv_a[0]->co); + copy_v3_v3(t_scale[1], fv_a[1]->co); + copy_v3_v3(t_scale[2], fv_a[2]->co); + tri_v3_scale(UNPACK3(t_scale), 1.0f - s->epsilon.eps2x); + + for (i_b = 0; i_b < 3; i_b++) { + float ix[3]; + if ((1 << i_b) & b_mask) + continue; + + if (isect_point_tri_v3(fv_b[i_b]->co, UNPACK3(t_scale), ix)) { + if (len_squared_v3v3(ix, fv_b[i_b]->co) <= s->epsilon.eps2x_sq) { + BLI_assert(BLI_array_findindex((void **)iv_ls_a, STACK_SIZE(iv_ls_a), fv_b[i_b]) == -1); + BLI_assert(BLI_array_findindex((void **)iv_ls_b, STACK_SIZE(iv_ls_b), fv_b[i_b]) == -1); + + STACK_PUSH(iv_ls_a, fv_b[i_b]); + STACK_PUSH(iv_ls_b, fv_b[i_b]); + b_mask |= (1 << i_b); +#ifdef USE_DUMP + printf(" 'VERT TRI-B',\n"); +#endif + } + } + } + } + + if ((STACK_SIZE(iv_ls_a) >= 3) && + (STACK_SIZE(iv_ls_b) >= 3)) + { +#ifdef USE_DUMP + printf("# OVERLAP\n"); +#endif + return; + } + + normal_tri_v3(f_a_nor, UNPACK3(f_a_cos)); + normal_tri_v3(f_b_nor, UNPACK3(f_b_cos)); + + /* edge-tri & edge-edge + * -------------------- */ + { + unsigned int i_e0; + for (i_e0 = 0; i_e0 < 3; i_e0++) { + unsigned int i_e1 = (i_e0 + 1) % 3; + enum ISectType side; + BMVert *iv; + if (((1 << i_e0) | (1 << i_e1)) & a_mask) + continue; + iv = bm_isect_edge_tri(s, fv_a[i_e0], fv_a[i_e1], fv_b, b_index, f_b_cos, f_b_nor, &side); + if (iv) { + BLI_assert(BLI_array_findindex((void **)iv_ls_a, STACK_SIZE(iv_ls_a), iv) == -1); + BLI_assert(BLI_array_findindex((void **)iv_ls_b, STACK_SIZE(iv_ls_b), iv) == -1); + STACK_PUSH(iv_ls_a, iv); + STACK_PUSH(iv_ls_b, iv); +#ifdef USE_DUMP + printf(" ('EDGE-TRI-A', %d),\n", side); +#endif + } + } + + for (i_e0 = 0; i_e0 < 3; i_e0++) { + unsigned int i_e1 = (i_e0 + 1) % 3; + enum ISectType side; + BMVert *iv; + if (((1 << i_e0) | (1 << i_e1)) & b_mask) + continue; + iv = bm_isect_edge_tri(s, fv_b[i_e0], fv_b[i_e1], fv_a, a_index, f_a_cos, f_a_nor, &side); + if (iv) { + /* check this wasn't handled above */ + if (!(side >= IX_EDGE_TRI_EDGE0 && side <= IX_EDGE_TRI_EDGE2)) { + BLI_assert(BLI_array_findindex((void **)iv_ls_a, STACK_SIZE(iv_ls_a), iv) == -1); + BLI_assert(BLI_array_findindex((void **)iv_ls_b, STACK_SIZE(iv_ls_b), iv) == -1); + STACK_PUSH(iv_ls_a, iv); + STACK_PUSH(iv_ls_b, iv); +#ifdef USE_DUMP + printf(" ('EDGE-RAY-B', %d),\n", side); +#endif + } + } + } + } + + { + for (i = 0; i < 2; i++) { + BMVert **ie_vs; + BMFace *f; + bool ie_exists; + BMEdge *ie; + + if (i == 0) { + if (STACK_SIZE(iv_ls_a) != 2) + continue; + ie_vs = iv_ls_a; + f = f_a; + } + else { + if (STACK_SIZE(iv_ls_b) != 2) + continue; + ie_vs = iv_ls_b; + f = f_b; + } + + /* possible but unlikely we get this - for edge-edge intersection */ + ie = BM_edge_exists(UNPACK2(ie_vs)); + if (ie == NULL) { + ie_exists = false; + /* one of the verts must be new if we are making an edge + * ...no, we need this in case 2x quads intersect at either ends. + * if not (ie_vs[0].index == -1 or ie_vs[1].index == -1): + * continue */ + ie = BM_edge_create(s->bm, UNPACK2(ie_vs), NULL, 0); + BLI_gset_insert(s->wire_edges, ie); + } + else { + ie_exists = true; + /* may already exist */ + BLI_gset_add(s->wire_edges, ie); + + if (BM_edge_in_face(ie, f)) { + continue; + } + } + + face_edges_add(s, BM_elem_index_get(f), ie, ie_exists); + // BLI_assert(len(ie_vs) <= 2) + } + } +} + +/** + * Intersect tessellated faces + * leaving the resulting edges tagged. + * + * \param test_fn Return value: -1: skip, 0: tree_a, 1: tree_b (use_self == false) + */ +bool BM_mesh_intersect( + BMesh *bm, + struct BMLoop *(*looptris)[3], const int looptris_tot, + int (*test_fn)(BMFace *f, void *user_data), void *user_data, + const bool use_self, const bool use_separate, + const float eps) +{ + struct ISectState s; + bool has_isect; + const int totface_orig = bm->totface; + +#ifdef USE_BVH + BVHTree *tree_a, *tree_b; + unsigned int tree_overlap_tot; + BVHTreeOverlap *overlap; +#else + int i_a, i_b; +#endif + + s.bm = bm; + + s.edgetri_cache = BLI_ghash_new(BLI_ghashutil_inthash_v4_p, BLI_ghashutil_inthash_v4_cmp, __func__); + + s.edge_verts = BLI_ghash_ptr_new(__func__); + s.face_edges = BLI_ghash_ptr_new(__func__); + s.wire_edges = BLI_gset_ptr_new(__func__); + s.vert_dissolve = NULL; + + s.mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__); + + /* setup epsilon from base */ + s.epsilon.eps = eps; + s.epsilon.eps2x = eps * 2.0f; + s.epsilon.eps_margin = s.epsilon.eps2x * 10.0f; + + s.epsilon.eps_sq = s.epsilon.eps * s.epsilon.eps; + s.epsilon.eps2x_sq = s.epsilon.eps2x * s.epsilon.eps2x; + s.epsilon.eps_margin_sq = s.epsilon.eps_margin * s.epsilon.eps_margin; + + BM_mesh_elem_index_ensure( + bm, + BM_VERT | + BM_EDGE | +#ifdef USE_NET + BM_FACE | +#endif + 0); + + + BM_mesh_elem_table_ensure( + bm, +#ifdef USE_SPLICE + BM_EDGE | +#endif +#ifdef USE_NET + BM_FACE | +#endif + 0); + +#ifdef USE_DISSOLVE + BM_mesh_elem_hflag_disable_all(bm, BM_EDGE | BM_VERT, BM_ELEM_TAG, false); +#endif + +#ifdef USE_DUMP + printf("data = [\n"); +#endif + +#ifdef USE_BVH + { + int i; + tree_a = BLI_bvhtree_new(looptris_tot, s.epsilon.eps_margin, 8, 8); + for (i = 0; i < looptris_tot; i++) { + if (test_fn(looptris[i][0]->f, user_data) == 0) { + const float t_cos[3][3] = { + {UNPACK3(looptris[i][0]->v->co)}, + {UNPACK3(looptris[i][1]->v->co)}, + {UNPACK3(looptris[i][2]->v->co)}, + }; + + BLI_bvhtree_insert(tree_a, i, (float *)t_cos, 3); + } + } + BLI_bvhtree_balance(tree_a); + } + + if (use_self == false) { + int i; + tree_b = BLI_bvhtree_new(looptris_tot, s.epsilon.eps_margin, 8, 8); + for (i = 0; i < looptris_tot; i++) { + if (test_fn(looptris[i][0]->f, user_data) == 1) { + const float t_cos[3][3] = { + {UNPACK3(looptris[i][0]->v->co)}, + {UNPACK3(looptris[i][1]->v->co)}, + {UNPACK3(looptris[i][2]->v->co)}, + }; + + BLI_bvhtree_insert(tree_b, i, (float *)t_cos, 3); + } + } + BLI_bvhtree_balance(tree_b); + } + else { + tree_b = tree_a; + } + + overlap = BLI_bvhtree_overlap(tree_b, tree_a, &tree_overlap_tot); + + if (overlap) { + unsigned int i; + + for (i = 0; i < tree_overlap_tot; i++) { +#ifdef USE_DUMP + printf(" ((%d, %d), (\n", + overlap[i].indexA, + overlap[i].indexB); +#endif + bm_isect_tri_tri( + &s, + overlap[i].indexA, + overlap[i].indexB, + looptris[overlap[i].indexA], + looptris[overlap[i].indexB]); +#ifdef USE_DUMP + printf(")),\n"); +#endif + } + MEM_freeN(overlap); + } + BLI_bvhtree_free(tree_a); + if (tree_a != tree_b) { + BLI_bvhtree_free(tree_b); + } + +#else + { + for (i_a = 0; i_a < looptris_tot; i_a++) { + const int t_a = test_fn(looptris[i_a][0]->f, user_data); + for (i_b = i_a + 1; i_b < looptris_tot; i_b++) { + const int t_b = test_fn(looptris[i_b][0]->f, user_data); + + if (use_self) { + if ((t_a != 0) || (t_b != 0)) { + continue; + } + } + else { + if ((t_a != t_b) && !ELEM(-1, t_a, t_b)) { + continue; + } + } + +#ifdef USE_DUMP + printf(" ((%d, %d), (", + i_a, i_b); +#endif + bm_isect_tri_tri( + &s, + i_a, + i_b, + looptris[i_a], + looptris[i_b]); +#ifdef USE_DUMP + printf(")),\n"); +#endif + } + } + } +#endif /* USE_BVH */ + +#ifdef USE_DUMP + printf("]\n"); +#endif + + /* --------- */ + +#ifdef USE_SPLICE + { + GHashIterator gh_iter; + + GHASH_ITER (gh_iter, s.edge_verts) { + BMEdge *e = BLI_ghashIterator_getKey(&gh_iter); + struct LinkBase *v_ls_base = BLI_ghashIterator_getValue(&gh_iter); + + BMVert *v_start; + BMVert *v_prev; + bool is_wire; + + LinkNode *node; + + if (v_ls_base->list_len > 1) { + edge_verts_sort(e, v_ls_base); + } + +#ifdef USE_DUMP + printf("# SPLITTING EDGE: %d, %d\n", e_index, v_ls_base->list_len); +#endif + v_start = e->v1; + + /* intersect */ + is_wire = BLI_gset_haskey(s.wire_edges, e); + +#ifdef USE_PARANOID + for (node = v_ls_base->list; node; node = node->next) { + BMVert *_v = node->link; + BLI_assert(len_squared_v3v3(_v->co, e->v1->co) > s.epsilon.eps_sq); + BLI_assert(len_squared_v3v3(_v->co, e->v2->co) > s.epsilon.eps_sq); + } +#endif + + v_prev = v_start; + + for (node = v_ls_base->list; node; node = node->next) { + BMVert *vi = node->link; + const float fac = line_point_factor_v3(vi->co, e->v1->co, e->v2->co); + + if (BM_vert_in_edge(e, v_prev)) { + v_prev = BM_edge_split(bm, e, v_prev, &e, CLAMPIS(fac, 0.0f, 1.0f)); + if (!BM_edge_exists(v_prev, vi) && + !BM_vert_splice_check_double(v_prev, vi) && + !BM_vert_pair_share_face_check(v_prev, vi)) + { + BM_vert_splice(bm, v_prev, vi); + } + else { + copy_v3_v3(v_prev->co, vi->co); + } + v_prev = vi; + if (is_wire) { + BLI_gset_insert(s.wire_edges, e); + } + } + } + } + } +#endif + + + /* important to handle before edgenet */ +#ifdef USE_DISSOLVE + { + /* first pass */ + BMVert *(*splice_ls)[2]; + STACK_DECLARE(splice_ls); + LinkNode *node; + + + for (node = s.vert_dissolve; node; node = node->next) { + BMVert *v = node->link; + if (BM_elem_flag_test(v, BM_ELEM_TAG)) { + if (!BM_vert_is_edge_pair(v)) { + BM_elem_flag_disable(v, BM_ELEM_TAG); + } + } + } + + splice_ls = MEM_mallocN((unsigned int)BLI_gset_size(s.wire_edges) * sizeof(*splice_ls), __func__); + STACK_INIT(splice_ls, (unsigned int)BLI_gset_size(s.wire_edges)); + + for (node = s.vert_dissolve; node; node = node->next) { + BMEdge *e_pair[2]; + BMVert *v = node->link; + BMVert *v_a, *v_b; + + if (!BM_elem_flag_test(v, BM_ELEM_TAG)) { + continue; + } + + /* get chain */ + e_pair[0] = v->e; + e_pair[1] = BM_DISK_EDGE_NEXT(v->e, v); + + if (BM_elem_flag_test(e_pair[0], BM_ELEM_TAG) || + BM_elem_flag_test(e_pair[1], BM_ELEM_TAG)) + { + continue; + } + + v_a = BM_edge_other_vert(e_pair[0], v); + v_b = BM_edge_other_vert(e_pair[1], v); + + /* simple case */ + if (BM_elem_flag_test(v_a, BM_ELEM_TAG) && + BM_elem_flag_test(v_b, BM_ELEM_TAG)) + { + /* only start on an edge-case */ + /* pass */ + } + else if ((!BM_elem_flag_test(v_a, BM_ELEM_TAG)) && + (!BM_elem_flag_test(v_b, BM_ELEM_TAG))) + { + /* simple case, single edge spans face */ + BMVert **splice_pair; + BM_elem_flag_enable(e_pair[1], BM_ELEM_TAG); + splice_pair = STACK_PUSH_RET(splice_ls); + splice_pair[0] = v; + splice_pair[1] = v_b; +#ifdef USE_DUMP + printf("# Simple Case!\n"); +#endif + } + else { +#ifdef USE_PARANOID + BMEdge *e_keep; +#endif + BMEdge *e; + BMEdge *e_step; + BMVert *v_step; + + /* walk the chain! */ + if (BM_elem_flag_test(v_a, BM_ELEM_TAG)) { + e = e_pair[0]; +#ifdef USE_PARANOID + e_keep = e_pair[1]; +#endif + } + else { + SWAP(BMVert *, v_a, v_b); + e = e_pair[1]; +#ifdef USE_PARANOID + e_keep = e_pair[0]; +#endif + } + + /* WALK */ + v_step = v; + e_step = e; + + while (true) { + BMEdge *e_next; + BMVert *v_next; + + v_next = BM_edge_other_vert(e_step, v_step); + BM_elem_flag_enable(e_step, BM_ELEM_TAG); + if (!BM_elem_flag_test(v_next, BM_ELEM_TAG)) { + BMVert **splice_pair; +#ifdef USE_PARANOID + BLI_assert(e_step != e_keep); +#endif + splice_pair = STACK_PUSH_RET(splice_ls); + splice_pair[0] = v; + splice_pair[1] = v_next; + break; + } + else { + e_next = bm_vert_other_edge(v_next, e_step); + } + + e_step = e_next; + v_step = v_next; + BM_elem_flag_enable(e_step, BM_ELEM_TAG); +#ifdef USE_PARANOID + BLI_assert(e_step != e_keep); +#endif +#ifdef USE_DUMP + printf("# walk step %p %p\n", e_next, v_next); +#endif + } +#ifdef USE_PARANOID + BLI_assert(BM_elem_flag_test(e_keep, BM_ELEM_TAG) == 0); +#endif + } + } + + /* Remove edges! */ + { + GHashIterator gh_iter; + + GHASH_ITER (gh_iter, s.face_edges) { + struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter); + LinkNode **node_prev_p; + unsigned int i; + + node_prev_p = &e_ls_base->list; + for (i = 0, node = e_ls_base->list; node; i++, node = node->next) { + BMEdge *e = node->link; + if (BM_elem_flag_test(e, BM_ELEM_TAG)) { + /* allocated by arena, don't free */ + *node_prev_p = node->next; + e_ls_base->list_len--; + } + else { + node_prev_p = &node->next; + } + } + } + } + + { + BMIter eiter; + BMEdge *e, *e_next; + + BM_ITER_MESH_MUTABLE (e, e_next, &eiter, bm, BM_EDGES_OF_MESH) { + if (BM_elem_flag_test(e, BM_ELEM_TAG)) { + + /* in rare and annoying cases, + * there can be faces from 's.face_edges' removed by the edges. + * These are degenerate cases, so just make sure we don't reference the faces again. */ + if (e->l) { + BMLoop *l_iter = e->l; + BMFace **faces; + + faces = bm->ftable; + + do { + const int f_index = BM_elem_index_get(l_iter->f); + if (f_index >= 0) { + BLI_assert(f_index < totface_orig); + /* we could check if these are in: 's.face_edges', but easier just to remove */ + faces[f_index] = NULL; + } + } while ((l_iter = l_iter->radial_next) != e->l); + } + + BLI_gset_remove(s.wire_edges, e, NULL); + BM_edge_kill(bm, e); + } + } + } + + /* Remove verts! */ + { + GSet *verts_invalid = BLI_gset_ptr_new(__func__); + + for (node = s.vert_dissolve; node; node = node->next) { + /* arena allocated, don't free */ + BMVert *v = node->link; + if (BM_elem_flag_test(v, BM_ELEM_TAG)) { + if (!v->e) { + BLI_gset_add(verts_invalid, v); + BM_vert_kill(bm, v); + } + } + } + + { + unsigned int i; + for (i = 0; i < STACK_SIZE(splice_ls); i++) { + if (!BLI_gset_haskey(verts_invalid, splice_ls[i][0]) && + !BLI_gset_haskey(verts_invalid, splice_ls[i][1])) + { + if (!BM_vert_splice_check_double(splice_ls[i][0], splice_ls[i][1])) { + BM_vert_splice(bm, splice_ls[i][0], splice_ls[i][1]); + } + } + } + } + + BLI_gset_free(verts_invalid, NULL); + } + + MEM_freeN(splice_ls); + } +#endif /* USE_DISSOLVE */ + + + /* now split faces */ +#ifdef USE_NET + { + GHashIterator gh_iter; + BMFace **faces; + + faces = bm->ftable; + + GHASH_ITER (gh_iter, s.face_edges) { + const int f_index = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter)); + BMFace *f; + struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter); + + BLI_assert(f_index >= 0 && f_index < totface_orig); + + f = faces[f_index]; + if (UNLIKELY(f == NULL)) { + continue; + } + + BLI_assert(BM_elem_index_get(f) == f_index); + + face_edges_split(bm, f, e_ls_base); + } + } +#endif /* USE_NET */ + + +#ifdef USE_SEPARATE + if (use_separate) { + GSetIterator gs_iter; + + BM_mesh_elem_hflag_disable_all(bm, BM_EDGE, BM_ELEM_TAG, false); + + GSET_ITER (gs_iter, s.wire_edges) { + BMEdge *e = BLI_gsetIterator_getKey(&gs_iter); + BM_elem_flag_enable(e, BM_ELEM_TAG); + } + + BM_mesh_edgesplit(bm, false, true, false); + } +#else + (void)use_separate; +#endif /* USE_SEPARATE */ + + has_isect = (BLI_ghash_size(s.face_edges) != 0); + + /* cleanup */ + BLI_ghash_free(s.edgetri_cache, NULL, NULL); + + BLI_ghash_free(s.edge_verts, NULL, NULL); + BLI_ghash_free(s.face_edges, NULL, NULL); + BLI_gset_free(s.wire_edges, NULL); + + BLI_memarena_free(s.mem_arena); + + return has_isect; +} diff --git a/source/blender/bmesh/tools/bmesh_intersect.h b/source/blender/bmesh/tools/bmesh_intersect.h new file mode 100644 index 00000000000..af6e510a8f6 --- /dev/null +++ b/source/blender/bmesh/tools/bmesh_intersect.h @@ -0,0 +1,35 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __BMESH_INTERSECT_H__ +#define __BMESH_INTERSECT_H__ + +/** \file blender/bmesh/tools/bmesh_intersect.h + * \ingroup bmesh + */ + +bool BM_mesh_intersect( + BMesh *bm, + struct BMLoop *(*looptris)[3], const int looptris_tot, + int (*test_fn)(BMFace *f, void *user_data), void *user_data, + const bool use_self, const bool use_separate, + const float eps); + +#endif /* __BMESH_INTERSECT_H__ */ diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 0888c3da3f5..e6c381ec495 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -32,8 +32,11 @@ #include "BKE_context.h" +#include "BKE_report.h" #include "BKE_editmesh.h" +#include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" @@ -45,6 +48,129 @@ #include "mesh_intern.h" /* own include */ +#include "tools/bmesh_intersect.h" + + +/* -------------------------------------------------------------------- */ +/* Cut intersections into geometry */ + +/** + * Compare selected with its self. + */ +static int bm_face_isect_self(BMFace *f, void *UNUSED(user_data)) +{ + if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { + return 0; + } + else { + return -1; + } +} + +/** + * Compare selected/unselected. + */ +static int bm_face_isect_pair(BMFace *f, void *UNUSED(user_data)) +{ + if (BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { + return -1; + } + else if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { + return 0; + } + else { + return 1; + } +} + +enum { + ISECT_SEL = 0, + ISECT_SEL_UNSEL = 1, +}; + +static EnumPropertyItem isect_mode_items[] = { + {ISECT_SEL, "SELECT", 0, "Self Intersect", + "Self intersect selected faces"}, + {ISECT_SEL_UNSEL, "SELECT_UNSELECT", 0, "Select/Unselected", + "Intersect selected with unselected faces"}, + {0, NULL, 0, NULL, NULL} +}; + +static int edbm_intersect_exec(bContext *C, wmOperator *op) +{ + Object *obedit = CTX_data_edit_object(C); + BMEditMesh *em = BKE_editmesh_from_object(obedit); + BMesh *bm = em->bm; + const int mode = RNA_enum_get(op->ptr, "mode"); + int (*test_fn)(BMFace *, void *); + bool use_separate = RNA_boolean_get(op->ptr, "use_separate"); + const float eps = RNA_float_get(op->ptr, "threshold"); + bool use_self; + bool has_isect; + + switch (mode) { + case ISECT_SEL: + test_fn = bm_face_isect_self; + use_self = true; + break; + default: /* ISECT_SEL_UNSEL */ + test_fn = bm_face_isect_pair; + use_self = false; + break; + } + + + has_isect = BM_mesh_intersect( + bm, + em->looptris, em->tottri, + test_fn, NULL, + use_self, use_separate, + eps); + + + if (has_isect) { + BM_mesh_elem_hflag_disable_all(em->bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_SELECT, false); + + if (em->bm->selectmode & (SCE_SELECT_VERTEX | SCE_SELECT_EDGE)) { + BMIter iter; + BMEdge *e; + + BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { + if (BM_elem_flag_test(e, BM_ELEM_TAG)) { + BM_edge_select_set(bm, e, true); + } + } + } + + EDBM_mesh_normals_update(em); + EDBM_update_generic(em, true, true); + } + else { + BKE_report(op->reports, RPT_WARNING, "No intersections found"); + } + + return OPERATOR_FINISHED; +} + +void MESH_OT_intersect(struct wmOperatorType *ot) +{ + /* identifiers */ + ot->name = "Intersect"; + ot->description = "Cut an intersection into faces"; + ot->idname = "MESH_OT_intersect"; + + /* api callbacks */ + ot->exec = edbm_intersect_exec; + ot->poll = ED_operator_editmesh; + + /* props */ + RNA_def_enum(ot->srna, "mode", isect_mode_items, ISECT_SEL_UNSEL, "Source", ""); + RNA_def_boolean(ot->srna, "use_separate", true, "Separate", ""); + RNA_def_float(ot->srna, "threshold", 0.000001f, 0.0, 0.01, "Merge threshold", "", 0.0, 0.001); + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; +} /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index 2ce19fe9471..76f6cb5ebb8 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -113,6 +113,7 @@ void MESH_OT_screw(struct wmOperatorType *ot); void MESH_OT_inset(struct wmOperatorType *ot); /* *** editmesh_intersect.c *** */ +void MESH_OT_intersect(struct wmOperatorType *ot); void MESH_OT_face_split_by_edges(struct wmOperatorType *ot); diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 55dd97db092..31653efa735 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -170,6 +170,7 @@ void ED_operatortypes_mesh(void) WM_operatortype_append(MESH_OT_bridge_edge_loops); WM_operatortype_append(MESH_OT_inset); + WM_operatortype_append(MESH_OT_intersect); WM_operatortype_append(MESH_OT_face_split_by_edges); WM_operatortype_append(MESH_OT_poke); WM_operatortype_append(MESH_OT_wireframe); |