kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bmesh api internal changes

Browse Source 
- optimize BM_face_exists_overlap_subset(), dont check faces smaller then the vert array, don't initialize overlap flag unless its needed.
- BM_face_exists_overlap had incorrect check (currently function is unused so no harm done)
This commit is contained in:
Campbell Barton 2013-08-17 13:32:56 +00:00
parent 0b00ba4ee0
commit 763bce4d64
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/bmesh/intern/bmesh_queries.c
View File

@ -1454,8 +1454,7 @@ BMEdge *BM_edge_find_double(BMEdge *e)
* there is a face with exactly those vertices * there is a face with exactly those vertices
* (and only those vertices). * (and only those vertices).
* *
* \note there used to be a BM_face_exists_overlap function that checked for partial overlap, * \note there used to be a BM_face_exists_overlap function that checks for partial overlap.
* however this is no longer used, simple to add back.
*/ */
bool BM_face_exists(BMVert **varr, int len, BMFace **r_existface) bool BM_face_exists(BMVert **varr, int len, BMFace **r_existface)
{ {
@ -1690,11 +1689,15 @@ bool BM_face_exists_multi_edge(BMEdge **earr, int len)
* Given a set of vertices (varr), find out if * Given a set of vertices (varr), find out if
* all those vertices overlap an existing face. * all those vertices overlap an existing face.
* *
* \return Success * \note The face may contain other verts \b not in \a varr.
*
* \note Its possible there are more then one overlapping faces,
* in this case the first one found will be assigned to \a r_f_overlap.
* *
* \param varr Array of unordered verts. * \param varr Array of unordered verts.
* \param len \a varr array length. * \param len \a varr array length.
* \param r_f_overlap The overlapping face to return. * \param r_f_overlap The overlapping face to return.
* \return Success
*/ */
bool BM_face_exists_overlap(BMVert **varr, const int len, BMFace **r_f_overlap) bool BM_face_exists_overlap(BMVert **varr, const int len, BMFace **r_f_overlap)
@ -1721,7 +1724,7 @@ bool BM_face_exists_overlap(BMVert **varr, const int len, BMFace **r_f_overlap)
for(i = 0; i < len; i++) { for(i = 0; i < len; i++) {
BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) { BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
if (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0) { if (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0) {
if (len <= BM_verts_in_face(f, varr, len)) { if (len <= BM_verts_in_face_count(f, varr, len)) {
if (r_f_overlap) if (r_f_overlap)
*r_f_overlap = f; *r_f_overlap = f;
@ -1755,6 +1758,7 @@ bool BM_face_exists_overlap_subset(BMVert **varr, const int len)
BMIter viter; BMIter viter;
BMFace *f; BMFace *f;
int i; int i;
bool is_init = false;
bool is_overlap = false; bool is_overlap = false;
LinkNode *f_lnk = NULL; LinkNode *f_lnk = NULL;
@ -1768,15 +1772,19 @@ bool BM_face_exists_overlap_subset(BMVert **varr, const int len)
} }
#endif #endif
for(i = 0; i < len; i++) {
BM_ELEM_API_FLAG_ENABLE(varr[i], _FLAG_OVERLAP);
}
for(i = 0; i < len; i++) { for(i = 0; i < len; i++) {
BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) { BM_ITER_ELEM (f, &viter, varr[i], BM_FACES_OF_VERT) {
if (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0) { if ((f->len <= len) && (BM_ELEM_API_FLAG_TEST(f, _FLAG_OVERLAP) == 0)) {
/* check if all vers in this face are flagged*/ /* check if all vers in this face are flagged*/
BMLoop *l_iter, *l_first; BMLoop *l_iter, *l_first;
if (is_init == false) {
is_init = true;
for(i = 0; i < len; i++) {
BM_ELEM_API_FLAG_ENABLE(varr[i], _FLAG_OVERLAP);
}
}
l_iter = l_first = BM_FACE_FIRST_LOOP(f); l_iter = l_first = BM_FACE_FIRST_LOOP(f);
is_overlap = true; is_overlap = true;
do { do {
@ -1796,8 +1804,10 @@ bool BM_face_exists_overlap_subset(BMVert **varr, const int len)
} }
} }
for(i = 0; i < len; i++) { if (is_init == true) {
BM_ELEM_API_FLAG_DISABLE(varr[i], _FLAG_OVERLAP); for(i = 0; i < len; i++) {
BM_ELEM_API_FLAG_DISABLE(varr[i], _FLAG_OVERLAP);
}
} }
for (; f_lnk; f_lnk = f_lnk->next) { for (; f_lnk; f_lnk = f_lnk->next) {